texlive[43375] trunk: musixtex (1mar17)

commits+karl at tug.org commits+karl at tug.org
Wed Mar 1 23:32:52 CET 2017


Revision: 43375
          http://tug.org/svn/texlive?view=revision&revision=43375
Author:   karl
Date:     2017-03-01 23:32:52 +0100 (Wed, 01 Mar 2017)
Log Message:
-----------
musixtex (1mar17)

Modified Paths:
--------------
    trunk/Build/source/texk/texlive/linked_scripts/musixtex/musixtex.lua
    trunk/Master/texmf-dist/doc/generic/musixtex/ChangeLog-musixdoc.txt
    trunk/Master/texmf-dist/doc/generic/musixtex/README
    trunk/Master/texmf-dist/doc/generic/musixtex/musixdoc/accidentals.tex
    trunk/Master/texmf-dist/doc/generic/musixtex/musixdoc/extensions.tex
    trunk/Master/texmf-dist/doc/generic/musixtex/musixdoc/frontmatter.tex
    trunk/Master/texmf-dist/doc/generic/musixtex/musixdoc/layout.tex
    trunk/Master/texmf-dist/doc/generic/musixtex/musixdoc/miscellaneous.tex
    trunk/Master/texmf-dist/doc/generic/musixtex/musixdoc/parameters.tex
    trunk/Master/texmf-dist/doc/generic/musixtex/musixdoc/preparing.tex
    trunk/Master/texmf-dist/doc/generic/musixtex/musixdoc/settingup.tex
    trunk/Master/texmf-dist/doc/generic/musixtex/musixdoc/slurstiesTypeK.tex
    trunk/Master/texmf-dist/doc/generic/musixtex/musixdoc/smaller.tex
    trunk/Master/texmf-dist/doc/generic/musixtex/musixdoc/transposition.tex
    trunk/Master/texmf-dist/doc/generic/musixtex/musixdoc.pdf
    trunk/Master/texmf-dist/doc/generic/musixtex/musixtex-install.pdf
    trunk/Master/texmf-dist/doc/man/man1/musixtex.1
    trunk/Master/texmf-dist/doc/man/man1/musixtex.man1.pdf
    trunk/Master/texmf-dist/scripts/musixtex/musixtex.lua
    trunk/Master/texmf-dist/tex/generic/musixtex/musixec.tex
    trunk/Master/texmf-dist/tex/generic/musixtex/musixhv.tex
    trunk/Master/texmf-dist/tex/generic/musixtex/musixlit.tex
    trunk/Master/texmf-dist/tex/generic/musixtex/musixplt.tex
    trunk/Master/texmf-dist/tex/generic/musixtex/musixppff.tex
    trunk/Master/texmf-dist/tex/generic/musixtex/musixps.tex
    trunk/Master/texmf-dist/tex/generic/musixtex/musixtex.tex
    trunk/Master/texmf-dist/tex/generic/musixtex/musixtmr.tex

Added Paths:
-----------
    trunk/Master/texmf-dist/doc/generic/musixtex/ChangeLog-124.txt

Modified: trunk/Build/source/texk/texlive/linked_scripts/musixtex/musixtex.lua
===================================================================
--- trunk/Build/source/texk/texlive/linked_scripts/musixtex/musixtex.lua	2017-03-01 22:31:29 UTC (rev 43374)
+++ trunk/Build/source/texk/texlive/linked_scripts/musixtex/musixtex.lua	2017-03-01 22:32:52 UTC (rev 43375)
@@ -1,6 +1,6 @@
 #!/usr/bin/env texlua  
 
