pmx (21jan13)

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

1 files changed, 15 insertions, 3 deletions

diff --git a/Master/texmf-dist/tex/generic/pmx/pmx.tex b/Master/texmf-dist/tex/generic/pmx/pmx.tex
index 5d7083a455e..a85275f5cdb 100644
--- a/Master/texmf-dist/tex/generic/pmx/pmx.tex
+++ b/Master/texmf-dist/tex/generic/pmx/pmx.tex
@@ -3,8 +3,11 @@
 %% pmx.tex           %%
 %%                   %%
 %%%%%%%%%%%%%%%%%%%%%%%
-\def\pmxversion{2.614}\def\pmxdate{17 July 11}
+\def\pmxversion{2.619}\def\pmxdate{18 August 12}
 
+% 2.619 At movement break, directly set \nbinstruments in \newmovement;
+%   probably don't need \newnoi any more.
+%   (2.619a) Added \resetlyrics in \newmovement.
 % 2.614 Comment out definitions of some dotted rests, since either in 
 %         musixtex.tex or not needed.
 % Modified for two figured bass lines 081115
@@ -545,7 +548,8 @@ depth \h@lf\pcil width \razclef\kern-\h@lf\razclef\kern-\h@lf\pcil\kern-.1pt
 %
 % New Movement Macro
 %
-\def\newmovement#1#2{\let\holdstop\stoppiece\let\holdcont\contpiece%
+%\def\newmovement#1#2{\let\holdstop\stoppiece\let\holdcont\contpiece%
+\def\newmovement#1#2#3{\let\holdstop\stoppiece\let\holdcont\contpiece%
 \ifcase#2\def\endset{\setdoubleBAR}\or\def\endset{\setdoublebar}\or%
 %\def\endset{\setrightrepeat}\or\def\endset{\empty}\fi%
 \def\endset{\setrightrepeat}\or\def\endset{\empty}%
@@ -564,7 +568,14 @@ depth \h@lf\pcil width \razclef\kern-\h@lf\razclef\kern-\h@lf\pcil\kern-.1pt
 %
 \vskip#1\internote%
 \let\stoppiece\holdstop}%
- \def\contpiece{\startpiece\addspace\afterruleskip\let\contpiece\holdcont}%
+% \def\contpiece{
+ \def\contpiece{\def\nbinstruments{#3}% <-- assignment inserted here
+%
+% Added 120904 per Rainer's suggestion to fix problem with M-Tx at m-break.
+%
+\ifx\resetlyrics\undefined\else\resetlyrics\fi%
+%
+\startpiece\addspace\afterruleskip\let\contpiece\holdcont}%
 }%
 %
 %  Redefinitions for moving dots vertically by x\interligne and
@@ -612,6 +623,7 @@ depth \h@lf\pcil width \razclef\kern-\h@lf\razclef\kern-\h@lf\pcil\kern-.1pt
 \def\bartext#1#2{\sk\loffset{.3}{\zcharnote{#1}{\llap{#2}}}\bsk}
 %
 %  Macro used before movement break to change # of instruments.
+%  120818 Set \nbinstruments in \newmovement; probably don't need this any more.
 % 
 \def\newnoi#1{\let\atnb\atnextbar\def\atnextbar{\atnb\def\nbinstruments{#1}}}%
 %