10 files changed, 42 insertions, 30 deletions
diff --git a/Master/texmf-dist/doc/generic/pmx/ChangeLog b/Master/texmf-dist/doc/generic/pmx/ChangeLog
index e4e72d6c87d..e877c4e7fa1 100644
--- a/Master/texmf-dist/doc/generic/pmx/ChangeLog
+++ b/Master/texmf-dist/doc/generic/pmx/ChangeLog
@@ -198,8 +198,13 @@ above) into parts.
 Repaired several obscure bugs related to platform and compiler
 dependencies; see pmxab.f for details.
 
-2.618
+2.6.18
 
 For letter and a4 paper respectively, commands "Acl" and "Ac4" set
 horizontal and vertical sizes and offsets that center the page with no
 further adjustments required in dvips.
+
+2.6.19
+
+Several changes at movement breaks to improve compatibility with M-Tx 
+and musixlyr.
diff --git a/Master/texmf-dist/doc/generic/pmx/README b/Master/texmf-dist/doc/generic/pmx/README
index 9815cb76b23..2ddd274b887 100644
--- a/Master/texmf-dist/doc/generic/pmx/README
+++ b/Master/texmf-dist/doc/generic/pmx/README
@@ -1,4 +1,4 @@
-This is PMX, version 2.6.18 (Oct. 7th, 2012). PMX provides a preprocessor for MusiXTeX.
+This is PMX, version 2.6.19 (Jan. 13th, 2013). PMX provides a preprocessor for MusiXTeX.
 
 pmxab builds a TeX input file based on a .pmx input file in a much
 simpler language, making most of the layout decisions by itself. It has
@@ -16,38 +16,36 @@ The author of the pmxccn tutorial is Cornelius C. Noack.
 
 This package consists of
 
-  (i) pmx-texmf.zip, which contains macros, documentation, and the
+  (i) pmx.tds.zip, which contains macros, documentation, and the
       pmx2pdf.lua script
 
- (ii) pmx-2.6.18.tar.gz, which contains the source code for 
+ (ii) pmx-2.6.19.tar.gz, which contains the source code for 
       pmxab and scor2prt
 
 (iii) directories Windows and OSX, which contain pre-compiled
-      pmxab and scor2prt executables for those platforms
+      pmxab and scor2prt executables for those platforms, and,
+      for Windows, a batch script for running pmx2pdf.lua
 
  (iv) pmx-install.{tex,pdf}, which is a more detailed version of the
       following instructions:
 
 To install (on TDS-compliant TeX systems):
 
- +  unzip pmx-texmf.zip at the root of a texmf tree and, if necessary,
-    update the filename database; e.g., texhash texmf. Documentation for
-    PMX is installed under doc/generic/pmx.
+ +  unzip /install/support/pmx.tds.zip at the root of a texmf tree and,
+    if necessary, update the filename database; e.g., texhash texmf.
+    Documentation for PMX is installed under doc/generic/pmx.
 
- +  on Windows or OS-X: copy the pre-compiled executables appropriate for your
-    platform to a folder on the executable PATH 
+ +  on Windows or OS-X: copy the executables appropriate for your
+    platform to a folder on the executable PATH
 
- +  on any Unix-like system with gcc and standard development tools installed:  
-    unpack the pmx tarball (anywhere), move to the resulting pmx-2.6.18 directory 
-    and do
+ +  on any Unix-like system with gcc and standard development tools
+    installed: unpack the pmx tarball (anywhere), move to the resulting
+    pmx-2.6.19 directory and do
 
        ./configure
        make
        make install (as root)
 
- +  on Windows: copy the file scripts\pmx\Windows\pmx2pdf.bat to a folder on the 
-    executable PATH
-
  +  on any Unix-like system: install a symbolic link pmx2pdf in any
     directory on the executable PATH to scripts/pmx/pmx2pdf.lua
 
@@ -76,4 +74,4 @@ files are governed by a Notice that allows copying, modification and
 distribution.
 
 This CTAN distribution is maintained by Bob Tennent (rdt@cs.queensu.ca).
