musixtex (7jun16)

git-svn-id: svn://tug.org/texlive/trunk@41352 c570f23f-e606-0410-a88d-b1316a301751

10 files changed, 97 insertions, 23 deletions

diff --git a/Master/texmf-dist/doc/generic/musixtex/ChangeLog-123.txt b/Master/texmf-dist/doc/generic/musixtex/ChangeLog-123.txt
new file mode 100644
index 00000000000..4ffcfed2e90
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/musixtex/ChangeLog-123.txt
@@ -0,0 +1,6 @@
+
+Changes from MusiXTeX 122 to 123:
+
+  +  added \xtr and \ptr ornaments
+  +  adjusted spacing of \tr
+  +  corrected definition of \C@Inter for \nblines > 6
diff --git a/Master/texmf-dist/doc/generic/musixtex/ChangeLog-musixdoc.txt b/Master/texmf-dist/doc/generic/musixtex/ChangeLog-musixdoc.txt
index 6d860036e5a..2efd2aa484b 100644
--- a/Master/texmf-dist/doc/generic/musixtex/ChangeLog-musixdoc.txt
+++ b/Master/texmf-dist/doc/generic/musixtex/ChangeLog-musixdoc.txt
@@ -1,3 +1,7 @@
+2016-06-06  RDT
+
+   Revised the material on page layout.
+
 2015-02-20  RDT
 
    Clean up title page and preface(s).
diff --git a/Master/texmf-dist/doc/generic/musixtex/README b/Master/texmf-dist/doc/generic/musixtex/README
index b95ea1f8894..8f5f78f6d66 100644
--- a/Master/texmf-dist/doc/generic/musixtex/README
+++ b/Master/texmf-dist/doc/generic/musixtex/README
@@ -1,4 +1,4 @@
-This is MusiXTeX, version 1.22 (2016-02-25).
+This is MusiXTeX, version 1.23 (2016-06-06).
 MusiXTeX is a TeX-based system for typesetting music.
 
 The main author was Daniel Taupin, who died in a climbing
diff --git a/Master/texmf-dist/doc/generic/musixtex/musixdoc.pdf b/Master/texmf-dist/doc/generic/musixtex/musixdoc.pdf
index 8f1ceea39a9..2f891a391a3 100644
--- a/Master/texmf-dist/doc/generic/musixtex/musixdoc.pdf
+++ b/Master/texmf-dist/doc/generic/musixtex/musixdoc.pdf
diff --git a/Master/texmf-dist/doc/generic/musixtex/musixdoc/extensions.tex b/Master/texmf-dist/doc/generic/musixtex/musixdoc/extensions.tex
index a0eaf645f58..a4b3c4b2755 100644
--- a/Master/texmf-dist/doc/generic/musixtex/musixdoc/extensions.tex
+++ b/Master/texmf-dist/doc/generic/musixtex/musixdoc/extensions.tex
@@ -1910,7 +1910,7 @@ their meanings are as follows:
 
 
  %\check
- \section{musixsty}\index{musixsty@{\tt musixsty.tex}}
+ \section{musixsty}\index{musixsty@{\tt musixsty.tex}}\label{musixsty}
 
  Provides certain text-handling facilities for titles, footnotes, and other
 items not related to lyrics. It should not be used with \LaTeX. It includes
@@ -1918,6 +1918,8 @@ items not related to lyrics. It should not be used with \LaTeX. It includes
  \item definitions of \keyindex{hsize}, \keyindex{vsize},
 \keyindex{hoffset}, \keyindex{voffset} suitable for A$4$ paper; those using
 other sizes may wish to modify it once and for all;
+ \item a \keyindex{rectoverso}\verb|{|\emph{dimension}\verb|}| command to set up even/odd-page
+       asymmetric margins;
  \item a set of text size commands:
 
  \begin{description}\setlength{\itemsep}{0ex}
