diff options
32 files changed, 47 insertions, 54 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/Makefile.am b/Build/source/texk/texlive/linked_scripts/Makefile.am index ca2e26bb171..4261a686ca7 100644 --- a/Build/source/texk/texlive/linked_scripts/Makefile.am +++ b/Build/source/texk/texlive/linked_scripts/Makefile.am @@ -164,7 +164,6 @@ texmf_other_scripts = \ pfarrei/pfarrei.tlu \ pkfix-helper/pkfix-helper \ pkfix/pkfix.pl \ - pmx/pmx2pdf.lua \ pmxchords/pmxchords.lua \ pst2pdf/pst2pdf.pl \ ptex-fontmaps/kanji-config-updmap-sys.sh \ diff --git a/Build/source/texk/texlive/linked_scripts/Makefile.in b/Build/source/texk/texlive/linked_scripts/Makefile.in index 51fd0db035a..3fda5d4d2ff 100644 --- a/Build/source/texk/texlive/linked_scripts/Makefile.in +++ b/Build/source/texk/texlive/linked_scripts/Makefile.in @@ -379,7 +379,6 @@ texmf_other_scripts = \ pfarrei/pfarrei.tlu \ pkfix-helper/pkfix-helper \ pkfix/pkfix.pl \ - pmx/pmx2pdf.lua \ pmxchords/pmxchords.lua \ pst2pdf/pst2pdf.pl \ ptex-fontmaps/kanji-config-updmap-sys.sh \ diff --git a/Build/source/texk/texlive/linked_scripts/pmx/pmx2pdf.lua b/Build/source/texk/texlive/linked_scripts/pmx/pmx2pdf.lua deleted file mode 100755 index 41cff58cc7f..00000000000 --- a/Build/source/texk/texlive/linked_scripts/pmx/pmx2pdf.lua +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env texlua - -print ("The pmx2pdf[.lua] script has been retired; please switch") -print ("to the musixtex script, which now processes .pmx files.") - diff --git a/Build/source/texk/texlive/linked_scripts/scripts.lst b/Build/source/texk/texlive/linked_scripts/scripts.lst index ddf9ceaaefa..c18ff4126fd 100644 --- a/Build/source/texk/texlive/linked_scripts/scripts.lst +++ b/Build/source/texk/texlive/linked_scripts/scripts.lst @@ -109,7 +109,6 @@ pfarrei/a5toa4.tlu pfarrei/pfarrei.tlu pkfix-helper/pkfix-helper pkfix/pkfix.pl -pmx/pmx2pdf.lua pmxchords/pmxchords.lua pst2pdf/pst2pdf.pl ptex-fontmaps/kanji-config-updmap-sys.sh diff --git a/Master/bin/amd64-freebsd/pmx2pdf b/Master/bin/amd64-freebsd/pmx2pdf deleted file mode 120000 index 73d88404556..00000000000 --- a/Master/bin/amd64-freebsd/pmx2pdf +++ /dev/null @@ -1 +0,0 @@ -../../texmf-dist/scripts/pmx/pmx2pdf.lua
\ No newline at end of file diff --git a/Master/bin/amd64-netbsd/pmx2pdf b/Master/bin/amd64-netbsd/pmx2pdf deleted file mode 120000 index 73d88404556..00000000000 --- a/Master/bin/amd64-netbsd/pmx2pdf +++ /dev/null @@ -1 +0,0 @@ -../../texmf-dist/scripts/pmx/pmx2pdf.lua
\ No newline at end of file diff --git a/Master/bin/armel-linux/pmx2pdf b/Master/bin/armel-linux/pmx2pdf deleted file mode 120000 index 73d88404556..00000000000 --- a/Master/bin/armel-linux/pmx2pdf +++ /dev/null @@ -1 +0,0 @@ -../../texmf-dist/scripts/pmx/pmx2pdf.lua
\ No newline at end of file diff --git a/Master/bin/armhf-linux/pmx2pdf b/Master/bin/armhf-linux/pmx2pdf deleted file mode 120000 index 73d88404556..00000000000 --- a/Master/bin/armhf-linux/pmx2pdf +++ /dev/null @@ -1 +0,0 @@ -../../texmf-dist/scripts/pmx/pmx2pdf.lua
\ No newline at end of file diff --git a/Master/bin/i386-cygwin/pmx2pdf b/Master/bin/i386-cygwin/pmx2pdf deleted file mode 120000 index 73d88404556..00000000000 --- a/Master/bin/i386-cygwin/pmx2pdf +++ /dev/null @@ -1 +0,0 @@ -../../texmf-dist/scripts/pmx/pmx2pdf.lua
\ No newline at end of file diff --git a/Master/bin/i386-freebsd/pmx2pdf b/Master/bin/i386-freebsd/pmx2pdf deleted file mode 120000 index 73d88404556..00000000000 --- a/Master/bin/i386-freebsd/pmx2pdf +++ /dev/null @@ -1 +0,0 @@ -../../texmf-dist/scripts/pmx/pmx2pdf.lua
\ No newline at end of file diff --git a/Master/bin/i386-linux/pmx2pdf b/Master/bin/i386-linux/pmx2pdf deleted file mode 120000 index 73d88404556..00000000000 --- a/Master/bin/i386-linux/pmx2pdf +++ /dev/null @@ -1 +0,0 @@ -../../texmf-dist/scripts/pmx/pmx2pdf.lua
\ No newline at end of file diff --git a/Master/bin/i386-netbsd/pmx2pdf b/Master/bin/i386-netbsd/pmx2pdf deleted file mode 120000 index 73d88404556..00000000000 --- a/Master/bin/i386-netbsd/pmx2pdf +++ /dev/null @@ -1 +0,0 @@ -../../texmf-dist/scripts/pmx/pmx2pdf.lua
\ No newline at end of file diff --git a/Master/bin/i386-solaris/pmx2pdf b/Master/bin/i386-solaris/pmx2pdf deleted file mode 120000 index 73d88404556..00000000000 --- a/Master/bin/i386-solaris/pmx2pdf +++ /dev/null @@ -1 +0,0 @@ -../../texmf-dist/scripts/pmx/pmx2pdf.lua
\ No newline at end of file diff --git a/Master/bin/powerpc-linux/pmx2pdf b/Master/bin/powerpc-linux/pmx2pdf deleted file mode 120000 index 73d88404556..00000000000 --- a/Master/bin/powerpc-linux/pmx2pdf +++ /dev/null @@ -1 +0,0 @@ -../../texmf-dist/scripts/pmx/pmx2pdf.lua
\ No newline at end of file diff --git a/Master/bin/sparc-solaris/pmx2pdf b/Master/bin/sparc-solaris/pmx2pdf deleted file mode 120000 index 73d88404556..00000000000 --- a/Master/bin/sparc-solaris/pmx2pdf +++ /dev/null @@ -1 +0,0 @@ -../../texmf-dist/scripts/pmx/pmx2pdf.lua
\ No newline at end of file diff --git a/Master/bin/universal-darwin/pmx2pdf b/Master/bin/universal-darwin/pmx2pdf deleted file mode 120000 index 73d88404556..00000000000 --- a/Master/bin/universal-darwin/pmx2pdf +++ /dev/null @@ -1 +0,0 @@ -../../texmf-dist/scripts/pmx/pmx2pdf.lua
\ No newline at end of file diff --git a/Master/bin/win32/pmx2pdf.exe b/Master/bin/win32/pmx2pdf.exe Binary files differdeleted file mode 100755 index 5777d90a17a..00000000000 --- a/Master/bin/win32/pmx2pdf.exe +++ /dev/null diff --git a/Master/bin/x86_64-cygwin/pmx2pdf b/Master/bin/x86_64-cygwin/pmx2pdf deleted file mode 120000 index 73d88404556..00000000000 --- a/Master/bin/x86_64-cygwin/pmx2pdf +++ /dev/null @@ -1 +0,0 @@ -../../texmf-dist/scripts/pmx/pmx2pdf.lua
\ No newline at end of file diff --git a/Master/bin/x86_64-darwin/pmx2pdf b/Master/bin/x86_64-darwin/pmx2pdf deleted file mode 120000 index 73d88404556..00000000000 --- a/Master/bin/x86_64-darwin/pmx2pdf +++ /dev/null @@ -1 +0,0 @@ -../../texmf-dist/scripts/pmx/pmx2pdf.lua
\ No newline at end of file diff --git a/Master/bin/x86_64-linux/pmx2pdf b/Master/bin/x86_64-linux/pmx2pdf deleted file mode 120000 index 73d88404556..00000000000 --- a/Master/bin/x86_64-linux/pmx2pdf +++ /dev/null @@ -1 +0,0 @@ -../../texmf-dist/scripts/pmx/pmx2pdf.lua
\ No newline at end of file diff --git a/Master/bin/x86_64-solaris/pmx2pdf b/Master/bin/x86_64-solaris/pmx2pdf deleted file mode 120000 index 73d88404556..00000000000 --- a/Master/bin/x86_64-solaris/pmx2pdf +++ /dev/null @@ -1 +0,0 @@ -../../texmf-dist/scripts/pmx/pmx2pdf.lua
\ No newline at end of file diff --git a/Master/texmf-dist/doc/generic/pmx/README b/Master/texmf-dist/doc/generic/pmx/README index 0a01adb7efb..8f288a78f56 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.7.4 (2016-05-06). PMX provides a preprocessor for MusiXTeX. +This is PMX, version 2.7.6 (2016-11-24). 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 diff --git a/Master/texmf-dist/doc/generic/pmx/pmx-install.pdf b/Master/texmf-dist/doc/generic/pmx/pmx-install.pdf Binary files differindex b3bcb1dc9cb..a722737c961 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 b15d7763394..eaea987e583 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.7.3} +\newcommand{\pmxVersion}{2.7.6} \begin{document} \title{Installation of the CTAN PMX Distribution} \author{Bob Tennent\\ diff --git a/Master/texmf-dist/doc/generic/pmx/pmx25-274.html b/Master/texmf-dist/doc/generic/pmx/pmx25-276.html index 8e66cbb279c..aaebbfdf6a7 100644 --- a/Master/texmf-dist/doc/generic/pmx/pmx25-274.html +++ b/Master/texmf-dist/doc/generic/pmx/pmx25-276.html @@ -3,13 +3,13 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html"> - <title>PMX beta vs 2.5</title> + <title>PMX 2.76 vs 2.5</title> </head> <body bgcolor="#E1E1E1"> <p align="center"><a href="../indexmt6.html#pmx">Return</a></p> -<h2>Changes from PMX 2.5 to the Latest Full Release (2.74), 16 February 2016</h2> +<h2>Changes from PMX 2.5 to the Latest Full Release (2.76), 3 December 2016</h2> <p>2.501 <strong>(Note: new scor2prt)</strong></p> <ul> @@ -314,7 +314,19 @@ <li>Enable note option Lx to lengthen a stem by x \internotes.</li> </ul> -<p>Revised 16 February 2016, Don Simons (dsimons at roadrunner dot com)</p> +<p>2.76</p> +<ul> + <li>Allow accented characters in lyrics.</li> + <li>Behind-the-scenes modifications to allow staff-crossing chords that + are unbeamed or beamed, as illustrated in staffcrossall.pmx.</li> + <li>Modifications to allow accented characters in text strings in + lyrics, page headers, and text dynamics.</li> + <li>Bugfixes in unbeamed, dotted xtuplets.</li> + <li>Increased allowable length of text dynamic strings from 52 to 64 + characters.</li> +</ul> + +<p>Revised 3 December 2016, Don Simons (dsimons at roadrunner dot com)</p> </body> </html> diff --git a/Master/texmf-dist/doc/generic/pmx/pmx274.pdf b/Master/texmf-dist/doc/generic/pmx/pmx274.pdf Binary files differdeleted file mode 100644 index df50add9e31..00000000000 --- a/Master/texmf-dist/doc/generic/pmx/pmx274.pdf +++ /dev/null diff --git a/Master/texmf-dist/doc/generic/pmx/pmx276.pdf b/Master/texmf-dist/doc/generic/pmx/pmx276.pdf Binary files differnew file mode 100644 index 00000000000..9e91fdb55ff --- /dev/null +++ b/Master/texmf-dist/doc/generic/pmx/pmx276.pdf diff --git a/Master/texmf-dist/doc/generic/pmx/pmx274.tex b/Master/texmf-dist/doc/generic/pmx/pmx276.tex index 3d6630157f4..de0aec648c2 100644 --- a/Master/texmf-dist/doc/generic/pmx/pmx274.tex +++ b/Master/texmf-dist/doc/generic/pmx/pmx276.tex @@ -1,6 +1,6 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % -% pmx274.tex 20 Feb 2016 +% pmx276.tex 3 Dec 2016 % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \documentclass[11pt]{article} @@ -47,7 +47,7 @@ PMX~--~a Preprocessor for \MusiXTeX{}\\ \null\vskip-15pt \Large\sl - Version 2.74~--~February 2016\\ + Version 2.76~--~3 December 2016\\ \author{\Large\rm Don \sc Simons\\ \large\sl Dr. Don's PC and Harpsichord Emporium\\ @@ -66,10 +66,12 @@ \maketitle \section*{Preface} -Compared to version 2.73, \PMX version 2.74 has minor enhancements to lyrics capabilities, +Compared to version 2.73, \PMX version 2.76 has minor enhancements to lyrics capabilities; behind-the-scenes modifications to allow staff-crossing chords that are unbeamed or beamed as -illustrated in {\tt staffcrossall.pmx}, -and several bugfixes in \bf scor2prt and {\tt pmx.tex}. +illustrated in {\tt staffcrossall.pmx}; modifications to allow accented characters in +text strings in lyrics, page headers, and text dynamics; bugfixes in unbeamed, dotted xtuplets; +an increased allowable length of text dynamic strings from 52 to 64 characters; and +bugfixes in the basic code,{\bf\ scor2prt} and {\tt pmx.tex}. \setcounter{page}1 \tableofcontents @@ -789,13 +791,10 @@ are represented with blank rests \bs{\tt rb} inside the force beam. So for example a set of beamed chords that starts only in the lower staff and ends only in the upper could be represented by - -\medskip +\begin{verbatim} {\tt [+28 g83 g g rb ]j / - [jf rb g84 g g ] /} -\medskip - +\end{verbatim} This example highlights some other issues, viz., that the beam height or direction of one or both beam groups may need to be altered. Often this will require trial and error. @@ -809,13 +808,10 @@ the treatment of staff-crossing beamed xtuplets is more robust than for non-xtuplets, and will admit more intuitive coding. So for example, the reverse of the above example, where the beam starts in the upper staff and ends in the lower, could be obtained with - -\medskip +\begin{verbatim} {\tt [+28 rb2x4n g3 g g ]j / - [jf g24x4 g g rb ] /} - -\medskip +\end{verbatim} \newdimen\psav\psav=\parindent\parindent=0pt where we used the option {\tt n} to suppress printing the number. As you might expect, more general staff-crossing beamed chordal xtuplets follow the same concepts already described for non-xtuplets, @@ -1101,7 +1097,8 @@ following {\tt pppp, ppp, pp, p, ffff, fff, ff, f, mf, mp, fp, sfz, "[{\it any text}]", >,} or {\tt <} . The last two are diminuendo and crescendo, and they are toggles, i.e., the first one of each starts the symbol and the next one ends it. -The one surrounded by double quotes is an arbitrary text string. +The one surrounded by \NEW{2.76} double quotes is an arbitrary text string +no longer than 64 characters, which may include embedded \TeX. With any dynamic mark, you can also enter position shifts, vertical as a signed integer representing the number of {\tt \bs internote}s, then horizontal as a signed number representing @@ -1291,6 +1288,21 @@ syllables joined with a tilde. Although underscores within a word or consecutive hyphens at the end may not crash the code, they are not recommended for any foreseen useful purpose. +Accented characters can be included in lyrics or elsewhere in several different ways. Here +we provide examples for just one of those methods, one which uses special \TeX~commands. +The following \PMX input contains most of the available accented characters and +leads to the example pictured below. + +\begin{verbatim} +"\'o \`o \^o \"o \~o \=o \.o \u{o} \v{o} \H{o} \t{oo}"@b+4 +c44 d e f g a b c c- d e r / + +"\c{o} \d{o} \b{o} {\oe} {\OE} {\ae} {\AE} {\aa} {\AA} {\o} {\O} {\l} {\L} {\ss}" +c44 d e f g a b c c- d e8 f g a / +\end{verbatim} + +\includegraphics[scale=1.0]{accents.eps} + By default, lyrics will be placed below the staff where they are entered, half way between that and the next lower staff. You may want to alter the vertical position of a lyrics line, especially if both voices in @@ -1299,7 +1311,7 @@ following the closing quote of the lyrics string with no space. That must be followed by either {\tt a} or {\tt b} for {\bf a}bove or {\bf b}elow the staff, then a signed integer for the number of \bs{\tt internote}s above or below the default height. This command is "sticky"; it -will remain in force for later lyircs in the same voice until altered. +will remain in force for later lyrics in the same voice until altered. It may also be necessary to allow extra vertical space where the lyrics are positioned. There is no \PMX command for this, but type 2 inline \TeX~can be used to insert extra diff --git a/Master/texmf-dist/scripts/pmx/pmx2pdf.lua b/Master/texmf-dist/scripts/pmx/pmx2pdf.lua deleted file mode 100755 index 41cff58cc7f..00000000000 --- a/Master/texmf-dist/scripts/pmx/pmx2pdf.lua +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env texlua - -print ("The pmx2pdf[.lua] script has been retired; please switch") -print ("to the musixtex script, which now processes .pmx files.") - diff --git a/Master/texmf-dist/tex/generic/pmx/pmx.tex b/Master/texmf-dist/tex/generic/pmx/pmx.tex index 3dcd94e4391..2ea890a3614 100644 --- a/Master/texmf-dist/tex/generic/pmx/pmx.tex +++ b/Master/texmf-dist/tex/generic/pmx/pmx.tex @@ -4,7 +4,7 @@ %% %% %%%%%%%%%%%%%%%%%%%%%%% \ifx\pmxversion\undefined\else\endinput\fi -\def\pmxversion{2.74}\def\pmxdate{4 Feb 20} +\def\pmxversion{2.74}\def\pmxdate{20 Feb 16} % 2.73 4 Feb 16 Fix \pmxclefsym to include \smalltreblelowoct % 2.73 Added \pmxlyr command. % 2.619 At movement break, directly set \nbinstruments in \newmovement; diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds index 65b16af933b..2965d908023 100755 --- a/Master/tlpkg/libexec/ctan2tds +++ b/Master/tlpkg/libexec/ctan2tds @@ -860,7 +860,6 @@ chomp ($Build = `cd $Master/../Build/source && pwd`); 'pl', "&MAKEflatten", 'plain', "die 'skipping, just plain.tex, rest in knuth-lib", 'pl-qx', "&MAKEplqx", - 'pmx', "die 'need to check sources!!", 'pointRuler', "die 'skipping, requires compilation'", 'poltawski', "&MAKEcopy", 'polyglossia-kannada', "die 'skipping, now in polyglossia proper'", diff --git a/Master/tlpkg/tlpsrc/pmx.tlpsrc b/Master/tlpkg/tlpsrc/pmx.tlpsrc index 5b58c535455..af212821e9d 100644 --- a/Master/tlpkg/tlpsrc/pmx.tlpsrc +++ b/Master/tlpkg/tlpsrc/pmx.tlpsrc @@ -1,5 +1,4 @@ binpattern f bin/${ARCH}/pmxab -binpattern f bin/${ARCH}/pmx2pdf binpattern f bin/${ARCH}/scor2prt # docpattern +f texmf-dist/doc/man/man1/pmxab.* |