-VERSION = "0.16e"
+VERSION = "0.17a"
 
 --[[
      musixtex.lua: processes MusiXTeX files using prepmx and/or pmxab and/or 
@@ -29,6 +29,10 @@
 
   ChangeLog:
 
+     version 0.17a   2017-01-08 RDT
+       Added -D option.
+       Avoid writing or concatenating a nil value.
+
      version 0.16e  2016-03-02 DL
        missing version information (caused by batchmode in 0.16c) fixed
 
@@ -121,7 +125,8 @@
          -l  latex source
          -p  direct tex-pdf (pdftex etc)
          -F fmt  use fmt as the TeX processor
-         -d  tex-dvi-pdf (dvipdfm)
+         -d  tex-dvi-pdf (using dvipdfm if -D not used)
+         -D dvixx  use dvixx as the dvi processor
          -c  preprocess pmx file using pmxchords
          -m  stop at pmx
          -t  stop at tex/mid
@@ -162,9 +167,9 @@
   end
 end
 
--- The global variables below may be changed by set_options(). System
---   commands for the various programs are mostly set to nil if the step
---   is to be omitted, which can be tested by a simple "if" statement.
+--   System commands for the various programs are mostly
+--   set to nil if the step is to be omitted, which can be
+--   tested by a simple "if" statement.
 -- Exceptions:
 --    'tex' is the command for processing a TeX file, but it is important
 --       to know whether the user has explicitly specified an option that
@@ -279,6 +284,9 @@
     override = override .. 'p'
   elseif this_arg == "-d" then
     dvi = "dvipdfm"; ps2pdf = nil
+  elseif this_arg == "-D" then
+    narg = narg+1
+    dvi = arg[narg]
   elseif this_arg == "-c" then
     pmx = "pmxchords"
   elseif this_arg == "-F" then
@@ -317,7 +325,14 @@
 
 function find_file(this_arg)
   basename, extension = this_arg:match"(.*)%.(.*)"  
-  if not extension then
+  if extension then
+  extensions = {["mtx"] = true, ["pmx"] = true, ["aspc"] = true, ["tex"] = true, ["ltx"] = true}
+  if not extensions[extension] then
+      print("!! extension " .. extension .. " unrecognized; valid extensions are mtx|pmx|aspc|tex|ltx.")
+      exit_code = exit_code+1
+      return
+    end
+  else
     basename = this_arg 
     for ext in ("mtx,pmx,aspc,tex,ltx"):gmatch"[^,]+" do
       if exists (basename .. "." .. ext) then
@@ -326,7 +341,7 @@
      end
     end
     if not extension then
-      print("!! No file " .. basename .. "[.mtx|.pmx|.aspc|.tex|.ltx]")
+      print("!! No file " .. basename .. ".[mtx|pmx|aspc|tex|ltx]")
       exit_code = exit_code+1
       return
     end
@@ -544,9 +559,9 @@
   if this_arg:match"^%-" then process_option(this_arg)
   else
     basename, extension = find_file(this_arg)  -- nil,nil if not found
-    extension = preprocess(basename,extension)
+    extension = preprocess(basename, extension)
     tex_process(tex,basename,extension)
-    if io.open(basename..".log") then -- to be printed later
+    if basename and io.open(basename..".log") then -- to be printed later
       versions = report_texfiles(basename..".log")
     end
     if basename and cleanup then
@@ -561,7 +576,7 @@
   narg = narg+1
 until narg > #arg 
 
-musixlog:write(versions)
+if versions then musixlog:write(versions) end
 report_versions(tempname)
 musixlog:close()
 os.exit( exit_code )

Added: trunk/Master/texmf-dist/doc/generic/musixtex/ChangeLog-124.txt
===================================================================
--- trunk/Master/texmf-dist/doc/generic/musixtex/ChangeLog-124.txt	                        (rev 0)
+++ trunk/Master/texmf-dist/doc/generic/musixtex/ChangeLog-124.txt	2017-03-01 22:32:52 UTC (rev 43375)
@@ -0,0 +1,10 @@
+
+Changes from MusiXTeX 123 to 124:
+
+  + preserve changes to \transpose in an hboxed tremolo command
+  + test that musixtex.tex has already been loaded in some extensions: 
+  +   musixps, musixec, musixhv, musixplt, musixtmr, musixppff 
+  + changed from \it to \ppff in several places
+  + support new command \setinterstaff{n}{m}
+  + define \largenotesize, \Largenotesize
+  + corrected typos \twtybf[g] \svtbf[g] 

Modified: trunk/Master/texmf-dist/doc/generic/musixtex/ChangeLog-musixdoc.txt
===================================================================
--- trunk/Master/texmf-dist/doc/generic/musixtex/ChangeLog-musixdoc.txt	2017-03-01 22:31:29 UTC (rev 43374)
+++ trunk/Master/texmf-dist/doc/generic/musixtex/ChangeLog-musixdoc.txt	2017-03-01 22:32:52 UTC (rev 43375)
@@ -1,3 +1,7 @@
+2016-11-12 RDT
+
+   Expanded treatment of big cautionary accidentals
+
 2016-06-06  RDT
 
    Revised the material on page layout.

Modified: trunk/Master/texmf-dist/doc/generic/musixtex/README
===================================================================
--- trunk/Master/texmf-dist/doc/generic/musixtex/README	2017-03-01 22:31:29 UTC (rev 43374)
+++ trunk/Master/texmf-dist/doc/generic/musixtex/README	2017-03-01 22:32:52 UTC (rev 43375)
@@ -1,4 +1,4 @@
-This is MusiXTeX, version 1.23 (2016-06-06).
+This is MusiXTeX, version 1.24 (2017-02-28).
 MusiXTeX is a TeX-based system for typesetting music.
 
 The main author was Daniel Taupin, who died in a climbing

Modified: trunk/Master/texmf-dist/doc/generic/musixtex/musixdoc/accidentals.tex
===================================================================
--- trunk/Master/texmf-dist/doc/generic/musixtex/musixdoc/accidentals.tex	2017-03-01 22:31:29 UTC (rev 43374)
+++ trunk/Master/texmf-dist/doc/generic/musixtex/musixdoc/accidentals.tex	2017-03-01 22:32:52 UTC (rev 43375)
@@ -49,10 +49,9 @@
 
 \vspace*{-2ex}
 It also possible to introduce \ital{\ixem{cautionary accidental}s},
-i.e.,~small accidentals enclosed in parentheses. This done by preceding
-the name of the accidental keyword with ``\verb|c|'',\label{cautionary}
-e.g.,~\keyindex{cfl}\pitchp~for a cautionary flat.
- Available cautionary accidentals are \keyindex{csh}, \keyindex{cfl},
+i.e.,~small accidentals enclosed in parentheses. This is done by preceding
+the name of the accidental keyword with ``\verb|c|''\label{cautionary}.
+Available cautionary accidentals are \keyindex{csh}, \keyindex{cfl},
 \keyindex{cna},
 \keyindex{cdfl} and \keyindex{cdsh}, which give
 
@@ -71,3 +70,5 @@
 \keyindex{accshift}\verb|=|\ital{any \TeX\ dimension}, where
 positive values shift to the left and negative to right, with a
 default of~\verb|0pt|.
+For ``big'' cautionary accidentals, use, for example, 
+\verb|{|\keyindex{largenotesize}\verb|\csh|\pitchp\verb|}|  or see Section~\ref{brapar}.

Modified: trunk/Master/texmf-dist/doc/generic/musixtex/musixdoc/extensions.tex
===================================================================
--- trunk/Master/texmf-dist/doc/generic/musixtex/musixdoc/extensions.tex	2017-03-01 22:31:29 UTC (rev 43374)
+++ trunk/Master/texmf-dist/doc/generic/musixtex/musixdoc/extensions.tex	2017-03-01 22:32:52 UTC (rev 43375)
@@ -1,7 +1,10 @@
 \chapter{Extension Library}
-All of the following files are invoked by saying \keyindex{input} \ital{filename}\ .
-Most of them are fully compatible with \musixtex\ in that they do not redefine
-any existing macros but rather provide additional functionality. In future
+All of the following files are invoked by saying \keyindex{input} \ital{filename}.
+In some cases, 
+\verb\musixtex\ must be input \emph{before} the extension,
+but most of them are fully compatible with \verb\musixtex.tex\ in that they do not redefine
+any existing macros and just provide additional functionality. 
+In future
 versions of \musixtex\ we may very well incorporate many of them directly into
 \verb|musixtex.tex|, but for now we leave them separate.
 
@@ -1466,18 +1469,22 @@
 using (for instrument 2 as an example):
  \verb|\settrebleclefsymbol2\oldGclef|
 
- \item\keyindex{cqu} $p$ provides a square headed quarter note with stem up at
+ \item\keyindex{cqu} $p$ provides a square-headed quarter note with stem up at
 pitch $p$.
 
- \item\keyindex{cql} $p$ provides a square headed quarter note with stem down at
+ \item\keyindex{cql} $p$ provides a square-headed quarter note with stem down at
 pitch $p$.
 
- \item\keyindex{chu} $p$ provides a square headed half note with stem up at
+ \item\keyindex{chu} $p$ provides a square-headed half note with stem up at
 pitch $p$.
 
- \item\keyindex{chl} $p$ provides a square headed half note with stem down at
+ \item\keyindex{chl} $p$ provides a square-headed half note with stem down at
 pitch $p$.
 
+ \item\keyindex{cqb} $n$ $p$ provides a square-headed beam note for beam $n$ at pitch $p$.
+
+ \item\keyindex{zcqb} $n$ $p$ provides a non-spacing square-headed beam note for beam $n$ at pitch $p$.
+
  \item\keyindex{cnqu} $p$ and \keyindex{cnql} $p$ provide a stemless square
 headed
 quarter note at pitch $p$.
@@ -1873,6 +1880,12 @@
 
  \section{musixps}\label{musixps}\index{musixps@{\tt musixps.tex}}
  Activates type K Postscript slurs, ties,  and hairpins; see Chapter~\ref{PostscriptSlurs}.
+Use as follows:
+\begin{quote}\begin{verbatim}
+\input musixtex
+\input musixps
+...
+\end{verbatim}\end{quote}
 
  \section{musixstr}\label{musixstr}\index{musixstr@{\tt musixstr.tex}}
  Provides bowing and other symbols for \itxem{string instruments}\footnote{provided

Modified: trunk/Master/texmf-dist/doc/generic/musixtex/musixdoc/frontmatter.tex
===================================================================
--- trunk/Master/texmf-dist/doc/generic/musixtex/musixdoc/frontmatter.tex	2017-03-01 22:31:29 UTC (rev 43374)
+++ trunk/Master/texmf-dist/doc/generic/musixtex/musixdoc/frontmatter.tex	2017-03-01 22:32:52 UTC (rev 43375)
@@ -1,6 +1,6 @@
 \title{\Huge\bfseries\musixtex\\[\bigskipamount]
 \LARGE\bfseries Using \TeX{} to write polyphonic\\or
-instrumental music\\\Large\itshape Version 1.23}
+instrumental music\\\Large\itshape Version 1.24}
 
 
 %\author{\Large\rm Daniel \sc Taupin\\\large\sl
@@ -67,7 +67,7 @@
 takes advantage of the greater capacity of the e\TeX\ version of \TeX. 
 This manual
 is the definitive reference to all features of
-\musixtex\ version~1.23.
+\musixtex\ version~1.24.
 
 Novice users need not start here.
 Most 

Modified: trunk/Master/texmf-dist/doc/generic/musixtex/musixdoc/layout.tex
===================================================================
--- trunk/Master/texmf-dist/doc/generic/musixtex/musixdoc/layout.tex	2017-03-01 22:31:29 UTC (rev 43374)
+++ trunk/Master/texmf-dist/doc/generic/musixtex/musixdoc/layout.tex	2017-03-01 22:32:52 UTC (rev 43375)
@@ -53,7 +53,7 @@
 
 The following values of page-layout parameters will allow as much material
 as possible 
-on a page, provided the printer supports these dimensions, which
+on a page, provided the printer supports these dimensions which
 imply approximately half-inch margins:
 
 \begin{center}
@@ -74,23 +74,19 @@
 A$4$ \emph{or} letter paper, for example  by setting the \verb|\hsize| to~190~mm
 and the \verb|\vsize| to~10~in.
 
-To determine the maximal dimensions that \emph{your} printer is capable of, 
-process the standard file \verb|testpage.tex| with \LaTeX\ and
-print the result. The ``rulers'' on four sides will indicate
-how much of the one-inch ``margin'' material outside the frame can actually be printed.
-Your \verb|\hsize| and \verb|\vsize| parameters can be increased, or, if necessary, decreased
-accordingly.  If your score is going to be printed by a publisher or a colleague, you can send
-\verb|testpage.pdf| to them to determine what margins are necessary for their
-printer.
+To generate a score in ``landscape''\index{landscape mode} mode, adjust the 
+text-size parameters above accordingly (e.g., \verb+\hsize=10in+ and \verb+\vsize=7.5in+)
+and add a suitable \verb\papersize\ ``special'' to the \TeX\ output, as in 
+\verb+\special{papersize=11in,8.5in}+.
 
 
 For \emph{any} values of 
 \verb|\hsize| and \verb|\vsize|,
-material will normally be centered on the page by using one of the following 
-command sequences, which simply split the difference between the page size and the text size, 
+material will normally be centered on the page by using 
+command sequences such as the following, which simply split the difference between the page size and the text size, 
 and then subtract one inch because of \TeX\ conventions:
 \begin{enumerate}
-\item[For A$4$ paper (210~mm $\times$ 297~mm):]\quad\\[-2ex]
+\item[For A$4$ paper, portrait mode (210~mm $\times$ 297~mm):]\quad\\[-2ex]
 \begin{verbatim}
 \hoffset=210mm\advance\hoffset-\hsize\divide\hoffset2
 \advance\hoffset-1.0in
@@ -97,7 +93,7 @@
 \voffset=297mm\advance\voffset-\vsize\divide\voffset2
 \advance\voffset-1.0in
 \end{verbatim}
-\item[For letter-size paper (8.5~in $\times$ 11~in):] \quad\\[-2ex]
+\item[For letter-size paper, portrait mode (8.5~in $\times$ 11~in):] \quad\\[-2ex]
 \begin{verbatim}
 \hoffset=8.5in\advance\hoffset-\hsize\divide\hoffset2
 \advance\hoffset-1.0in
@@ -105,6 +101,16 @@
 \advance\voffset-1.0in
 \end{verbatim}
 \end{enumerate}
+
+To determine the maximal dimensions that \emph{your} printer is capable of, 
+process the standard file \verb|testpage.tex| with \LaTeX\ and
+print the result. The ``rulers'' on four sides will indicate
+how much of the one-inch ``margin'' material outside the frame can actually be printed.
+Your \verb|\hsize| and \verb|\vsize| parameters can be increased, or, if necessary, decreased
+accordingly.  If your score is going to be printed by a publisher or a colleague, you can send
+\verb|testpage.pdf| to them to determine what margins are necessary for their
+printer.
+
 However, if the margins on the \verb|testpage| output are \emph{not} 
 symmetric, 
 the printer is mis-aligned.
@@ -116,8 +122,9 @@
 \verb|\advance\voffset ...|
 after the ``normal'' settings given above.
 
-\pagebreak
 
+
+
 \section{Page numbering, headers and footers}\index{page
 number}\index{footnote}
 

Modified: trunk/Master/texmf-dist/doc/generic/musixtex/musixdoc/miscellaneous.tex
===================================================================
--- trunk/Master/texmf-dist/doc/generic/musixtex/musixdoc/miscellaneous.tex	2017-03-01 22:31:29 UTC (rev 43374)
+++ trunk/Master/texmf-dist/doc/generic/musixtex/musixdoc/miscellaneous.tex	2017-03-01 22:32:52 UTC (rev 43375)
@@ -681,24 +681,26 @@
  \begin{itemize}\setlength{\itemsep}{0ex}
  \item \keyindex{lpar}\verb|{|$p$\verb|}| and
 \keyindex{rpar}\verb|{|$p$\verb|}| yield left and right
-parentheses at pitch $p$. They could be used to enclose notes or to build
-\ital{cautionary} accidentals, although the latter are more easily
-obtained with predefined macros (see Chapter~\ref{cautionary}).
-
-%avrb
-For example,
-
+parentheses at pitch $p$. They can be used to enclose notes or to build
+``big'' cautionary\index{cautionary accidental} accidentals.  For example,
+\\
+\begin{center}
 \begin{tabular}{ll}
-\raisebox{-1.5ex}[0ex][0ex]{\musicintextnoclefn{\notes\bsk\lpar{g}\rpar{g}\hu{g}\sk%
-\loffset{1.5}{\lpar{g}}\loffset{1.5}{\rpar{g}}\loffset{.4}{\sh g}\hu{g}\en}}
-&\begin{tabular}{ll}
-&\verb+\notes\lpar{g}\rpar{g}\hu{g}\sk%+\\
-is coded as&\verb+\loffset{1.5}{\lpar{g}}\loffset{1.5}{\rpar{g}}%+\\
-&\verb+\loffset{.4}{\sh g}\hu{g}\en}+
+\raisebox{-1.5ex}[0ex][0ex]{\musicintextnoclefn{\NOtes\qsk\lpar g\rpar g\hu g\sk%
+\loffset{1.5}{\lpar g\rpar g}\loffset{.4}{\sh g}\hu g\sk%
+\loffset{2.1}{\lpar g}\loffset{1.5}{\rpar g}\loffset{.4}{\dfl g}\hu g\en}}
 \end{tabular}
+\end{center}
+is coded as
+\end{itemize}
+\begin{center}\small
+\begin{tabular}{l}
+\verb+\NOtes\lpar g\rpar g\hu g\sk%+\\
+\verb+\loffset{1.5}{\lpar g\rpar g}\loffset{.4}{\sh g}\hu g\sk%+\\
+\verb+\loffset{2.1}{\lpar g}\loffset{1.5}{\rpar g}\loffset{.4}{\dfl g}\hu g\en+
 \end{tabular}
-%avre
-
+\end{center}
+\begin{itemize}
  \item \keyindex{bracket}\verb|{|$p$\verb|}{|$n$\verb|}| posts a
 square bracket to the left of a chord, vertically spanning $n$
 \verb|internote|s.
@@ -742,7 +744,7 @@
 \endextract
 \end{music}
 \noindent is coded as
-\begin{quote}\begin{verbatim}
+\begin{quote}\small\begin{verbatim}
 \begin{music}
 \setstaffs1{2}
 \setclef1{\bass}

Modified: trunk/Master/texmf-dist/doc/generic/musixtex/musixdoc/parameters.tex
===================================================================
--- trunk/Master/texmf-dist/doc/generic/musixtex/musixdoc/parameters.tex	2017-03-01 22:31:29 UTC (rev 43374)
+++ trunk/Master/texmf-dist/doc/generic/musixtex/musixdoc/parameters.tex	2017-03-01 22:32:52 UTC (rev 43375)
@@ -19,6 +19,8 @@
  \item[\keyindex{internote} :]vertical spacing between notes one scale
 step apart in the current instrument, taking account of a possible alteration
 by \keyindex{setsize}; \nochange.
+Note that each distinct instrument may have a different
+\verb|\internote| (see Chapter~\ref{staffspacing}).
  \item[\keyindex{Internote} :]vertical spacing between notes one scale
 step apart in any instrument whose \keyindex{setsize} has the default
 value \keyindex{normalvalue} ($1.0$), equal to \verb|0.5\Interligne|; \nochange.
@@ -32,15 +34,22 @@
 \item[\keyindex{interstaff} :]a very important macro with a single numerical
 argument representing the factor that multiplies \verb|2\internote| to give the
 distance between the bottom of one staff and the bottom of the next one. In
-fact the macro redefines the parameter \verb|\interfacteur|.
+fact the macro redefines the parameter \verb|\interfacteur|. Default is 9.
+\verb|\interstaff| applies to all the
+instruments; to set the inter-staff spacing for a single instrument,
+use \keyindex{setinterstaff}\itbrace{n}\itbrace{m},
+$n$ is the instrument and $m$ is the replacement factor for that instrument.
+Note that
+after you have used \keyindex{setinterstaff},
+you cannot reset the distances for that instrument with
+\keyindex{interstaff}; you must subsequently use
+\keyindex{setinterstaff} for that purpose.
 \item[\keyindex{interportee} :]distance between the bottom of one staff and
 the bottom of the next one. It is always reset to
-\verb|2|\keyindex{interfacteur}\verb|\internote| at the next system.
+2 times \keyindex{internote} times the \keyindex{interfacteur} for the current
+instrument at the next system.
 Therefore, trying to change \verb|\interportee| will have no effect. Change
-\verb|\interstaff| instead. Further, note that \verb|\interstaff| applies to all the
-instruments, but each distinct instrument may have a different
-\verb|\internote| (see Chapter~\ref{staffspacing}).
-
+\verb|\interstaff| or use \keyindex{setinterstaff} instead. 
 \item[\keyindex{interinstrument} :]additional vertical distance between
 two consecutive instruments. This means that the distance between the lowest
 line of the previous instrument and the lowest line of the top staff of the current
@@ -53,7 +62,8 @@
 with the macro \keyindex{setinterinstrument}\itbrace{n}\itbrace{s}, where
 $n$ is the instrument and $s$ is the replacement value of the space to
 be added. The \verb|\setinterinstrument| macro may be useful in some vocal
-scores to provide vertical space for lyrics. Note that
+scores to provide vertical space for lyrics. 
+Note that
 after you have used \keyindex{setinterinstrument},
 you cannot reset the distances for that instrument with
 \keyindex{interinstrument}; you must subsequently use

Modified: trunk/Master/texmf-dist/doc/generic/musixtex/musixdoc/preparing.tex
===================================================================
--- trunk/Master/texmf-dist/doc/generic/musixtex/musixdoc/preparing.tex	2017-03-01 22:31:29 UTC (rev 43374)
+++ trunk/Master/texmf-dist/doc/generic/musixtex/musixdoc/preparing.tex	2017-03-01 22:32:52 UTC (rev 43375)
@@ -269,7 +269,9 @@
 the spacing in single-instrument parts extracted from a multi-instrument score;
 see Section~\ref{musixtnt}.
 
-The \texttt{autosp} package can be found at 
+The \texttt{autosp} package is available in 
+\href{https://www.tug.org/texlive/}{\underline{TeXLive}} (from 2016) and
+can also be found at 
 the \href{http://icking-music-archive.org/software/autosp/autosp.zip}
 {\underline{Werner Icking Music Archive}}
 or at

Modified: trunk/Master/texmf-dist/doc/generic/musixtex/musixdoc/settingup.tex
===================================================================
--- trunk/Master/texmf-dist/doc/generic/musixtex/musixdoc/settingup.tex	2017-03-01 22:31:29 UTC (rev 43374)
+++ trunk/Master/texmf-dist/doc/generic/musixtex/musixdoc/settingup.tex	2017-03-01 22:32:52 UTC (rev 43375)
@@ -219,6 +219,13 @@
 This will place the name in the space to the left of the
 first staff or group of staves for instrument $n$. To specify the amount of space
 available, use \verb|\parindent|$d$ where $d$ is any hard \TeX\ dimension.
+For multi-line instrument names, use \TeX\ commands as in the following:
+\begin{verbatim}
+  \setname1{\vbox{%
+    \hbox to\parindent{\hss Bass\hss}%
+    \hbox to\parindent{\hss Recorder\hss}}}
+\end{verbatim}
+
  \section{Groupings of instruments}\label{curlybrackets}
 By default, all staves in a system will be joined
 at the left by a thin, vertical rule. In addition, if an instrument has more than

Modified: trunk/Master/texmf-dist/doc/generic/musixtex/musixdoc/slurstiesTypeK.tex
===================================================================
--- trunk/Master/texmf-dist/doc/generic/musixtex/musixdoc/slurstiesTypeK.tex	2017-03-01 22:31:29 UTC (rev 43374)
+++ trunk/Master/texmf-dist/doc/generic/musixtex/musixdoc/slurstiesTypeK.tex	2017-03-01 22:32:52 UTC (rev 43375)
@@ -24,7 +24,7 @@
 Once the software mentioned in the prior two paragraphs is installed and the
 \TeX\ filename database is refreshed, the type~K package can be
 invoked by including the command \verb|\input musixps|
-near the beginning of your source file.
+near the beginning of your source file (but after loading \verb\musixtex.tex\).
 The resulting dvi file should then be converted into Postscript using \textbf{dvips}.
 If desired, a PDF file can then be generated with \textbf{ps2pdf}, \textbf{ghostscript},
 or \textbf{Adobe Acrobat} (see Section~\ref{using} for more information on this).

Modified: trunk/Master/texmf-dist/doc/generic/musixtex/musixdoc/smaller.tex
===================================================================
--- trunk/Master/texmf-dist/doc/generic/musixtex/musixdoc/smaller.tex	2017-03-01 22:31:29 UTC (rev 43374)
+++ trunk/Master/texmf-dist/doc/generic/musixtex/musixdoc/smaller.tex	2017-03-01 22:32:52 UTC (rev 43375)
@@ -1,5 +1,5 @@
-\chapter{Smaller Notes in Normal-Sized Staves}
-Here we describe how to reduce the size of note symbols without changing the
+\chapter{Smaller (or Larger) Notes in Normal-Sized Staves}
+Here we describe how to change the size of note symbols without changing the
 size of the staff itself. Changing overall staff size will be treated in
 Chapter~\ref{staffspacing}.
 
@@ -69,6 +69,8 @@
 \notes&\sk\tbbl0\tbl0\qb0J|\tbl1\zq c\qb1e\en
 \endextract
 \end{verbatim}\end{quote}
+Similarly, you may use 
+\keyindex{largenotesize} or \keyindex{Largenotesize} to get \emph{larger} notes.
 
  \section{Grace notes}
 Grace notes are a special case of small and tiny notes, namely single-stemmed

Modified: trunk/Master/texmf-dist/doc/generic/musixtex/musixdoc/transposition.tex
===================================================================
--- trunk/Master/texmf-dist/doc/generic/musixtex/musixdoc/transposition.tex	2017-03-01 22:31:29 UTC (rev 43374)
+++ trunk/Master/texmf-dist/doc/generic/musixtex/musixdoc/transposition.tex	2017-03-01 22:32:52 UTC (rev 43375)
@@ -9,21 +9,16 @@
 \section{Logical transposition and octaviation}
 
 Logical transposition is controlled by an integer-valued \TeX\ register
-\keyindex{transpose}. Its default value is 0. If you enter
-\verb|\transpose=|$n$, then all subsequent pitches specified by
+\keyindex{transpose}. Its default value is $0$. If you enter
+\verb|\transpose=|$n$ outside of notes commands, then all subsequent pitches specified by
 letters will be transposed by $n$ positions. Normally this method would be
 used to transpose an entire piece. Pitches specified with
 numbers will not be affected, so if you think you will ever want to
 transpose a piece, you should enter all note pitches with letters.
 
-One way to transpose up or down by one octave would be to set
-\keyindex{transpose} to $7$ or $-7$. For example, to make a quarter note
-octave as a chord, you could define a macro as
-\verb|\def\soqu#1{\zq{#1}{\transpose=7 \qu{#1}}}|.
-Note that because \verb|\transpose| is altered inside a pair of braces, the
-effect of the alteration is only local and does not reach outside the braces.
-
- Another more convenient way to transpose locally up or down by one octave
+One way to transpose up or down by one octave would be to increase or decrease
+\keyindex{transpose} by $7$.
+A more convenient way to transpose locally up or down by one octave
 makes use respectively of the characters
 \verb|'| (close-quote, interpreted as an \itxem{acute accent}) and \verb|`| (open-quote, interpreted as
 a \itxem{grave accent}),
@@ -30,22 +25,23 @@
 placed immediately before the letter specifying the pitch. So
 for example \verb|\qu{'ab}| is equivalent to \verb|\qu{hi}| and
 \verb|\qu{`kl}| is equivalent to \verb|\qu{de}|. These characters have
-cumulative effects but in a somewhat restricted sense. They will alter the value of
-\verb|\transpose|, but only until changing to a different staff or
-instrument or encountering \verb|\en|, at which time it will be reset to the
+cumulative effects; thus,
+for example, \verb|\qu{''A'A}| and \verb|\qu{''A}\qu{'A}| are both equivalent to \verb|\qu{ah}|.
+Alterations to the value of
+\verb|\transpose| in notes commands are \emph{local}: when changing to a different staff or
+instrument or encountering \verb|\en|, \verb|\transpose|  will be reset to the
 value it had before the accents were used. (That value is stored in
-another register called \keyindex{normaltranspose}). Thus for example
-\verb|\qu{''A'A}| and \verb|\qu{''A}\qu{'A}|
-are both equivalent to \verb|\qu{ah}|.
+another register called \keyindex{normaltranspose}). Another way to localize
+changes to \verb|\transpose| is to create an explicit \TeX\  ''group'' by enclosing commands in \verb|{...}| braces.
 
 At any point it is possible to reset the \verb|\transpose| register
-explicitly to the value it had
-when entering \verb|\notes|, by prefacing a pitch indication with
+explicitly to the \verb|\normaltranspose| value 
+by prefacing a pitch indication with
 ``\verb|!|''. Thus \verb|\qu{!a'a}| always
 gives the note \verb|a| and its upper octave \verb|h|, shifted by the
-value of {\Bslash transpose} at the beginning of the current
-\verb|\notes...\en| group, regardless of the number of grave and
-acute accents occurring previously within that group.
+value of {\Bslash normaltranspose}, 
+regardless of the number of grave and
+acute accents earlier in that group.
 
  \section{Behavior of accidentals under logical transposition}\label{transposeaccids}
  The above processes indeed change the vertical position of the note heads

Modified: trunk/Master/texmf-dist/doc/generic/musixtex/musixdoc.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/generic/musixtex/musixtex-install.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/man/man1/musixtex.1
===================================================================
--- trunk/Master/texmf-dist/doc/man/man1/musixtex.1	2017-03-01 22:31:29 UTC (rev 43374)
+++ trunk/Master/texmf-dist/doc/man/man1/musixtex.1	2017-03-01 22:32:52 UTC (rev 43375)
@@ -1,5 +1,5 @@
 .\" This manpage is licensed under the GNU Public License
-.TH MUSIXTEX 1 2016-06-06  "musixtex version 0.16" ""
+.TH MUSIXTEX 1 2017-01-08  "musixtex version 0.17" ""
 
 .SH NAME
 musixtex \- processes MusiXTeX files, using pre-processors prepmx, pmxab and autosp as necessary, 
@@ -71,21 +71,15 @@
 output usage summary and quit
 .TP
 .B -l 
-assumes LaTeX source;
+assume LaTeX source;
 implied if the file has .ltx extension
 .TP
 .B -p 
-changes the TeX processor to 
+change the TeX processor to 
 .BR pdfetex (1) 
 or
 .BR pdflatex (1)
-(and doesn't run 
-.BR dvips (1)
-and 
-.BR ps2pdf (1)
-or
-.BR dvipdfm (1)
-)
+(and doesn't run a dvi processor)
 .TP
 .B -c
 preprocess pmx file using 
@@ -92,25 +86,33 @@
 .BR pmxchords (1)
 .TP
 .B -d 
-changes the dvi processor to
+don't generate a .ps file and change the dvi processor to
 .BR dvipdfm (1)
+.TP
+.B -D dvix
+use
+.B dvix 
+as the dvi processor; e.g., -D "dvipdfm -m 0.9". 
+Use -d
+.I before 
+-D to suppress .ps generation.
 .TP 
 .B -F fmt
-uses 
+use 
 .B fmt
 as the TeX processor; e.g., -F "luatex --output-format=dvi"
 .TP
 .B -m
-stops processing at the pmx file
+stop processing at the pmx file
 .TP
 .B -t
-stops processing at the tex/mid files
+stop processing at the tex/mid files
 .TP
 .B -s 
-stops processing at the dvi file
+stop processing at the dvi file
 .TP
 .B -g
-stops processing at the ps file
+stop processing at the ps file
 .TP 
 .B -i
 retain intermediate and log files

Modified: trunk/Master/texmf-dist/doc/man/man1/musixtex.man1.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/scripts/musixtex/musixtex.lua
===================================================================
--- trunk/Master/texmf-dist/scripts/musixtex/musixtex.lua	2017-03-01 22:31:29 UTC (rev 43374)
+++ trunk/Master/texmf-dist/scripts/musixtex/musixtex.lua	2017-03-01 22:32:52 UTC (rev 43375)
@@ -1,6 +1,6 @@
 #!/usr/bin/env texlua  
 
-VERSION = "0.16e"
+VERSION = "0.17a"
 
 --[[
      musixtex.lua: processes MusiXTeX files using prepmx and/or pmxab and/or 
@@ -29,6 +29,10 @@
 
   ChangeLog:
 
+     version 0.17a   2017-01-08 RDT
+       Added -D option.
+       Avoid writing or concatenating a nil value.
+
      version 0.16e  2016-03-02 DL
        missing version information (caused by batchmode in 0.16c) fixed
 
@@ -121,7 +125,8 @@
          -l  latex source
          -p  direct tex-pdf (pdftex etc)
          -F fmt  use fmt as the TeX processor
-         -d  tex-dvi-pdf (dvipdfm)
+         -d  tex-dvi-pdf (using dvipdfm if -D not used)
+         -D dvixx  use dvixx as the dvi processor
          -c  preprocess pmx file using pmxchords
          -m  stop at pmx
          -t  stop at tex/mid
@@ -162,9 +167,9 @@
   end
 end
 
--- The global variables below may be changed by set_options(). System
---   commands for the various programs are mostly set to nil if the step
---   is to be omitted, which can be tested by a simple "if" statement.
+--   System commands for the various programs are mostly
+--   set to nil if the step is to be omitted, which can be
+--   tested by a simple "if" statement.
 -- Exceptions:
 --    'tex' is the command for processing a TeX file, but it is important
 --       to know whether the user has explicitly specified an option that
@@ -279,6 +284,9 @@
     override = override .. 'p'
   elseif this_arg == "-d" then
     dvi = "dvipdfm"; ps2pdf = nil
+  elseif this_arg == "-D" then
+    narg = narg+1
+    dvi = arg[narg]
   elseif this_arg == "-c" then
     pmx = "pmxchords"
   elseif this_arg == "-F" then
@@ -317,7 +325,14 @@
 
 function find_file(this_arg)
   basename, extension = this_arg:match"(.*)%.(.*)"  
-  if not extension then
+  if extension then
+  extensions = {["mtx"] = true, ["pmx"] = true, ["aspc"] = true, ["tex"] = true, ["ltx"] = true}
+  if not extensions[extension] then
+      print("!! extension " .. extension .. " unrecognized; valid extensions are mtx|pmx|aspc|tex|ltx.")
+      exit_code = exit_code+1
+      return
+    end
+  else
     basename = this_arg 
     for ext in ("mtx,pmx,aspc,tex,ltx"):gmatch"[^,]+" do
       if exists (basename .. "." .. ext) then
@@ -326,7 +341,7 @@
      end
     end
     if not extension then
-      print("!! No file " .. basename .. "[.mtx|.pmx|.aspc|.tex|.ltx]")
+      print("!! No file " .. basename .. ".[mtx|pmx|aspc|tex|ltx]")
       exit_code = exit_code+1
       return
     end
@@ -544,9 +559,9 @@
   if this_arg:match"^%-" then process_option(this_arg)
   else
     basename, extension = find_file(this_arg)  -- nil,nil if not found
-    extension = preprocess(basename,extension)
+    extension = preprocess(basename, extension)
     tex_process(tex,basename,extension)
-    if io.open(basename..".log") then -- to be printed later
+    if basename and io.open(basename..".log") then -- to be printed later
       versions = report_texfiles(basename..".log")
     end
     if basename and cleanup then
@@ -561,7 +576,7 @@
   narg = narg+1
 until narg > #arg 
 
-musixlog:write(versions)
+if versions then musixlog:write(versions) end
 report_versions(tempname)
 musixlog:close()
 os.exit( exit_code )

Modified: trunk/Master/texmf-dist/tex/generic/musixtex/musixec.tex
===================================================================
--- trunk/Master/texmf-dist/tex/generic/musixtex/musixec.tex	2017-03-01 22:31:29 UTC (rev 43374)
+++ trunk/Master/texmf-dist/tex/generic/musixtex/musixec.tex	2017-03-01 22:32:52 UTC (rev 43375)
@@ -21,9 +21,10 @@
 %   the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 %   Boston, MA 02111-1307, USA.
 %
-%   Copyright 2015-2016  Bob Tennent rdt at cs.queensu.ca
+%   Copyright 2015-2017  Bob Tennent rdt at cs.queensu.ca
 %
-\immediate\write16{MusiXec\space<2016/02/22>}
+\ifx\undefined\startpiece\errmessage{Input musixtex.tex before musixec.tex}\fi
+\immediate\write16{MusiXec\space<2017/02/10>}
 %
 
 \longECfontnamestrue
@@ -131,11 +132,11 @@
 \font\twfvsl=ecsl2488
 
 %
-% Redefine accented characters for etex
+% Redefine accented characters for 8-bit font
 %
-\edef\catcodeat{\the\catcode`\@}\catcode`\@=11
 
 \ifx\documentclass\undefined
+\edef\catcodeat{\the\catcode`\@}\catcode`\@=11
 \def\ProvidesFile#1[#2]{}
 \def\DeclareFontEncoding#1#2#3{}
 \def\DeclareTextAccent#1#2#3{%
@@ -160,9 +161,9 @@
 \def\c#1{\leavevmode\ifx c#1\char231 \else\setbox\z@\hbox{#1}\ifdim\ht\z@=1ex\accent11 #1%
      \else{\ooalign{\unhbox\z@\crcr
         \hidewidth\char11\hidewidth}}\fi\fi}
+\catcode`\@=\catcodeat
 \fi
 
-\catcode`\@=\catcodeat
 
 \normtype
 \endinput

Modified: trunk/Master/texmf-dist/tex/generic/musixtex/musixhv.tex
===================================================================
--- trunk/Master/texmf-dist/tex/generic/musixtex/musixhv.tex	2017-03-01 22:31:29 UTC (rev 43374)
+++ trunk/Master/texmf-dist/tex/generic/musixtex/musixhv.tex	2017-03-01 22:32:52 UTC (rev 43375)
@@ -21,9 +21,10 @@
 %   the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 %   Boston, MA 02111-1307, USA.
 %
-%   Copyright 2015-2016  Bob Tennent rdt at cs.queensu.ca
+%   Copyright 2015-2017  Bob Tennent rdt at cs.queensu.ca
 %
-\immediate\write16{MusiXhv\space<2016/02/22>}
+\immediate\write16{MusiXhv\space<2017/02/10>}
+\ifx\undefined\startpiece\errmessage{Input musixtex.tex before musixhv.tex}\fi
 %
 % 7pt "Roman" (sans serif), bold, "italic" (oblique), "bold-italic" (bold-oblique), and small-cap
 \font\sevenrm=phvr8t at 7pt
@@ -133,7 +134,8 @@
 \font\twfvsl=phvro8t scaled \magstep5 
 %
 %
-\edef\catcodeat{\the\catcode`\@}\catcode`\@=11
+\edef\catcodeat{\the\catcode`\@}
+\catcode`\@=11
 %
 \def\sF{{\ppff s\p at kern f}}
 \def\sfz{{\ppff s\p at kern f\f at kern z}}
@@ -147,6 +149,7 @@
 % Redefine accented characters for etex, suggested by David Carlisle:
 %
 \ifx\documentclass\undefined
+\catcode`\@=11
 \def\ProvidesFile#1[#2]{}
 \def\DeclareFontEncoding#1#2#3{}
 \def\DeclareTextAccent#1#2#3{%
@@ -167,7 +170,6 @@
 
 \input t1enc.def 
 
-\edef\catcodeat{\the\catcode`\@}\catcode`\@=11
 \def\c#1{\leavevmode\ifx c#1\char231 \else\setbox\z@\hbox{#1}\ifdim\ht\z@=1ex\accent11 #1%
      \else{\ooalign{\unhbox\z@\crcr
         \hidewidth\char11\hidewidth}}\fi\fi}

Modified: trunk/Master/texmf-dist/tex/generic/musixtex/musixlit.tex
===================================================================
--- trunk/Master/texmf-dist/tex/generic/musixtex/musixlit.tex	2017-03-01 22:31:29 UTC (rev 43374)
+++ trunk/Master/texmf-dist/tex/generic/musixtex/musixlit.tex	2017-03-01 22:32:52 UTC (rev 43375)
@@ -17,7 +17,7 @@
 %   Boston, MA 02111-1307, USA.
 %
 
-\immediate\write16{MusiXLITurgical 0.37\space<23 Dec 2015>}%
+\immediate\write16{MusiXLITurgical 0.38\space<17 Dec 2016>}%
 
 \ifx\undefined\oldGclef \else \endinput \fi
 
@@ -34,6 +34,8 @@
 \def\cnql{\def\q at u{\musixfont\@c}\@nq}
 \def\cnhu{\def\q at u{\musixchar101}\@nq}
 \def\cnhl{\def\q at u{\musixchar102}\@nq}
+\def\cqb{\def\q at u{\musixchar99}\@qb}  % RDT 2016-12-17
+\def\zcqb{\advancefalse\cqb}          % RDT 2016-12-17
 
 
 % Moved to musixtex.tex.  RDT 2015-12-23

Modified: trunk/Master/texmf-dist/tex/generic/musixtex/musixplt.tex
===================================================================
--- trunk/Master/texmf-dist/tex/generic/musixtex/musixplt.tex	2017-03-01 22:31:29 UTC (rev 43374)
+++ trunk/Master/texmf-dist/tex/generic/musixtex/musixplt.tex	2017-03-01 22:32:52 UTC (rev 43375)
@@ -21,9 +21,10 @@
 %   the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 %   Boston, MA 02111-1307, USA.
 %
-%   Copyright 2015-2016  Bob Tennent rdt at cs.queensu.ca
+%   Copyright 2015-2017  Bob Tennent rdt at cs.queensu.ca
 %
-\immediate\write16{MusiXplt\space<2016/02/22>}
+\immediate\write16{MusiXplt\space<2017/02/10>}
+\ifx\undefined\startpiece\errmessage{Input musixtex.tex before musixplt.tex}\fi
 %
 % 7pt roman, bold, italic, bold italic, slanted and small-cap
 \font\sevenrm=pplr8t at 7pt
@@ -147,9 +148,11 @@
 \catcode`\@=\catcodeat
 
 %
-% Redefine accented characters for etex, suggested by David Carlisle:
+% Redefine accented characters for 8-bit font, suggested by David Carlisle:
 %
+
 \ifx\documentclass\undefined
+\catcode`\@=11
 \def\ProvidesFile#1[#2]{}
 \def\DeclareFontEncoding#1#2#3{}
 \def\DeclareTextAccent#1#2#3{%
@@ -170,7 +173,6 @@
 
 \input t1enc.def 
 
-\edef\catcodeat{\the\catcode`\@}\catcode`\@=11
 % \c needs special treatment
 \def\c#1{\leavevmode\ifx c#1\char231 \else\setbox\z@\hbox{#1}\ifdim\ht\z@=1ex\accent11 #1%
      \else{\ooalign{\unhbox\z@\crcr

Modified: trunk/Master/texmf-dist/tex/generic/musixtex/musixppff.tex
===================================================================
--- trunk/Master/texmf-dist/tex/generic/musixtex/musixppff.tex	2017-03-01 22:31:29 UTC (rev 43374)
+++ trunk/Master/texmf-dist/tex/generic/musixtex/musixppff.tex	2017-03-01 22:32:52 UTC (rev 43375)
@@ -12,7 +12,8 @@
 %%    ...
 %%
 %% 
-\immediate\write16{MusiXppff \noexpand\ppff font replacement <2015/07/25>}%
+\immediate\write16{MusiXppff \noexpand\ppff font replacement <2017/02/10>}%
+\ifx\undefined\startpiece\errmessage{Input musixtex.tex before musixppff.tex}\fi
 
 \font\xppfftwelve=xppff10 at 8pt
 \font\xppffsixteen=xppff10

Modified: trunk/Master/texmf-dist/tex/generic/musixtex/musixps.tex
===================================================================
--- trunk/Master/texmf-dist/tex/generic/musixtex/musixps.tex	2017-03-01 22:31:29 UTC (rev 43374)
+++ trunk/Master/texmf-dist/tex/generic/musixtex/musixps.tex	2017-03-01 22:32:52 UTC (rev 43375)
@@ -1,6 +1,7 @@
 %% PostScript slurs, ties and crescendos
 %   Coded by Stanislav Kneifl
 
+\ifx\undefined\startpiece\errmessage{Input musixtex.tex before musixps.tex}\fi
 \ifx\undefined\liftcresc\else\endinput\fi
 
 \immediate\write16{MusiXPS PostScript slurs, ties and crescendos 0.93 (17.2.2015)}%

Modified: trunk/Master/texmf-dist/tex/generic/musixtex/musixtex.tex
===================================================================
--- trunk/Master/texmf-dist/tex/generic/musixtex/musixtex.tex	2017-03-01 22:31:29 UTC (rev 43374)
+++ trunk/Master/texmf-dist/tex/generic/musixtex/musixtex.tex	2017-03-01 22:32:52 UTC (rev 43375)
@@ -25,15 +25,25 @@
 
 \def\mufl at x{0.83}%
 \def\mxmajorvernumber{1}
-\def\mxminorvernumber{23}
+\def\mxminorvernumber{24}
 \def\mxvernumber{\mxmajorvernumber\mxminorvernumber}% make it possible to compare with \ifnum
 \def\mxversuffix{}% 
 \edef\mxversion{\mxmajorvernumber.\mxminorvernumber\mxversuffix}
-\def\mxdate{2016-06-06}
+\def\mxdate{2017-02-28}
 
 \immediate\write16{MusiXTeX(c) \mxversion\space<\mxdate>}%
 \everyjob{\immediate\write16{MusiXTeX(c) \mxversion\space<\mxdate>}}%
 
+% version 1.24
+
+% preserve changes to \transpose in an hboxed tremolo command
+% test that musixtex.tex has already been loaded in some extensions: 
+%   musixps, musixec, musixhv, musixplt, musixtmr, musixppff 
+% changed from \it to \ppff in several places
+% support new command \setinterstaff{n}{m}
+% define \largenotesize, \Largenotesize
+% correct typos \twtybf[g] \svtbf[g] 
+
 % version 1.23
 
 % added \xtr and \ptr ornaments
@@ -247,7 +257,7 @@
 \newcount\n at vi
 \newcount\n at vii
 \newcount\n at viii
-%\newcount\count@ %=\count255 def'd in plain
+\newcount\count@ 
 
 \newbox\toks at box
 \newbox\w at rkbox
@@ -342,6 +352,7 @@
       \advance\count@ by\@ne
       %
       \expandafter \let \csname interinstrument\roman at c@\endcsname \interinstrument
+      \expandafter\def\csname interfacteur\roman at c@\endcsname{\interfacteur}  %  RDT 1.24
       %
       % altitude
       \expandafter \noexpand at newskip  \csname k at i\roman at c@\endcsname
@@ -1568,6 +1579,10 @@
   \let\curr at ntsiz@\smallnotesize}
 \def\tinynotesize{\set at tinynotesize\comput at specifics
   \let\curr at ntsiz@\tinynotesize}
+\def\largenotesize{\set at largenotesize\comput at specifics  % v.124  RDT
+  \let\curr at ntsiz@\largenotesize}
+\def\Largenotesize{\set at Largenotesize\comput at specifics  % v.124  RDT
+  \let\curr at ntsiz@\Largenotesize}
 
 \def\musickeyfont{%
   \ifdim\internote<\p at seven6\Internote \musictinyfont
@@ -1686,8 +1701,8 @@
     \let\hsluru\hslurutwenty \let\hslurd\hslurdtwenty
     \let\slurud\slurutwentyd \let\slurdd\slurdtwentyd %    +ickd
     \let\hslurud\hslurutwentyd \let\hslurdd\hslurdtwentyd %+ickd
-    \let\meternorfont\svtbfg \let\metersmallfont\frtbf     % version 1.18  RDT
-    \let\meterbigfont\twtybfg \let\meterlargefont\twfvbf
+    \let\meternorfont\svtbf \let\metersmallfont\frtbf     % version 1.18  RDT
+    \let\meterbigfont\twtybf \let\meterlargefont\twfvbf   % version 1.24 typos corrected
     \let\meterLargefont\twfvbf
     \let\tinyppff\ppfftwenty   
     \let\smallppff\ppfftwentyfour
@@ -1788,7 +1803,8 @@
   \edef\st at ffs{\csname n at p\romannumeral\noinstrum at nt\endcsname}%
   \edef\nblines{\csname n at l\romannumeral\noinstrum at nt\endcsname}%
   \edef\internote{\csname i at n\romannumeral\noinstrum at nt\endcsname}%
-  \interportee\interfacteur\internote \interportee\tw@\interportee}
+  \edef\int at rf{\csname interfacteur\romannumeral\noinstrum at nt\endcsname}%    RDT 1.24
+  \interportee\int at rf\internote \interportee\tw@\interportee}           %    RDT 1.24
 
 \def\C at Inter{%  RDT: corrected to work if \nblines > 6   (version 1.23)
   \stem at skip\interportee
@@ -1899,6 +1915,9 @@
 \def\setinterinstrument#1#2{\n at v#1\relax % select instrument
   \expandafter\def\csname interinstrument\romannumeral\n at v\endcsname{#2}}
 
+\def\setinterstaff#1#2{\n at v#1\relax % select instrument  % RDT 1.24
+  \expandafter\def\csname interfacteur\romannumeral\n at v\endcsname{#2}}
+
 %%% portees
 
 \newdimen\systemheight
@@ -2977,7 +2996,7 @@
   \let\rq\rq@ \let\lq\lq@ \let\ds\ds at oup \let\mp\mp@
   \locx at skip\x at skip}
 
-\def\@ndstaff{\egroup
+\def\@ndstaff{\egroup  % this where \transpose gets reset 
   \ifdim\n at skip<\wd\n at otebox \n at skip\wd\n at otebox \fi
   \raise\altportee\rlap{\unhbox\n at otebox}}
 
@@ -3030,8 +3049,8 @@
       \if .\t at ruc \let\@TI\pt   \C at GET \fi
       \if >\t at ruc \let\@TI\dsh \C at GET \fi
       \if <\t at ruc \let\@TI\dfl \C at GET \fi
-      \if !\t at ruc \transpose\normaltranspose \C at Get \fi
-      \if '\t at ruc \advance\transpose\s at v@n   \C at Get \fi
+      \if !\t at ruc \transpose\normaltranspose \C at Get \fi  
+      \if '\t at ruc \advance\transpose\s at v@n   \C at Get \fi  
       \if `\t at ruc \advance\transpose-\s at v@n  \C at Get \fi
       \ifnum\n at viii<\maxdimen \n at i#1\fi
     \else
@@ -4298,7 +4317,7 @@
 
 \def\trilleX{\let\T at i\empty \C at trille}
 \let\trille\trilleX
-\def\TrilleX{\def\T at i{\it tr }\C at trille}
+\def\TrilleX{\def\T at i{\ppff tr }\C at trille}  % 1.24  changed from \it    RDT
 \let\Trille\TrilleX
 \def\C at trille#1#2{\zcharnote{#1}{\y at v#2\noteskip \trill@}}
 
@@ -4337,7 +4356,7 @@
 \def\tTrill at old#1{\s at l@cttrill#1\relax
   \message{\noexpand\tr at x=\the\tr at x, No. #1}%
   \ifdim\tr at x < \maxdimen\else\errmessage{\@mis \noexpand\Itrille \number #1}\fi
-  \def\T at i{\it tr }\C at tri}
+  \def\T at i{\ppff tr }\C at tri}   % 1.24  changed from \it  RDT
 
 \def\C at tri#1{\getcurpos\advance\y at v-\tr at y \kernm\y at v
   \zcharnote{#1}\trill@\kern\y at v\let\T at i\empty\let\@itrille\undefined}
@@ -4379,7 +4398,7 @@
   \C at T}
 \def\ITrille#1{\s at l@cttrill#1\relax
   \ifdim\tr at x < \maxdimen\errmessage{\@mis \noexpand\Ttrille \number #1}\fi
-  \global\tr at sw={{\it tr }}%
+  \global\tr at sw={{\ppff tr }}%  1.24  changed from \it  RDT
   \C at T}
 
 \def\C at T#1{%
@@ -4405,23 +4424,26 @@
 %%% version 1.21 
 %%%  RDT changed beam numbers to 5, suggested by JPC
 %%%  RDT adjusted the vertical positions for 16th and 32nd tremolos
+%%% version 1.24
+%%%  RDT use new counter \tr at nspose to preserve changes to \transpose in an \hbox
 
-\def\trml#1{\raise2\internote\hbox{\loffset{0.5}{\ibl5{#1}9}\roffset{0.5}{\tbl5}}}%
-\def\trmu#1{\raise-3\internote\hbox{\loffset{0.5}{\ibu5{#1}9}\roffset{0.5}{\tbu5}}}%
-\def\trrml#1{\raise3\internote\hbox{\loffset{0.5}{\ibbl5{#1}9}\roffset{0.5}{\tbl5}}}%
-\def\trrmu#1{\raise-4\internote\hbox{\loffset{0.5}{\ibbu5{#1}9}\roffset{0.5}{\tbu5}}}%
-\def\trrrml#1{\raise3\internote\hbox{\loffset{0.5}{\ibbbl5{#1}9}\roffset{0.5}{\tbl5}}}%
-\def\trrrmu#1{\raise-4\internote\hbox{\loffset{0.5}{\ibbbu5{#1}9}\roffset{0.5}{\tbu5}}}%
+\newcount\tr at nspose % used to restore value of \transpose after closing an \hbox
+\def\trml#1{\raise2\internote\hbox{\loffset{0.5}{\ibl5{#1}9}\roffset{0.5}{\tbl5}\global\tr at nspose\transpose}\transpose\tr at nspose}%
+\def\trmu#1{\raise-3\internote\hbox{\loffset{0.5}{\ibu5{#1}9}\roffset{0.5}{\tbu5}\global\tr at nspose\transpose}\transpose\tr at nspose}%
+\def\trrml#1{\raise3\internote\hbox{\loffset{0.5}{\ibbl5{#1}9}\roffset{0.5}{\tbl5}\global\tr at nspose\transpose}\transpose\tr at nspose}%
+\def\trrmu#1{\raise-4\internote\hbox{\loffset{0.5}{\ibbu5{#1}9}\roffset{0.5}{\tbu5}\global\tr at nspose\transpose}\transpose\tr at nspose}%
+\def\trrrml#1{\raise3\internote\hbox{\loffset{0.5}{\ibbbl5{#1}9}\roffset{0.5}{\tbl5}\global\tr at nspose\transpose}\transpose\tr at nspose}%
+\def\trrrmu#1{\raise-4\internote\hbox{\loffset{0.5}{\ibbbu5{#1}9}\roffset{0.5}{\tbu5}\global\tr at nspose\transpose}\transpose\tr at nspose}%
 
 % whole notes are wider than quarter/half notes:
 % version 1.21 RDT adjusted the offsets and vertical positions 
 
-\def\Trml#1{\raise3\internote\hbox{\ibl5{#1}9\roffset{1.25}{\tbl5}}}%
-\def\Trmu#1{\raise-4\internote\hbox{\loffset{1.1}{\ibu5{#1}9}\roffset{0.15}{\tbu5}}}%
-\def\Trrml#1{\raise3\internote\hbox{\ibbl5{#1}9\roffset{1.25}{\tbl5}}}%
-\def\Trrmu#1{\raise-4\internote\hbox{\loffset{1.1}{\ibbu5{#1}9}\roffset{0.15}{\tbu5}}}%
-\def\Trrrml#1{\raise3\internote\hbox{\ibbbl5{#1}9\roffset{1.25}{\tbl5}}}%
-\def\Trrrmu#1{\raise-4\internote\hbox{\loffset{1.1}{\ibbbu5{#1}9}\roffset{0.15}{\tbu5}}}%
+\def\Trml#1{\raise3\internote\hbox{\ibl5{#1}9\roffset{1.25}{\tbl5}\global\tr at nspose\transpose}\transpose\tr at nspose}%
+\def\Trmu#1{\raise-4\internote\hbox{\loffset{1.1}{\ibu5{#1}9}\roffset{0.15}{\tbu5}\global\tr at nspose\transpose}\transpose\tr at nspose}%
+\def\Trrml#1{\raise3\internote\hbox{\ibbl5{#1}9\roffset{1.25}{\tbl5}\global\tr at nspose\transpose}\transpose\tr at nspose}%
+\def\Trrmu#1{\raise-4\internote\hbox{\loffset{1.1}{\ibbu5{#1}9}\roffset{0.15}{\tbu5}\global\tr at nspose\transpose}\transpose\tr at nspose}%
+\def\Trrrml#1{\raise3\internote\hbox{\ibbbl5{#1}9\roffset{1.25}{\tbl5}\global\tr at nspose\transpose}\transpose\tr at nspose}%
+\def\Trrrmu#1{\raise-4\internote\hbox{\loffset{1.1}{\ibbbu5{#1}9}\roffset{0.15}{\tbu5}\global\tr at nspose\transpose}\transpose\tr at nspose}%
 
 %%% octave lines
 
@@ -4700,7 +4722,7 @@
 \def\f{{\ppff f}}
 \def\ff{{\ppff f\f at kern f}}
 \def\fp{{\ppff f\f at kern p}}
-\def\sF{{\it s\ppff \p at kern f}}
+\def\sF{{\ppff s\ppff \p at kern f}}  % changed \it to \ppff  1.24 RDT
 \def\fff{{\ppff f\f at kern f\f at kern f}}
 \def\ffff{{\ppff f\f at kern f\f at kern f\f at kern f}}
 \def\mf{{\ppff m\p at kern\f at kern f}}
@@ -4966,11 +4988,12 @@
 
 %%% standard settings
 % [115] make them compatible to >12 instruments
-\def\resetlayout{\let\interfacteur\nin@
+\def\resetlayout{\def\interfacteur{9}%
   \stafftopmarg\thr@@\Interligne \staffbotmarg\thr@@\Interligne
   \count@\z@ \loop
     \advance\count@ by\@ne
     \expandafter \let\csname n at l\roman at c@\endcsname \fiv@
+    \expandafter\def\csname interfacteur\roman at c@\endcsname{\interfacteur}    % RDT 1.24
   \ifnum\count@<\maxinstruments\repeat
   \resetclefsymbols}
 

Modified: trunk/Master/texmf-dist/tex/generic/musixtex/musixtmr.tex
===================================================================
--- trunk/Master/texmf-dist/tex/generic/musixtex/musixtmr.tex	2017-03-01 22:31:29 UTC (rev 43374)
+++ trunk/Master/texmf-dist/tex/generic/musixtex/musixtmr.tex	2017-03-01 22:32:52 UTC (rev 43375)
@@ -20,7 +20,8 @@
 %%
 %% History: see trailer.
 %
-\immediate\write16{MusiXTimesFonts\space<2016/02/22>}
+\immediate\write16{MusiXTimesFonts\space<2017/02/10>}
+\ifx\undefined\startpiece\errmessage{Input musixtex.tex before musixtmr.tex}\fi
 %
 % 7pt roman, bold, italic, bold italic, slanted and small-cap
 \font\sevenrm=ptmr8t at 7pt
@@ -146,7 +147,7 @@
 \let\mezzopiano\mp@
 
 %
-% Redefine accented characters for etex, suggested by David Carlisle:
+% Redefine accented characters for 8-bit font, suggested by David Carlisle:
 %
 \ifx\documentclass\undefined
 \def\ProvidesFile#1[#2]{}
@@ -166,10 +167,10 @@
 \def#1{\char#3\relax}}
 \def\DeclareTextComposite#1#2#3#4{%
 \expandafter\def\csname T1\string#1-\string#3\endcsname{\char#4\relax}}
+\edef\catcodeat{\the\catcode`\@}\catcode`\@=11
 
 \input t1enc.def 
 
-\edef\catcodeat{\the\catcode`\@}\catcode`\@=11
 % \c needs special treatment
 \def\c#1{\leavevmode\ifx c#1\char231 \else\setbox\z@\hbox{#1}\ifdim\ht\z@=1ex\accent11 #1%
      \else{\ooalign{\unhbox\z@\crcr
@@ -196,4 +197,5 @@
 %%  8-bit encoding and extensions, similar to musixplt.tex
 %% 2015-07-25
 %% change to ptmr8t fonts and use t1enc.def to re-defined accented characters
-
+%% 2016-07-11 RDT
+%% \catcode`\@=11 before inputting t1enc.def



More information about the tex-live-commits mailing list