diff options
author | Karl Berry <karl@freefriends.org> | 2017-07-25 21:59:42 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2017-07-25 21:59:42 +0000 |
commit | 4e4b787e99ada44a23bb8282b286624251dad96e (patch) | |
tree | e1cb29c40b068cee917ca4e58758181b4c384132 /Master | |
parent | 4e29592c44cbe461c59707c7ddfa41fd623c9179 (diff) |
musixtex (25jul17)
git-svn-id: svn://tug.org/texlive/trunk@44885 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
21 files changed, 140 insertions, 27 deletions
diff --git a/Master/texmf-dist/doc/generic/musixtex/ChangeLog-125.txt b/Master/texmf-dist/doc/generic/musixtex/ChangeLog-125.txt new file mode 100644 index 00000000000..9e392be79a1 --- /dev/null +++ b/Master/texmf-dist/doc/generic/musixtex/ChangeLog-125.txt @@ -0,0 +1,6 @@ + +Changes from MusiXTeX 124 to 125: + +* included a "dummy" tuplet.tex in the distribution +* added \ignorespaces in musixltx.tex +* defined \qap, \qapp, \tqsk diff --git a/Master/texmf-dist/doc/generic/musixtex/README b/Master/texmf-dist/doc/generic/musixtex/README index 5c5d258f56a..daa19eb3bdc 100644 --- a/Master/texmf-dist/doc/generic/musixtex/README +++ b/Master/texmf-dist/doc/generic/musixtex/README @@ -1,4 +1,4 @@ -This is MusiXTeX, version 1.24 (2017-02-28). +This is MusiXTeX, version 1.25 (2017-07-25). MusiXTeX is a TeX-based system for typesetting music. The main author was Daniel Taupin, who died in a climbing diff --git a/Master/texmf-dist/doc/generic/musixtex/musixdoc.pdf b/Master/texmf-dist/doc/generic/musixtex/musixdoc.pdf Binary files differindex 0270e521fe0..158bf8b468a 100644 --- a/Master/texmf-dist/doc/generic/musixtex/musixdoc.pdf +++ b/Master/texmf-dist/doc/generic/musixtex/musixdoc.pdf diff --git a/Master/texmf-dist/doc/generic/musixtex/musixdoc/extensions.tex b/Master/texmf-dist/doc/generic/musixtex/musixdoc/extensions.tex index 2bcc1179a7b..7d60a4dbc58 100644 --- a/Master/texmf-dist/doc/generic/musixtex/musixdoc/extensions.tex +++ b/Master/texmf-dist/doc/generic/musixtex/musixdoc/extensions.tex @@ -2059,7 +2059,7 @@ This package (tnt = Transform Notes) provides a macro \keyindex{TransformNotes} possible several ``transformations'' of the effect of notes commands such as \keyindex{notes}. The \verb\musixtnt\ package is distributed separately from \verb\musixtex\. -In general the effect of \verb|\TransformNotes(|\textit{input}\verb|}{|\textit{output}\verb|}| +In general the effect of \verb|\TransformNotes{|\textit{input}\verb|}{|\textit{output}\verb|}| is that subsequent notes commands in the source will expect their arguments to match the \textit{input} pattern but the notes will be typeset according to the \textit{output} pattern. @@ -2145,10 +2145,13 @@ will switch the order of the two instruments. will restore normal two-instrument processing. -The \keyindex{TransformNotes} macro is currently not compatible with the +The \texttt{musixtnt} implementation of \keyindex{TransformNotes} is not compatible with the \texttt{musixlyr} extension package for lyrics described in Section~\ref{musixlyr}. For extracting or omitting parts -in scores with lyrics, use the techniques described in Chapter~\ref{parts}. +in scores with lyrics, one may either use the +\texttt{autosp}\index{autosp@{\tt autosp}} preprocessor discussed in Section~\ref{autosp}, which provides +an alternative implementation of \keyindex{TransformNotes}, +or the techniques described in Chapter~\ref{parts}. \section{musixtri}\index{musixtri@{\tt musixtri.tex}} Provides triply dotted note symbols. @@ -2173,3 +2176,17 @@ Available are: \keyindex{qbppp} and \keyindex{zqbppp}. + +\section{tuplet} + +This file does nothing; it is provided for compatibility with +\musixtex{} version 1.20 or earlier and legacy scores. +Since version 1.21, \verb|musixtex.tex| itself contains all the functions +of the older \texttt{tuplet.tex}, namely +definitions of +\begin{itemize} +\item \keyindex{tuplettxt} +\item \keyindex{uptuplet} +\item \keyindex{downtuplet} +\end{itemize} +See Section~\ref{tuplet}. diff --git a/Master/texmf-dist/doc/generic/musixtex/musixdoc/frontmatter.tex b/Master/texmf-dist/doc/generic/musixtex/musixdoc/frontmatter.tex index 1728eb49ef8..3cc4609c7d4 100644 --- a/Master/texmf-dist/doc/generic/musixtex/musixdoc/frontmatter.tex +++ b/Master/texmf-dist/doc/generic/musixtex/musixdoc/frontmatter.tex @@ -1,6 +1,6 @@ \title{\Huge\bfseries\musixtex\\[\bigskipamount] \LARGE\bfseries Using \TeX{} to write polyphonic\\or -instrumental music\\\Large\itshape Version 1.24} +instrumental music\\\Large\itshape Version 1.25} %\author{\Large\rm Daniel \sc Taupin\\\large\sl @@ -67,7 +67,7 @@ Since then, the only significant update to \musixtex\ has been in version 1.15 ( takes advantage of the greater capacity of the e\TeX\ version of \TeX. This manual is the definitive reference to all features of -\musixtex\ version~1.24. +\musixtex\ version~1.25. Novice users need not start here. Most diff --git a/Master/texmf-dist/doc/generic/musixtex/musixdoc/introduction.tex b/Master/texmf-dist/doc/generic/musixtex/musixdoc/introduction.tex index 74dfd8712a3..e396c200f7b 100644 --- a/Master/texmf-dist/doc/generic/musixtex/musixdoc/introduction.tex +++ b/Master/texmf-dist/doc/generic/musixtex/musixdoc/introduction.tex @@ -408,7 +408,7 @@ of these is present, the section comprises the whole piece. Somewhere\footnote{Advisably, at the beginning or at the end of the section, for the sake of clarity.} before the end of the section, you can change the value of -\keyindex{mulooseness} to something different from the default of 0, and +\keyindex{mulooseness} to something different from the default of $0$, and \musixtex\ will typeset that section with a different number of systems. To give an easy example, changing the last line in the previous example to: diff --git a/Master/texmf-dist/doc/generic/musixtex/musixdoc/musixdoc.sty b/Master/texmf-dist/doc/generic/musixtex/musixdoc/musixdoc.sty index 5239ab9e08c..747bbf6e8cd 100644 --- a/Master/texmf-dist/doc/generic/musixtex/musixdoc/musixdoc.sty +++ b/Master/texmf-dist/doc/generic/musixtex/musixdoc/musixdoc.sty @@ -39,6 +39,9 @@ %\usepackage{mathptmx} % Times text %\usepackage{helvet}\renewcommand{\familydefault}{\sfdefault} % Helvetica text +% use OT1 encoding for tt to avoid need for cm-super fonts +\renewcommand{\ttfamily}{\fontencoding{OT1}\fontfamily{cmtt}\selectfont} + \usepackage{textcomp} diff --git a/Master/texmf-dist/doc/generic/musixtex/musixdoc/musixtex.log b/Master/texmf-dist/doc/generic/musixtex/musixdoc/musixtex.log new file mode 100644 index 00000000000..6fdcab6d463 --- /dev/null +++ b/Master/texmf-dist/doc/generic/musixtex/musixdoc/musixtex.log @@ -0,0 +1,32 @@ +This is musixtex.lua version 0.18. +Processing musixdoc.tex + latex musixdoc.tex + musixflx musixdoc + latex musixdoc.tex + makeindex -q musixdoc + latex musixdoc.tex + latex musixdoc.tex +! LaTeX Warning: No \author given. +! LaTeX Font Warning: Font shape `OMS/cmtt/m/n' undefined +! LaTeX Font Warning: Some font shapes were not available, defaults substituted. + dvips -e0 musixdoc + ps2pdf musixdoc.ps +musixdoc.pdf generated by ps2pdf. + removing musixdoc.mx1 + removing musixdoc.mx2 + removing musixdoc.dvi + removing musixdoc.ps + removing musixdoc.idx + removing musixdoc.log + removing musixdoc.ilg +--- TeX files actually included according to musixdoc.log --- +./musixtex.tex + MusiXTeX(c) 1.24 <2017-02-28> +/usr/local/texlive/2017/texmf-dist/tex/latex/musixtex/musixltx.tex + MusiXLaTeX T.61 <25 September 1996> +/usr/local/texlive/2017/texmf-dist/tex/generic/musixtex/musixlyr.tex + MusiXLYRics 2.1c <June 10, 2003> +/usr/local/texlive/2017/texmf-dist/tex/generic/musixtex/musixlyr.tex + MusiXLYRics 2.1c <June 10, 2003> +/usr/local/texlive/2017/texmf-dist/tex/generic/musixtex/musixlyr.tex + MusiXLYRics 2.1c <June 10, 2003> diff --git a/Master/texmf-dist/doc/generic/musixtex/musixdoc/preparing.tex b/Master/texmf-dist/doc/generic/musixtex/musixdoc/preparing.tex index 606fc2df119..3fe44808de3 100644 --- a/Master/texmf-dist/doc/generic/musixtex/musixdoc/preparing.tex +++ b/Master/texmf-dist/doc/generic/musixtex/musixdoc/preparing.tex @@ -248,7 +248,7 @@ the \ital{current} staff. \section{Automatic note spacing} \label{autosp} -A preprocessor called \texttt{autosp} automates the generation +A preprocessor called \texttt{autosp}\index{autosp@{\tt autosp}} automates the generation of note-spacing commands by converting (non-standard) commands of the form \verb|\anotes ... \en| into one or more conventional note-spacing commands, as determined by the note values @@ -264,13 +264,16 @@ For example, from the input \begin{verbatim} \Notes\qa J\sk\qa K\sk&\ca l\qa m\sk\ca n\en \end{verbatim} +\texttt{autosp} also supports non-standard commands for adding ``global'' +skips (i.e., in every staff) and centered-bar rests. + As an option, \emph{all} note-spacing commands (except \verb|\znotes| and \verb|\vnotes|) will be processed similarly; this is useful for correcting the spacing in single-instrument parts extracted from a multi-instrument score; see Section~\ref{musixtnt}. The \texttt{autosp} package is available in -\href{https://www.tug.org/texlive/}{\underline{TeXLive}} (from 2016) and +\href{https://www.tug.org/texlive/}{\underline{TeXLive}} and can also be found at the \href{http://icking-music-archive.org/software/autosp/autosp.zip} {\underline{Werner Icking Music Archive}} diff --git a/Master/texmf-dist/doc/generic/musixtex/musixdoc/spacing.tex b/Master/texmf-dist/doc/generic/musixtex/musixdoc/spacing.tex index 3e7fdfd9258..0108fb080f5 100644 --- a/Master/texmf-dist/doc/generic/musixtex/musixdoc/spacing.tex +++ b/Master/texmf-dist/doc/generic/musixtex/musixdoc/spacing.tex @@ -26,7 +26,7 @@ restarting. For example, To skip forward by one half of a \verb|\noteskip|, use \keyindex{hsk}. To insert spacing of approximately one note head width, you can use -\keyindex{qsk}, or for half or one-quarter of that, \keyindex{hqsk} +\keyindex{qsk}, or for two-thirds, half or one-quarter of that, \keyindex{tqsk}, \keyindex{hqsk} or \keyindex{qqsk}, respectively. To skip backward by one \verb|\noteskip|, use \keyindex{bsk}. More generally, to skip an arbitrary distance, use \keyindex{off}\verb|{|$D$\verb|}| diff --git a/Master/texmf-dist/doc/generic/musixtex/musixdoc/writingnotes.tex b/Master/texmf-dist/doc/generic/musixtex/musixdoc/writingnotes.tex index 7c52700cb7c..f8656044ea6 100644 --- a/Master/texmf-dist/doc/generic/musixtex/musixdoc/writingnotes.tex +++ b/Master/texmf-dist/doc/generic/musixtex/musixdoc/writingnotes.tex @@ -221,6 +221,7 @@ macros just introduced provide one or two dots after the notehead: \keyindex{zhp}, \keyindex{zhpp}, \keyindex{qup}, \keyindex{qupp}, \keyindex{qlp}, \keyindex{qlpp}, +\keyindex{qap}, \keyindex{qapp}, \keyindex{zqp}, \keyindex{zqpp}, \keyindex{cup}, \keyindex{cupp}, \keyindex{clp}, \keyindex{clpp}, diff --git a/Master/texmf-dist/doc/generic/musixtex/musixtex-install.pdf b/Master/texmf-dist/doc/generic/musixtex/musixtex-install.pdf Binary files differindex c29c72bb3b5..8a1d27ac52d 100644 --- a/Master/texmf-dist/doc/generic/musixtex/musixtex-install.pdf +++ b/Master/texmf-dist/doc/generic/musixtex/musixtex-install.pdf diff --git a/Master/texmf-dist/doc/generic/musixtex/musixtex-install.tex b/Master/texmf-dist/doc/generic/musixtex/musixtex-install.tex index b24bceaf793..b3e78f43285 100644 --- a/Master/texmf-dist/doc/generic/musixtex/musixtex-install.tex +++ b/Master/texmf-dist/doc/generic/musixtex/musixtex-install.tex @@ -139,14 +139,20 @@ script to the list of Paths for TeX and related programs. \section{Discussion} Many users, especially beginners, will find it easier to use the PMX and M-Tx pre-processors, which accept a simpler input language than MusiXTeX -itself. These pre-processor packages may be found at CTAN under \verb\support\. Additional documentation, additional +itself. +Advanced users may want to use the \texttt{autosp} pre-processor +which simplifies the creation of \texttt{musixtex} scores by automating +the choice of note-spacing commands. +These pre-processor packages may be found at CTAN under \verb\support\. + +Additional documentation, additional add-on packages, and many examples of MusiXTeX typesetting may be found at the Werner Icking Music Archive\footnote{% \myurl{http://icking-music-archive.org}}. Support for users of MusiXTeX and related software may be obtained via the MusiXTeX mail list\footnote{% \myurl{http://tug.org/mailman/listinfo/tex-music}}. -MusiXTeX may be freely copied, duplicated and used in conformance to the -GNU General Public License (Version~2, 1991, see included file \verb\gpl.txt\). +MusiXTeX may be freely copied, modified and used in conformance to the +GNU General Public License (Version~2 or, at your option, any later version; see included file \verb\gpl.txt\). \end{document} diff --git a/Master/texmf-dist/doc/generic/musixtex/scripts/musixtex.pdf b/Master/texmf-dist/doc/generic/musixtex/scripts/musixtex.pdf Binary files differindex a5457c97ef3..a58fc7b32ee 100644 --- a/Master/texmf-dist/doc/generic/musixtex/scripts/musixtex.pdf +++ b/Master/texmf-dist/doc/generic/musixtex/scripts/musixtex.pdf diff --git a/Master/texmf-dist/doc/man/man1/musixflx.man1.pdf b/Master/texmf-dist/doc/man/man1/musixflx.man1.pdf Binary files differindex f8bc2b0cf01..520cce2d612 100644 --- a/Master/texmf-dist/doc/man/man1/musixflx.man1.pdf +++ b/Master/texmf-dist/doc/man/man1/musixflx.man1.pdf diff --git a/Master/texmf-dist/doc/man/man1/musixtex.1 b/Master/texmf-dist/doc/man/man1/musixtex.1 index bb3d20e5d48..717ec50b84f 100644 --- a/Master/texmf-dist/doc/man/man1/musixtex.1 +++ b/Master/texmf-dist/doc/man/man1/musixtex.1 @@ -1,5 +1,5 @@ .\" This manpage is licensed under the GNU Public License -.TH MUSIXTEX 1 2017-01-08 "musixtex version 0.17" "" +.TH MUSIXTEX 1 2017-06-13 "musixtex version 0.18" "" .SH NAME musixtex \- processes MusiXTeX files, using pre-processors prepmx, pmxab and autosp as necessary, @@ -42,14 +42,16 @@ If a jobname argument has a .mtx extension, the file is first preprocessed using .BR prepmx (1) and the resulting .pmx file is processed as above. .P -If a jobname argument has a .aspc extension, the file is first preprocessed using -.BR autosp (1) -and the resulting .tex file is processed as above. -.P If a jobname argument has a .ltx extension, the file is processed using .BR latex (1) (or -.BR pdflatex (1)). +.BR pdflatex (1)) +in place of +.BR etex . +.P +If a jobname argument has a .aspc extension, the file is first preprocessed using +.BR autosp (1) +and the resulting .tex or .ltx file is processed as above. .P If a jobname argument has no extension, the script will look for a file .IR jobname .mtx diff --git a/Master/texmf-dist/doc/man/man1/musixtex.man1.pdf b/Master/texmf-dist/doc/man/man1/musixtex.man1.pdf Binary files differindex 9b4c05ddfcc..13249a66cd9 100644 --- a/Master/texmf-dist/doc/man/man1/musixtex.man1.pdf +++ b/Master/texmf-dist/doc/man/man1/musixtex.man1.pdf diff --git a/Master/texmf-dist/scripts/musixtex/musixtex.lua b/Master/texmf-dist/scripts/musixtex/musixtex.lua index 0791ea9e6a5..609c5ffe301 100755 --- a/Master/texmf-dist/scripts/musixtex/musixtex.lua +++ b/Master/texmf-dist/scripts/musixtex/musixtex.lua @@ -1,12 +1,12 @@ #!/usr/bin/env texlua -VERSION = "0.17a" +VERSION = "0.18" --[[ musixtex.lua: processes MusiXTeX files using prepmx and/or pmxab and/or autosp as pre-processors (and deletes intermediate files) - (c) Copyright 2011-2016 Bob Tennent rdt@cs.queensu.ca + (c) Copyright 2011-2017 Bob Tennent rdt@cs.queensu.ca and Dirk Laurie dirk.laurie@gmail.com This program is free software; you can redistribute it and/or modify it @@ -28,6 +28,8 @@ VERSION = "0.17a" --[[ ChangeLog: + version 0.18 2017-06-13 RDT + Allow autosp to generate .ltx files version 0.17a 2017-01-08 RDT Added -D option. @@ -117,7 +119,7 @@ function usage() Usage: [texlua] musixtex.lua { option | basename[.mtx | .pmx | .aspc | .tex | .ltx] } ... When no extension is given, extensions are tried in the above order until a source file is found. Preprocessing goes mtx-pmx-tex or - aspc-tex, with the entry point determined by the extension. + aspc-tex/ltx, with the entry point determined by the extension. The normal route after preprocessing goes tex-dvi-ps-pdf, but shorter routes are also available, see the options. Options: -v version @@ -404,7 +406,10 @@ function preprocess(basename,extension) end if extension == "aspc" then if execute ("autosp " .. basename .. ".aspc" ) == 0 then - extension = "tex" + if exists ( basename .. ".ltx") + then extension = "ltx" + else extension = "tex" + end else print ("!! autosp preprocessing of " .. basename .. ".aspc fails.") exit_code = exit_code+1 diff --git a/Master/texmf-dist/tex/generic/musixtex/musixtex.tex b/Master/texmf-dist/tex/generic/musixtex/musixtex.tex index 6d366b32580..3b081c3c90b 100644 --- a/Master/texmf-dist/tex/generic/musixtex/musixtex.tex +++ b/Master/texmf-dist/tex/generic/musixtex/musixtex.tex @@ -25,15 +25,21 @@ \def\mufl@x{0.83}% \def\mxmajorvernumber{1} -\def\mxminorvernumber{24} +\def\mxminorvernumber{25} \def\mxvernumber{\mxmajorvernumber\mxminorvernumber}% make it possible to compare with \ifnum \def\mxversuffix{}% \edef\mxversion{\mxmajorvernumber.\mxminorvernumber\mxversuffix} -\def\mxdate{2017-02-28} +\def\mxdate{2017-07-25} \immediate\write16{MusiXTeX(c) \mxversion\space<\mxdate>}% \everyjob{\immediate\write16{MusiXTeX(c) \mxversion\space<\mxdate>}}% +% version 1.25 + +% included a "dummy" tuplet.tex in the distribution +% added \ignorespaces in musixltx.tex +% defined \qap, \qapp, \tqsk + % version 1.24 % preserve changes to \transpose in an hboxed tremolo command @@ -3437,6 +3443,9 @@ \def\qa{\q@symbol\@qa} +\def\qap#1{\pt{#1}\qa{#1}} % 1.25 RDT +\def\qapp#1{\ppt{#1}\qa{#1}} % 1.25 RDT + \def\qu{\q@symbol\@qu} \def\qup{\q@symbol\@qup} \def\qupp{\q@symbol\@qupp} @@ -4759,6 +4768,7 @@ \def\qqsk{\off{\qu@rt\@l@mskip}} % version 1.16 RDT \def\hqsk{\off{\h@lf\@l@mskip}} +\def\tqsk{\off{\p@seven\@l@mskip}} % version 1.25 RDT \def\qsk{\off\@l@mskip} \def\nspace{\hardspace{\h@lf\qn@width}} diff --git a/Master/texmf-dist/tex/generic/musixtex/tuplet.tex b/Master/texmf-dist/tex/generic/musixtex/tuplet.tex new file mode 100644 index 00000000000..8ea0dfc0301 --- /dev/null +++ b/Master/texmf-dist/tex/generic/musixtex/tuplet.tex @@ -0,0 +1,27 @@ +% +% This file is part of MusiXTeX +% +% MusiXTeX is free software; you can redistribute it and/or modify +% it under the terms of the GNU General Public License as published by +% the Free Software Foundation; either version 2, or (at your option) +% any later version. +% +% MusiXTeX is distributed in the hope that it will be useful, +% but WITHOUT ANY WARRANTY; without even the implied warranty of +% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +% GNU General Public License for more details. +% +% You should have received a copy of the GNU General Public License +% along with MusiXTeX; see the file COPYING. If not, write to +% the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +% Boston, MA 02111-1307, USA. +% +% +% tuplet.tex +% +\immediate\write16{tuplet.tex <2017-03-16>}% +% +% (nothing to do. - T.116 or later provide the definitions +% by Col. Sicherman formerly in tuplet.tex) +% +\endinput diff --git a/Master/texmf-dist/tex/latex/musixtex/musixltx.tex b/Master/texmf-dist/tex/latex/musixtex/musixltx.tex index f4eff2cf23c..54b0af9865d 100644 --- a/Master/texmf-dist/tex/latex/musixtex/musixltx.tex +++ b/Master/texmf-dist/tex/latex/musixtex/musixltx.tex @@ -18,7 +18,7 @@ % \ifx\undefined\music \else \endinput \fi -\immediate\write16{MusiXLaTeX T.61\space<25 September 1996>}% +\immediate\write16{MusiXLaTeX T.125\space<8 April 2017>}% \newenvironment{music}{\@afterindenttrue\parskip0pt\catcodesmusic \resetlayout}{}% @@ -26,7 +26,8 @@ \ifx\musix@begindocument\undefined \let\musix@begindocument\document \def\document{\musix@begindocument - \ifstartmuflex@done\else\startmuflex\fi}% + \ifstartmuflex@done\else\startmuflex\fi\ignorespaces}% + % 1.25: added \ignorespaces RDT \fi \endinput |