From 688e2e4682fedf85cb675c18c55db2a626059911 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 17 Jan 2013 23:53:55 +0000 Subject: revert to previous version of pmx, new (2.6.19) needs new executables git-svn-id: svn://tug.org/texlive/trunk@28855 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/generic/pmx/ChangeLog | 7 +---- Master/texmf-dist/doc/generic/pmx/README | 30 +++++++++++---------- .../texmf-dist/doc/generic/pmx/Windows/pmx2pdf.bat | 6 +++++ Master/texmf-dist/doc/generic/pmx/pmx-install.pdf | Bin 96975 -> 96768 bytes Master/texmf-dist/doc/generic/pmx/pmx-install.tex | 9 +++---- Master/texmf-dist/tex/generic/pmx/pmx.tex | 18 +++---------- 6 files changed, 30 insertions(+), 40 deletions(-) create mode 100755 Master/texmf-dist/doc/generic/pmx/Windows/pmx2pdf.bat (limited to 'Master') diff --git a/Master/texmf-dist/doc/generic/pmx/ChangeLog b/Master/texmf-dist/doc/generic/pmx/ChangeLog index e877c4e7fa1..e4e72d6c87d 100644 --- a/Master/texmf-dist/doc/generic/pmx/ChangeLog +++ b/Master/texmf-dist/doc/generic/pmx/ChangeLog @@ -198,13 +198,8 @@ above) into parts. Repaired several obscure bugs related to platform and compiler dependencies; see pmxab.f for details. -2.6.18 +2.618 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 2ddd274b887..9815cb76b23 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.19 (Jan. 13th, 2013). PMX provides a preprocessor for MusiXTeX. +This is PMX, version 2.6.18 (Oct. 7th, 2012). 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,36 +16,38 @@ The author of the pmxccn tutorial is Cornelius C. Noack. This package consists of - (i) pmx.tds.zip, which contains macros, documentation, and the + (i) pmx-texmf.zip, which contains macros, documentation, and the pmx2pdf.lua script - (ii) pmx-2.6.19.tar.gz, which contains the source code for + (ii) pmx-2.6.18.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, and, - for Windows, a batch script for running pmx2pdf.lua + pmxab and scor2prt executables for those platforms (iv) pmx-install.{tex,pdf}, which is a more detailed version of the following instructions: To install (on TDS-compliant TeX systems): - + 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. + + 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. - + on Windows or OS-X: copy the executables appropriate for your - platform to a folder on the executable PATH + + on Windows or OS-X: copy the pre-compiled 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.19 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.18 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 @@ -74,4 +76,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). -Jan. 13th, 2013. +Oct 7th, 2012. diff --git a/Master/texmf-dist/doc/generic/pmx/Windows/pmx2pdf.bat b/Master/texmf-dist/doc/generic/pmx/Windows/pmx2pdf.bat new file mode 100755 index 00000000000..24184c8deeb --- /dev/null +++ b/Master/texmf-dist/doc/generic/pmx/Windows/pmx2pdf.bat @@ -0,0 +1,6 @@ +:: 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 c8403b80dc9..b6afd7a02c7 100644 Binary files a/Master/texmf-dist/doc/generic/pmx/pmx-install.pdf and b/Master/texmf-dist/doc/generic/pmx/pmx-install.pdf differ diff --git a/Master/texmf-dist/doc/generic/pmx/pmx-install.tex b/Master/texmf-dist/doc/generic/pmx/pmx-install.tex index f14576580ab..fbc1e849f76 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.19} +\newcommand{\pmxVersion}{2.6.18} \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/support/pmx.tds.zip}, a zipped TEXMF +\texttt{/install/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,7 +72,6 @@ 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 @@ -137,11 +136,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|Windows\pmx2pdf.bat| +\item \verb|...\scripts\pmx\Windows\pmx2pdf.bat| \end{list} to a folder on the executable PATH \emph{or} add the folder -\verb|Windows| to the executable PATH, as explained above. +\verb|...\scripts\pmx\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 a85275f5cdb..5d7083a455e 100644 --- a/Master/texmf-dist/tex/generic/pmx/pmx.tex +++ b/Master/texmf-dist/tex/generic/pmx/pmx.tex @@ -3,11 +3,8 @@ %% pmx.tex %% %% %% %%%%%%%%%%%%%%%%%%%%%%% -\def\pmxversion{2.619}\def\pmxdate{18 August 12} +\def\pmxversion{2.614}\def\pmxdate{17 July 11} -% 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 @@ -548,8 +545,7 @@ 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#3{\let\holdstop\stoppiece\let\holdcont\contpiece% +\def\newmovement#1#2{\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}% @@ -568,14 +564,7 @@ depth \h@lf\pcil width \razclef\kern-\h@lf\razclef\kern-\h@lf\pcil\kern-.1pt % \vskip#1\internote% \let\stoppiece\holdstop}% -% \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}% + \def\contpiece{\startpiece\addspace\afterruleskip\let\contpiece\holdcont}% }% % % Redefinitions for moving dots vertically by x\interligne and @@ -623,7 +612,6 @@ 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}}}% % -- cgit v1.2.3