diff options
Diffstat (limited to 'Master/texmf-dist')
15 files changed, 169 insertions, 45 deletions
diff --git a/Master/texmf-dist/doc/generic/pmx/README b/Master/texmf-dist/doc/generic/pmx/README index 8f288a78f56..492559b1b0d 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.6 (2016-11-24). PMX provides a preprocessor for MusiXTeX. +This is PMX, version 2.8.4 (2018-02-12). 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 a722737c961..e4c9429da66 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 eaea987e583..e49bfd0f8c0 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.6} +\newcommand{\pmxVersion}{2.8.4} \begin{document} \title{Installation of the CTAN PMX Distribution} \author{Bob Tennent\\ diff --git a/Master/texmf-dist/doc/generic/pmx/pmx25-276.html b/Master/texmf-dist/doc/generic/pmx/pmx25-284.html index aaebbfdf6a7..29d811084c1 100644 --- a/Master/texmf-dist/doc/generic/pmx/pmx25-276.html +++ b/Master/texmf-dist/doc/generic/pmx/pmx25-284.html @@ -3,13 +3,12 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html"> - <title>PMX 2.76 vs 2.5</title> + <title>PMX 2.84 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.76), 3 December 2016</h2> +<h2>Changes from PMX 2.5 to the Latest Full Release (2.84), 10 February 2018</h2> <p>2.501 <strong>(Note: new scor2prt)</strong></p> <ul> @@ -326,7 +325,60 @@ characters.</li> </ul> -<p>Revised 3 December 2016, Don Simons (dsimons at roadrunner dot com)</p> +<p>2.77</p> +<ul> + <li>Enable AV+/-x+/-y to add vskip bigh before or after \eject.</li> +</ul> + +<p>2.78</p> +<ul> + <li>Expand bufq to 131072 bytes.</li> + <li>Expand maxblks tp 9600.</li> + <li>Allow up to 75 pages.</li> + <li>Index postscript hairpins from 1 up instead of by voice #.</li> + <li>Add option 'o' to forced beam for open notehead (\hb); set ipl(3).</li> + <li>Add option T[n], n=1,2,3 for single stem tremolo.</li> +</ul> + +<p>2.80</p><strong>(Note: new pmx.tex)</strong></p> +<ul> + <li>Add 2-note tremolos.</li> +</ul> + +<p>2.81</p> +<ul> + <li>Allow string of rests to end xtup,</li> + <li>In chordal half-note 2-note tremolo, make chord notes open.</li> +</ul> + +<p>2.82</p> +<ul> + <li>Bugfix: beams with rests, not confused with xtups.</li> + <li>x option after slur index to allow slurs to go from one voice to another.</li> + <li>x option also for ties.</li> +</ul> + +<p>2.83</p> +<ul> + <li>Fix problems when changing to or from octave treble clef.</li> + <li>Fix beaming (or not) and number location for xtups with + multiple rests. Still some problems with number height but + can be band-aided with number height tweak option.</li> + <li>Tweak error messages for options on "R" command.</li> + <li>Allow forced beam height and slope tweaks with 2-note tremolos.</li> + <li>Allow chordal note with 2-note tremolos, adding dots as needed.</li> + <li>Fix call to ncmid in beamstrt when setting start height for beam of + 2-note trem, by changing arg from ivx to iv.</li> +</ul> + +<p>2.84</p> +<ul> + <li>Bug fix: dots in chordal seconds.</li> + <li>Bug fix: Initialize ihornb for non-beamed, down xtup.</li> + <li>Bug fix when using "AT" with 2-note x3c rD.</li> +</ul> + +<p>Revised 12 February 2018, Don Simons (dsimons at roadrunner dot com)</p> </body> </html> diff --git a/Master/texmf-dist/doc/generic/pmx/pmx276.pdf b/Master/texmf-dist/doc/generic/pmx/pmx276.pdf Binary files differdeleted file mode 100644 index 9e91fdb55ff..00000000000 --- a/Master/texmf-dist/doc/generic/pmx/pmx276.pdf +++ /dev/null diff --git a/Master/texmf-dist/doc/generic/pmx/pmx284.pdf b/Master/texmf-dist/doc/generic/pmx/pmx284.pdf Binary files differnew file mode 100644 index 00000000000..a62ebabf247 --- /dev/null +++ b/Master/texmf-dist/doc/generic/pmx/pmx284.pdf diff --git a/Master/texmf-dist/doc/generic/pmx/pmx276.tex b/Master/texmf-dist/doc/generic/pmx/pmx284.tex index de0aec648c2..ce131274281 100644 --- a/Master/texmf-dist/doc/generic/pmx/pmx276.tex +++ b/Master/texmf-dist/doc/generic/pmx/pmx284.tex @@ -1,6 +1,6 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % -% pmx276.tex 3 Dec 2016 +% pmx284.tex 12/30/2017 % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \documentclass[11pt]{article} @@ -47,7 +47,7 @@ PMX~--~a Preprocessor for \MusiXTeX{}\\ \null\vskip-15pt \Large\sl - Version 2.76~--~3 December 2016\\ + Version 2.84~--~20 December 2017\\ \author{\Large\rm Don \sc Simons\\ \large\sl Dr. Don's PC and Harpsichord Emporium\\ @@ -66,12 +66,10 @@ \maketitle \section*{Preface} -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}; 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}. +Compared to version 2.80, aside from bug fixes which are documented in the +opening comments in the source code, \PMX version 2.84 allows arbitrary +numbers of rests in xtuplets, chordal notes in 2-note tremolos, and +user-defined adjustments of beam height and slope in 2-note tremolos. \setcounter{page}1 \tableofcontents @@ -142,8 +140,8 @@ that defines the score and the individual parts. The basic \PMX distribution as of this version of the manual is -\href{http://icking-music-archive.org/software/pmx/pmx273.zip} -{\underline{\tt pmx273.zip}}.\NEW{2.73} It +\href{http://icking-music-archive.org/software/pmx/pmx276.zip} +{\underline{\tt pmx276.zip}}.\NEW{2.76} It contains the FORTRAN sources, binaries that will run in a DOS window on a PC with WINDOWS95 or higher, manuals for useage and for installation in DOS/Windows, and example typesetting files. Alternatively, the @@ -153,7 +151,7 @@ for acquiring and installing \MusiXTeX~and \PMX on various platforms (Windows, Mac-OSX, Unix-like systems) including using automated procedures from several external \TeX~distribution sites. The packages from those other sites will -all eventually incorporate all the upgrades in {\tt pmx273.zip} but will take +all eventually incorporate all the upgrades in {\tt pmx276.zip} but will take varying amounts of time to do so. \PMX is often upgraded; the most current version will always be available directly from the ``News'' paragraph \href{http://www.icking-music-archive.org/software/htdocs/htdocs.html}{\underline{here}}. @@ -205,15 +203,15 @@ FORTRAN source code, users of other OS's may either adapt these instructions as needed or use one of the other setup methods referenced earlier. -After decompressing the distribution file {\tt pmx273.zip}, +After decompressing the distribution file {\tt pmx276.zip}, you should have these -files: \NEW{2.73} {\tt pmx273.for}, {\tt scor2prt.for}, two +files: \NEW{2.76} {\tt pmx276.for}, {\tt scor2prt.for}, two Windows executables {\tt pmxab.exe} and {\tt scor2prt.exe}, several sample {\tt .pmx} files, -{\tt pmx.tex}, {\tt ref273.tex} (\TeX\ source for a command summary), -{\tt pmx273.tex }(\TeX\ source for this file), -PDF images of the latter two files, {\tt pmx25-273.html} showing -changes from version 2.50 to 2.73, and {\tt install\_run\_PMX.pdf} which gives more +{\tt pmx.tex}, {\tt ref276.tex} (\TeX\ source for a command summary), +{\tt pmx276.tex }(\TeX\ source for this file), +PDF images of the latter two files, {\tt pmx25-276.html} showing +changes from version 2.50 to 2.76, and {\tt install\_run\_PMX271.pdf} which gives more details about installing and running on different platforms. %If necessary, compile the FORTRAN programs. @@ -471,9 +469,15 @@ or {\bf s}harp (repeat the letter immediately for a double); {\tt u} or {\tt l}, which force the stem direction of any un-beamed note; {\tt e} or {\tt r} to shift the notehead l{\bf e}ft -or {\bf r}ight by its own width; and {\tt a} (for {\bf a}lone) which inhibits +or {\bf r}ight by its own width; {\tt a} (for {\bf a}lone) which inhibits beaming for this note (or, if the first note of an xtuplet, for the -entire xtuplet). \NEW{2.4}A single accidental may be followed by {\tt c} to +entire xtuplet); and \NEW{2.80}{\tt T} to insert a {\it tremolo} +on the stem. +The {\tt T} may be followed by a single digit {\tt 1}, {\tt 2}, or {\tt 3} +to indicate the +number of slashes in the tremolo symbol; {\tt 1} is the default if no digit +is entered. \NEW{2.4}A single accidental may be immediately +followed by {\tt c} to make it {\bf c}autionary, i.e., surround it with parentheses. Alternatively, it may also be followed by {\tt i} to suppress typesetting \NEW{2.3} but still have @@ -616,13 +620,14 @@ all have the same duration, but there are several options---described below---to change this. The command for the first note of an xtuplet begins exactly like a note or rest command, with the name of the first note in the xtuplet, or -{\tt r} if it starts with a {\bf r}est (see next subsection), and an optional -time value. +{\tt r} if it starts with a {\bf r}est (see subsection below on rests), +and an optional time value. However, the actual time value (including a dot if present and a basic duration that may have been inherited from the prior note) now represents the {\it total} duration of the xtuplet. Next (with no space, as usual) comes -{\tt x} followed by a one- or two-digit integer for the number of notes in -the xtuplet. The only options allowed immediately following the number are +{\tt x} followed by either a one- or two-digit integer for the number of notes in +the xtuplet, or \NEW{2.80}{\tt T} to initiate a 2-note tremolo, to be further +discussed below. The only options allowed immediately following the number are {\tt d} and {\tt n} . \NEW{2.4}{\tt d} signifies that the {\it first} note of the xtuplet should have a dot and the second, and extra flag. {\tt n} controls the printing of the {\bf n}umber and bracket. @@ -645,9 +650,7 @@ represented by a separate command containing a subset of the characters permitted for ordinary notes or rests: note name or {\tt r} (the only required character), accidental, and octave change character ({\tt +} or {\tt -}). \NEW{1.4} The octave may be given explicitly instead, and any integer will be -interpreted as such, as no time values or dots are permitted. - -The last note of an xtuplet may not be a\NEW{1.4} rest. +interpreted as such, as no numerical time value is permitted. To double\NEW{2.3} the duration of any note in an xtuplet, add the character {\tt D} to the command for that note. This will decrease the expected @@ -660,6 +663,52 @@ note and an extra flag to the next, include {\tt d} in the note command, As an example, an ascending quarter-note triplet scale would be notated\hfil\break {\tt~c44x3~d~e~f4x3~g~a~b4x3~c~d~\dots} +\subsubsection{2-note tremolos} + +A 2-note tremolo \NEW{2.80}is a special case of an xtuplet. +It represent a rapid alternation between two notes. +It is notated with a pair of +notes, either beamed or unbeamed, with the possible addition of from one to three +indented, disconnected beams between the two note stems. +Like an ordinary +xtuplet, it begins with a note name, optional duration and octave level, then +the character {\tt x}. The duration applies to the total time value of the +two notes, and is currently limited to either a half note ({\tt 2}), +quarter ({\tt 4}), or eighth ({\tt 8}). The duration may be dotted. +Next comes a {\tt T}. This is optionally followed by one or two +integers from 0 to 3. The first indicates the number of ordinary beams +connecting the two notes; the second, the number of indented beams. +No other options are allowed, and some options are prohibited, such as zero +ordinary beams on anything except a quarter or dotted quarter tremolo. If no +integers are entered, defaults are assigned: (3,0) for a half, (0,3) for a +quarter, and (1,2) for an eighth. After a space, the +second note of the tremolo is entered. If the total duration is a half or dotted +half, the +noteheads will be open. For a whole note tremolo, two consecutive half note +tremolos should be used. As with ordinary xtuplets, the horizontal spacing of the +notes will always be the +correct value for notes with half the duration of the total. + +Either\NEW{2.84} or both members of the tremolo may include chordal notes, +using the normal {\tt z} notation described in section~\ref{chords}. Also, +if the tremolo is beamed, the height and angle of the beam may be adjusted +after making it a forced beam as described in section!\ref{beams}. + +Some examples are shown below. When two versions are shown for a given duration, +the first is the default. The following \PMX code generates the example. + +~ + +{\tt f24xT a fxT a | fxT20 a fxT20 a /} + +{\tt L2 fd24xT a r4 | f24xT a f2xT20 a /} + +{\tt L3 fd44xT a r8 f44xT a r4 | f44xT02 a fd8xT a r1 f8xT a r4 f8xT11 a /} + +~ + +\includegraphics[scale=1.0]{tremxmpl3.eps} + \subsubsection{Rests} The command for a rest starts with {\tt r}. @@ -1174,12 +1223,11 @@ the 64th notes at the end of that beam. In this case, the user could counteract \PMXX 's internal adjustment by using {\tt [-1+0+3~cd8~c3~c6~c~]~c~c~c3~cd8}. -The character {\tt m} followed by a digit 1-4 forces the {\bf m}ultiplicity -of the -beam, the number of stem-joining bars. - The option {\tt h} forces the beam to be {\bf h}orizontal. +The character {\tt m} followed by a digit 1-4 forces the {\bf m}ultiplicity +of the beam, the number of stem-joining bars. + By default, xtuplets are set apart with their own beam. To beam an xtuplet together with other non-xtuplets, just include it with the other notes in a forced beam. @@ -1827,6 +1875,12 @@ systems will always be spread vertically regardless of how much white space is left. It is a toggle; the second time it is issued, the behavior reverts to the default. +{\bf Add extra vertical space before and/or page eject (last resort)}\NEW{2.8} +As a last resort in getting the right spacing at the top or bottom of a page, +the option {\tt V} will insert a vertical skip of the specified number of +{\tt \bs Internote}s before and after the next page eject. It must be followed by +{\tt +} or {\tt -}, then a number, then another {\tt +} or {\tt -} and number. + {\bf Make some staves smaller.} The {\tt S} option to the {\tt A} command\NEW{2.7} allows you to specify a @@ -2536,7 +2590,6 @@ breaking the input into smaller blocks. (The user can control the {\it number} of these items, but cannot control the {\it limit on the maximum number} of them.) -%\ \ \ \ \ 128 characters per input line. 128 characters per input line. 24 \NEW{2.6} staves. @@ -2555,7 +2608,7 @@ the {\it limit on the maximum number} of them.) 18 key changes. -20 pages. +75 \NEW{2.78} pages. 600 \NEW{2.6} notes per input block. @@ -2589,13 +2642,14 @@ the {\it limit on the maximum number} of them.) 41 text-dynamic strings per input block.\NEW{2.5} +9600 \NEW{2.78} lines in input file \subsection{Limits not under immediate user control} % Need all the spaces because this damn format insists on left-justifying % first line of *first* paragraph in a section.. % -\ \ \ \ \ \kern-1pt2000 \bs{\tt notes} groups. +\ \ \ \ \ \kern6pt 131072 \NEW{2.78} bytes in the entire input file 20 \bs{\tt notes} groups per bar. diff --git a/Master/texmf-dist/doc/generic/pmx/pmxab.pdf b/Master/texmf-dist/doc/generic/pmx/pmxab.pdf Binary files differindex 6e022bbf25b..ca3bb2aec4e 100644 --- a/Master/texmf-dist/doc/generic/pmx/pmxab.pdf +++ b/Master/texmf-dist/doc/generic/pmx/pmxab.pdf diff --git a/Master/texmf-dist/doc/generic/pmx/ref274.pdf b/Master/texmf-dist/doc/generic/pmx/ref274.pdf Binary files differdeleted file mode 100644 index f14160f0227..00000000000 --- a/Master/texmf-dist/doc/generic/pmx/ref274.pdf +++ /dev/null diff --git a/Master/texmf-dist/doc/generic/pmx/ref284.pdf b/Master/texmf-dist/doc/generic/pmx/ref284.pdf Binary files differnew file mode 100644 index 00000000000..422a0b12f2d --- /dev/null +++ b/Master/texmf-dist/doc/generic/pmx/ref284.pdf diff --git a/Master/texmf-dist/doc/generic/pmx/ref274.tex b/Master/texmf-dist/doc/generic/pmx/ref284.tex index cd3d7bbe89e..0355f13e360 100644 --- a/Master/texmf-dist/doc/generic/pmx/ref274.tex +++ b/Master/texmf-dist/doc/generic/pmx/ref284.tex @@ -1,6 +1,6 @@ %%%%%%%%%%%%%%%%% %% -%% ref274.tex (latex) +%% ref284.tex (latex) %% %%%%%%%%%%%%%%%%% \ifx\documentstyle\undefined @@ -43,8 +43,8 @@ %\let\blank\ \def\ {\blank\blank} \centerline{QUICK REFERENCE TABLE FOR {\bf PMX}, -Version 2.74, -February 2016~~~ +Version 2.84, +February 2018~~~ \hfill Don Simons (dsimons@roadrunner.com)} %\begin{multicols}{2} @@ -100,7 +100,9 @@ a,b,c,d,e,f,g & Note name.\\ \ [S,L {\it x}] & Shrink or lengthen stem length by {\it x} \bs{\tt internote}.\\ \ \ [:] & Make it sticky.\\ \ [S,L :] & Shrink or lengthen this stem, then return to default.\\ -\ [Ao] & In main chord note, post accidentals in order entered.\\ +\ [Ao] & In main chord note, post accidentals in order entered.\\ +\ [T] & Single-note tremolo (slashes across stem).\\ +\ \ [1,2,3] & Number of slashes; 1 is default.\\ \newcol ~ & Note options, continued\\ \ [x{\it i}] & An {\it i}-tuplet starts here. @@ -117,6 +119,9 @@ a,b,c,d,e,f,g & Note name.\\ \ \ \ \ [+,- {\it x}] & Horiz. shift, notehead widths.\\ \ \ \ [s] & Fine tune slope of bracket for non-beamed xtuplet.\\ \ \ \ \ +,- {\it i} & Slope adjustment.\\ +\ [xT] & Start a 2-note tremolo.\\ +\ \ [0,1,2,3] & Number of main beams between 2 notes.\\ +\ \ \ [0,1,2,3] & Number of indented beams.\\ \dhline z & Chordal note. No duration allowed.\\ \ a,b,c,d,e,f,g & Note name.\\ @@ -243,6 +248,8 @@ A & Miscellaneous controls. \ \ {\it filename} & File name, may include path.\\ \ [K] & Activate special rules for rest positions in 2-staff keyboard scores.\\ \ [cl,c4] & Set vert. and horiz. page sizes and offsets for letter or a4 paper.\\ +\ [V +,- {\it n1} +,- {\it n2}] & Vertical skips, \bsn{}internotes, before and after next + ~\bsn{}eject.\\ \dhline B & Toggles default stem direction for middle line of bass clef. (intial direction is up).\\ diff --git a/Master/texmf-dist/doc/man/man1/pmxab.1 b/Master/texmf-dist/doc/man/man1/pmxab.1 index 381324e5641..348517f4aee 100644 --- a/Master/texmf-dist/doc/man/man1/pmxab.1 +++ b/Master/texmf-dist/doc/man/man1/pmxab.1 @@ -1,4 +1,4 @@ -.TH pmxab 1 "2 Feb 2016" "Version 2.7.3" "PMX Manual Page" +.TH pmxab 1 "12 Feb 2018" "Version 2.8.4" "PMX Manual Page" .SH NAME pmxab \- a MusiXTeX preprocessor .SH SYNOPSIS diff --git a/Master/texmf-dist/doc/man/man1/pmxab.man1.pdf b/Master/texmf-dist/doc/man/man1/pmxab.man1.pdf Binary files differindex 7744acf6065..f2c345f37d2 100644 --- a/Master/texmf-dist/doc/man/man1/pmxab.man1.pdf +++ b/Master/texmf-dist/doc/man/man1/pmxab.man1.pdf diff --git a/Master/texmf-dist/scripts/pmx/pmx2pdf.lua b/Master/texmf-dist/scripts/pmx/pmx2pdf.lua new file mode 100755 index 00000000000..41cff58cc7f --- /dev/null +++ b/Master/texmf-dist/scripts/pmx/pmx2pdf.lua @@ -0,0 +1,5 @@ +#!/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 2ea890a3614..36fd8d23871 100644 --- a/Master/texmf-dist/tex/generic/pmx/pmx.tex +++ b/Master/texmf-dist/tex/generic/pmx/pmx.tex @@ -4,7 +4,8 @@ %% %% %%%%%%%%%%%%%%%%%%%%%%% \ifx\pmxversion\undefined\else\endinput\fi -\def\pmxversion{2.74}\def\pmxdate{20 Feb 16} +\def\pmxversion{2.80}\def\pmxdate{15 Mar 17} +% 2.80 add def'n of \slx, real stemlength % 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; @@ -72,6 +73,11 @@ %\newcount\s@Nxi %\newcount\s@Nxii % +% Stemlength macro shorthands for 2-note unbeamed tremolos +% +\def\slx#1{\stdstemfalse\nostemcut\stemlength{#1}} +\def\slz{\stemcut\stemlength{4.66}} +% % Special clef change stuff % \newcount\reflect |