musixtex (7jun16)

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

2 files changed, 55 insertions, 18 deletions

diff --git a/Master/texmf-dist/tex/generic/musixtex/musixsty.tex b/Master/texmf-dist/tex/generic/musixtex/musixsty.tex
index 8683e39ed54..794a7ce336d 100644
--- a/Master/texmf-dist/tex/generic/musixtex/musixsty.tex
+++ b/Master/texmf-dist/tex/generic/musixtex/musixsty.tex
@@ -18,9 +18,10 @@
 %
 \ifx\undefined\Tenpoint \else \endinput\fi
 
-\immediate\write16{MusiXtextSTYle T.116\space<27 February 2015>}%
+\immediate\write16{MusiXtextSTYle T.123\space<04 March 2016>}%
 
 %  modified by RDT to be independent of Computer Modern (other than Math fonts)
+%  RDT: added \headline{..} in \maketitle
 
 \edef\catcodeat{\the\catcode`\@}\catcode`\@=11
 \edef\catcode@gt{\the\catcode`\>}\catcode`\>=12
@@ -292,6 +293,9 @@
 \let\othert@itremorceau\empty
 \def\othermention#1{\def\othert@itremorceau{#1}}
 
+\let\headl@ne\undefined  
+\def\headline#1{\def\headl@ne{#1}}
+
 \let\s@hortauthor\empty
 \def\shortauthor#1{\def\s@hortauthor{(#1)}}
 
@@ -310,7 +314,9 @@
 
 \output{\outmorceau}
 
-\def\maketitle{\centerline{\BIGfont \ifx\headt@itremorceau\undefined
+\def\maketitle{%
+\ifx\headl@ne\undefined\else\line{\headl@ne}\bigskip\fi%  for version 123 RDT
+\centerline{\BIGfont \ifx\headt@itremorceau\undefined
   \titremorceau\else\headt@itremorceau\fi}
 \medskip
 \ifx\subt@itremorceau\undefined\else
@@ -353,16 +359,30 @@
 \catcode`\<=\catcode@lt
 \catcode`\@=\catcodeat
 
-\hsize=185mm
-\vsize=275mm
-\hoffset=210mm
-\advance\hoffset -\hsize
-\divide\hoffset 2\relax
-\advance\hoffset -2.54cm
+%%% A4 (210mm x 297mm):
+\hsize=190mm  %%% adjust to increase/decrease printer margins
+\vsize=270mm  %%% adjust to increase/decrease printer margins
+\hoffset=210mm\advance\hoffset-\hsize\divide\hoffset2
+\advance\hoffset-1.0in % TeX convention
+\voffset=297mm\advance\voffset-\vsize\divide\voffset2
+\advance\voffset-1.0in % TeX convention
+
+%%% letter-size (8.5in x 11.0in):
+%\hsize=7.5in  %%% adjust to increase/decrease printer margins
+%\vsize=10.0in  %%% adjust to increase/decrease printer margins
+%\hoffset=8.5in\advance\hoffset-\hsize\divide\hoffset2
+%\advance\hoffset-1.0in % TeX convention
+%\voffset=11.0in\advance\voffset-\vsize\divide\voffset2
+%\advance\voffset-1.0in % TeX convention
+
+%%% To determine the *minimal* margins supported by your
+%%% printer and check for printer mis-alignment, process
+%%% testpage.tex with LaTeX and print the result.
+
 \tenpoint
-%%%%%%%%%%%%%%%%%%%%%%%%% local adjust to be tuned %%%%%%%%%%%%%%%%%%%%%%%%%%
-\advance\hoffset -5mm
-\voffset=-1.54cm
-%%%%%%%%%%%%%%%%%%%%%%%%% local adjust to be tuned %%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%% adjust here for a non-centering printer %%%%%%%%
+%\advance\hoffset 0mm
+%\advance\voffset 0mm
 
 \endinput
diff --git a/Master/texmf-dist/tex/generic/musixtex/musixtex.tex b/Master/texmf-dist/tex/generic/musixtex/musixtex.tex
index 20013df4b23..3aeb36d56c7 100644
--- a/Master/texmf-dist/tex/generic/musixtex/musixtex.tex
+++ b/Master/texmf-dist/tex/generic/musixtex/musixtex.tex
@@ -25,15 +25,21 @@
 
 \def\mufl@x{0.83}%
 \def\mxmajorvernumber{1}
-\def\mxminorvernumber{22}
+\def\mxminorvernumber{23}
 \def\mxvernumber{\mxmajorvernumber\mxminorvernumber}% make it possible to compare with \ifnum
 \def\mxversuffix{}% 
 \edef\mxversion{\mxmajorvernumber.\mxminorvernumber\mxversuffix}
-\def\mxdate{2016-02-24}
+\def\mxdate{2016-06-06}
 
 \immediate\write16{MusiXTeX(c) \mxversion\space<\mxdate>}%
 \everyjob{\immediate\write16{MusiXTeX(c) \mxversion\space<\mxdate>}}%
 
+% version 1.23
+
+% added \xtr and \ptr ornaments
+% adjusted spacing of \tr
+% corrected definition of \C@Inter for \nblines > 6 
+
 % version 1.22
 
 % bi and sc font definitions added; sl and tt definitions for musixsty moved 
@@ -1784,9 +1790,15 @@
   \edef\internote{\csname i@n\romannumeral\noinstrum@nt\endcsname}%
   \interportee\interfacteur\internote \interportee\tw@\interportee}
 
-\def\C@Inter{\stem@skip\interportee \advance\stem@skip-\@ight\internote
-  \ifnum\nblines=\f@ur \advance\stem@skip\tw@\internote \fi
-  \ifnum\nblines>\fiv@  \advance\stem@skip-\tw@\internote \fi}
+\def\C@Inter{%  RDT: corrected to work if \nblines > 6   (version 1.23)
+  \stem@skip\interportee
+  \ifnum\nblines=\thr@@
+    \advance\stem@skip-\@ight\internote
+  \else
+    \advance\stem@skip-\nblines\internote
+    \advance\stem@skip-\nblines\internote
+    \advance\stem@skip\tw@\internote
+  \fi}
 
 %%% loop over instruments and staffs
 
@@ -4090,9 +4102,14 @@
 \def\mordent{\n@iv89\@Char}
 \def\Mordent{\n@iv119\@Char}
 \def\doublethumb{\n@iv121\@Char}
-\def\tr#1{\zcn{#1}{\ppff tr}}
 \def\trt#1{\loffset{0.65}{\shake{#1}}\roffset{0.65}{\mordent{#1}}}
 
+
+\def\tr#1{\loffset{0.15}{\zcn{#1}{\ppff tr}}} % \loffset added version 1.23  RDT
+\def\xtr#1{\raise1.25\internote\hbox{\n@iv111\zcn{#1}\C@ChaR}}  % added version 1.23  RDT
+\def\ptr#1{\raise1.25\internote\hbox{\n@iv117\zcn{#1}\C@ChaR}}  % added version 1.23  RDT
+%\def\Xtr#1{\wholeshift{\xtr{#1}}}  % unnecessary?
+
 %%% accents
 
 \def\upbow{{\musixfont\@xxiii}}