@@ -1931,7 +1933,7 @@ other sizes may wish to modify it once and for all;
   \item[\keyindex{twtypoint}] to get $20.74$ point font size;
   \item[\keyindex{twfvpoint}] to get $24.88$ point font size;
  \end{description}
- \item commands for creating titles:
+ \item commands for creating title-page headings:
   \begin{itemize}\setlength{\itemsep}{0ex} \item \keyindex{author} or
 \keyindex{fullauthor} to be put at the right of the first page, below the
 title of the piece; the calling sequence is, for example
@@ -1949,6 +1951,9 @@ two lines;
   \item \keyindex{othermention} which is displayed on the left of the page,
 vertically aligned with author's name. It may contain \verb|\\| to display it on
 several lines;
+  \item \keyindex{headline} which displays the argument at the top of the title page (use
+   \verb|\hss| after or before the argument text or both to left-align or 
+    right-align or center the text);
   \item \keyindex{maketitle}  which displays all the previous stuff;
   \end{itemize}
 
diff --git a/Master/texmf-dist/doc/generic/musixtex/musixdoc/frontmatter.tex b/Master/texmf-dist/doc/generic/musixtex/musixdoc/frontmatter.tex
index 759a438edca..3dbc437bec3 100644
--- a/Master/texmf-dist/doc/generic/musixtex/musixdoc/frontmatter.tex
+++ b/Master/texmf-dist/doc/generic/musixtex/musixdoc/frontmatter.tex
@@ -1,6 +1,6 @@
 \title{\Huge\bfseries\musixtex\\[\bigskipamount]
 \LARGE\bfseries Using \TeX{} to write polyphonic\\or
-instrumental music\\\Large\itshape Version 1.22}
+instrumental music\\\Large\itshape Version 1.23}
 
 
 %\author{\Large\rm Daniel \sc Taupin\\\large\sl
@@ -67,7 +67,7 @@ Since then, the only significant update to \musixtex\ has been in version 1.15 (
 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.22.
+\musixtex\ version~1.23.
 
 Novice users need not start here.
 Most 
diff --git a/Master/texmf-dist/doc/generic/musixtex/musixdoc/layout.tex b/Master/texmf-dist/doc/generic/musixtex/musixdoc/layout.tex
index 087e42cffdb..afc8bbe9fc2 100644
--- a/Master/texmf-dist/doc/generic/musixtex/musixdoc/layout.tex
+++ b/Master/texmf-dist/doc/generic/musixtex/musixdoc/layout.tex
@@ -48,27 +48,75 @@ behavior, in which vertical space between the systems is distributed
 so that the first staff
 on the page is all the way at the top and the last staff all the way at
 the bottom.
-
 The macro \keyindex{musicparskip} will allow the existing space between
 systems to increase by up to \verb|5\Interligne|.
 
-The following values of page layout parameters will allow the maximum material
-to fit on each page, provided the printer allows the margins that are implied.
+The following values of page-layout parameters will allow as much material
+as possible 
+on a page, provided the printer supports these dimensions, which
+imply approximately half-inch margins:
 
 \begin{center}
-\begin{tabular}{|l|l|l|}\hline
-\multicolumn{1}{|c|}{A4}&\multicolumn{1}{|c|}{letter}&\multicolumn{1}{|c|}{A4 or letter}\\\hline
-\multicolumn{3}{|c|}{\tt\Bslash parindent= 0pt}\\\hline
-\multicolumn{3}{|c|}{\tt\Bslash hoffset= -15.4mm}\\\hline
-\multicolumn{3}{|c|}{\tt\Bslash voffset= -10mm}\\\hline
-\verb+\hsize= 190mm+&\verb+\hsize= 196mm+&\verb+\hsize= 190mm+\\\hline
-\verb+\vsize= 260mm+&\verb+\vsize= 247mm+&\verb+\vsize= 247mm+\\\hline
+\begin{tabular}{|l|l|}\hline
+\multicolumn{1}{|c|}{A$4$}&\multicolumn{1}{|c|}{letter}\\\hline
+\verb+\hsize=190mm+&\verb+\hsize=7.5in+\\\hline
+\verb+\vsize=270mm+&\verb+\vsize=10in+\\\hline
 \end{tabular}
 \end{center}
-%avre
 \zkeyindex{parindent}\zkeyindex{hoffset}\zkeyindex{voffset}
 \zkeyindex{hsize}\zkeyindex{vsize}
-
+You may have to be more conservative if you have headlines or footlines
+or want
+even/odd-page asymmetry, such as with the \keyindex{rectoverso}
+command in \verb|musixsty.tex| (Section~\ref{musixsty}).
+If a score is going to be ``published'' at a public repository (such as
+\mbox{\textsc{imslp}}), you may want to allow for \emph{either}
+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.
+
+
+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, 
+and then subtract one inch because of \TeX\ conventions:
+\begin{enumerate}
+\item[For A$4$ paper (210~mm $\times$ 297~mm):]\quad\\[-2ex]
+\begin{verbatim}
+\hoffset=210mm\advance\hoffset-\hsize\divide\hoffset2
+\advance\hoffset-1.0in
+\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]
+\begin{verbatim}
+\hoffset=8.5in\advance\hoffset-\hsize\divide\hoffset2
+\advance\hoffset-1.0in
+\voffset=11in\advance\voffset-\vsize\divide\voffset2
+\advance\voffset-1.0in
+\end{verbatim}
+\end{enumerate}
+However, if the margins on the \verb|testpage| output are \emph{not} 
+symmetric, 
+the printer is mis-aligned.
+If this can't be corrected, the margin offsets will 
+have to be adjusted. Ideally, this should be done in the \TeX\ configuration
+so all \TeX\ output will be corrected, but offsets can be adjusted
+for just \verb|musixtex| output using
+\verb|\advance\hoffset ...| and/or
+\verb|\advance\voffset ...|
+after the ``normal'' settings given above.
+
+\pagebreak
 
 \section{Page numbering, headers and footers}\index{page
 number}\index{footnote}
diff --git a/Master/texmf-dist/doc/generic/musixtex/musixdoc/miscellaneous.tex b/Master/texmf-dist/doc/generic/musixtex/musixdoc/miscellaneous.tex
index 4d136bd7ef2..7179d9b29ae 100644
--- a/Master/texmf-dist/doc/generic/musixtex/musixdoc/miscellaneous.tex
+++ b/Master/texmf-dist/doc/generic/musixtex/musixdoc/miscellaneous.tex
@@ -79,7 +79,8 @@ dot and a hyphen below a note head at pitch $p$,
  \item \keyindex{flageolett}\pitchp~to put a
 small circle above a note head at pitch $p$.
 \end{itemize}
-These marks are horizontally centered relative to solid note heads. To
+These marks are horizontally centered relative to solid note heads. 
+To
 compensate for the fact that whole notes are wider, you should use
 \keyindex{wholeshift}\verb|{|\ital{Any nonspacing macro}\verb|}| to center accents
 and other items (e.g.,~\verb|\Fermataup|) above a whole note.
@@ -272,7 +273,17 @@ You may use
  \item \keyindex{backturn}\pitchp\ for \hbox to 1.5em{\kern 0.6em\backturn 0\hss}
  \item \keyindex{tr}\pitchp\ for \hbox to 1.5em{\kern 0.6em\tr 0\hss}
  \item \keyindex{trt}\pitchp\ for \hbox to 1.5em{\kern 0.6em\trt 0\hss}\quad (J. S.~Bach's \textit{trillo und mordant})
+ \item \keyindex{xtr}\pitchp\ for \hbox to 1.5em{\kern 0.5em\xtr 0\hss}
+ \item \keyindex{ptr}\pitchp\ for \hbox to 1.5em{\kern 0.5em\ptr 0\hss}
  \end{itemize}
+To
+compensate for the fact that whole notes are wider, you may use
+\begin{quote}
+\keyindex{wholeshift}\verb|{|\mbox{\ital{Any nonspacing macro}}\verb|}| 
+\end{quote}
+to center any of these ornaments
+above a whole note.
+
 
 In the following macros for fermatas, the argument $p$ is the pitch of the
 notehead on which the fermata rests, assuming no additional vertical
@@ -508,7 +519,6 @@ macros \keyindex{Ped}, \keyindex{sPed}, \keyindex{Dep} and \keyindex{sDep}
 in combination with \keyindex{zchar} or \keyindex{zcharnote}.
 Since the \hbox to .7cm{ \Ped\hss} symbol is rather wide, it might collide
 with adjacent bass notes. To shift it horizontally, you could use \verb|\loff{\PED}|.
-\vfill
 
 The following excerpt from \textit{Liebestr\"aume} by Franz Liszt illustrates
 a more modern approach to specifying piano-pedal usage:
@@ -546,13 +556,13 @@ a more modern approach to specifying piano-pedal usage:
 \bar%
 \Notes\pdlud\ql B\sk\qpl\sk\qpl|%
   \zhl{.c}\ds\ibu1i0\qb1{^d^hjh}\tqu1d\en
-\Notes\zqu{M}\hppl\sk\qpu\sk\qu M|%
+\Notes\zqu{M}\hppl\sk\sk\qpu\sk\qu M|%
   \ds\ibu1i0\qb1{dhjh}\tqu1d\en
 \bar%
 \Notes\zmidstaff{$\cdots$}\sk\pdlu\sk|\en
 \endpiece%
 \end{music}
-\pagebreak
+\vspace*{2ex}\par\noindent
 This has been coded using the following commands:
 \begin{quote}
 \begin{tabular}{lll}
@@ -596,7 +606,7 @@ Here is how the excerpt may be coded:
 \bar%
 \Notes\pdlud\ql B\sk\qpl\sk\qpl|%
   \zhl{c}\ds\ibu1i0\qb1{^d^hjh}\tqu1d\en
-\Notes\zqu{M}\hppl\sk\qpu\sk\qu M|%
+\Notes\zqu{M}\hppl\sk\sk\qpu\sk\qu M|%
   \ds\ibu1i0\qb1{dhjh}\tqu1d\en
 \bar%
 \Notes\zmidstaff{$\cdots$}\sk\pdlu\sk|\en
@@ -605,6 +615,7 @@ Here is how the excerpt may be coded:
 \end{footnotesize}
 \end{quote}
 
+\pagebreak
 \noindent
 The following ``mixed'' patterns are also supported:
 \begin{quote}
@@ -665,7 +676,7 @@ suppress this behavior.
 
  \section{Brackets, parentheses, oblique lines and slides}\label{brapar}
 
-Several varieties of brackets, parentheses and oblique lines are provided for
+Several varieties of brackets\index{brackets}, parentheses\index{parentheses} and oblique lines\index{oblique lines} are provided for
 use within a score.
  \begin{itemize}\setlength{\itemsep}{0ex}
  \item \keyindex{lpar}\verb|{|$p$\verb|}| and
diff --git a/Master/texmf-dist/doc/generic/musixtex/musixtex-install.pdf b/Master/texmf-dist/doc/generic/musixtex/musixtex-install.pdf
index 92362a1b78c..6c3622be664 100644
--- a/Master/texmf-dist/doc/generic/musixtex/musixtex-install.pdf
+++ b/Master/texmf-dist/doc/generic/musixtex/musixtex-install.pdf
diff --git a/Master/texmf-dist/doc/generic/musixtex/scripts/musixtex.pdf b/Master/texmf-dist/doc/generic/musixtex/scripts/musixtex.pdf
index 9eb9c1da3f4..a5457c97ef3 100644
--- a/Master/texmf-dist/doc/generic/musixtex/scripts/musixtex.pdf
+++ b/Master/texmf-dist/doc/generic/musixtex/scripts/musixtex.pdf