-Oct 7th, 2012.
+Jan. 13th, 2013.
diff --git a/Master/texmf-dist/doc/generic/pmx/Windows/pmx2pdf.bat b/Master/texmf-dist/doc/generic/pmx/Windows/pmx2pdf.bat
deleted file mode 100755
index 24184c8deeb..00000000000
--- a/Master/texmf-dist/doc/generic/pmx/Windows/pmx2pdf.bat
+++ /dev/null
@@ -1,6 +0,0 @@
-:: wrapper script to call pmx2pdf.lua
-:: Usage: pmx2pdf [options] basename[.pmx]
-:: Suggested by Tomasz Luczak (Tomek) t34www@googlemail.com
-
-@for /f "delims=" %%I in ('kpsewhich --format=texmfscripts %~n0.lua') do texlua "%%I" %*
-:end
diff --git a/Master/texmf-dist/doc/generic/pmx/pmx-install.pdf b/Master/texmf-dist/doc/generic/pmx/pmx-install.pdf
index b6afd7a02c7..c8403b80dc9 100644
--- a/Master/texmf-dist/doc/generic/pmx/pmx-install.pdf
+++ b/Master/texmf-dist/doc/generic/pmx/pmx-install.pdf
diff --git a/Master/texmf-dist/doc/generic/pmx/pmx-install.tex b/Master/texmf-dist/doc/generic/pmx/pmx-install.tex
index fbc1e849f76..f14576580ab 100644
--- a/Master/texmf-dist/doc/generic/pmx/pmx-install.tex
+++ b/Master/texmf-dist/doc/generic/pmx/pmx-install.tex
@@ -5,7 +5,7 @@
 \RequirePackage{hyperref}
 \usepackage{xcolor}
 \newcommand{\myurl}[1]{\textcolor{blue}{\underline{\textcolor{black}{\url{#1}}}}}
-\newcommand{\pmxVersion}{2.6.18}
+\newcommand{\pmxVersion}{2.6.19}
 \begin{document}
 \title{Installation of the CTAN PMX Distribution}
 \author{Bob Tennent\\
@@ -36,7 +36,7 @@ and installing files\footnote{%
 
 In this distribution of PMX, most of the files to be installed 
 (including macros, documentation, and a processing script) are in 
-\texttt{/install/pmx.tds.zip}, a zipped TEXMF
+\texttt{/install/support/pmx.tds.zip}, a zipped TEXMF
 hierarchy. Simply unzip this archive in the root folder/directory of whichever TEXMF tree
 you decide is most appropriate, likely a ``local'' or ``personal'' one.
 This should work with any TDS\footnote{%
@@ -72,6 +72,7 @@ View System Information\quad$\rightarrow$\quad Advanced\quad$\rightarrow$\quad E
 \end{center}
 scroll
 down to ``path'', select it, click edit, and add the path to \verb|...\scripts\musixtex\Windows| after a semi-colon.
+The batch script \verb|pmx2pdf.bat| should also be installed to a folder on the PATH.
 
 
 On the MAC OS-X platform (version 10.2 or better), one can install \texttt{pmxab} and \texttt{scor2prt} that are in the 
@@ -136,11 +137,11 @@ symbolic link \texttt{pmx2pdf} in any directory on the executable PATH as follow
 On Windows, you can \emph{either}
 copy the batch file
 \begin{list}{}{}
-\item \verb|...\scripts\pmx\Windows\pmx2pdf.bat| 
+\item \verb|Windows\pmx2pdf.bat| 
 \end{list}
 to a folder
 on the executable PATH \emph{or} add the folder
-\verb|...\scripts\pmx\Windows| to the executable PATH as explained above.
+\verb|Windows| to the executable PATH, as explained above.
 
 Documentation for \verb\pmx2pdf\ is in the
 \verb\doc/generic/pmx/scripts\ directory.
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}}}%
 %
diff --git a/Master/texmf/doc/man/man1/pmx2pdf.man1.pdf b/Master/texmf/doc/man/man1/pmx2pdf.man1.pdf
index 219ced697ab..501f47d9a35 100644
--- a/Master/texmf/doc/man/man1/pmx2pdf.man1.pdf
+++ b/Master/texmf/doc/man/man1/pmx2pdf.man1.pdf
diff --git a/Master/texmf/doc/man/man1/pmxab.man1.pdf b/Master/texmf/doc/man/man1/pmxab.man1.pdf
index ff55be5f9a0..61a38398cdc 100644
--- a/Master/texmf/doc/man/man1/pmxab.man1.pdf
+++ b/Master/texmf/doc/man/man1/pmxab.man1.pdf
diff --git a/Master/texmf/doc/man/man1/scor2prt.man1.pdf b/Master/texmf/doc/man/man1/scor2prt.man1.pdf
index 07e5311c67f..1ea46b9b310 100644
--- a/Master/texmf/doc/man/man1/scor2prt.man1.pdf
+++ b/Master/texmf/doc/man/man1/scor2prt.man1.pdf
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 25714eddbcb..7a4e2b1ab47 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -5181,6 +5181,8 @@ sub POSTpmx {
     &SYSTEM ("$CP $Master/bin/$p/scor2prt$exeext $platdir/");
     &SYSTEM ("$CP $Master/bin/$p/pmxab$exeext $platdir/");
   }
+
+  &POST_do_man ();
 }
 
 sub POSTprerex {