From 700227e76504f7d34cad2c0c3bf6bbc7616f862a Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 26 Dec 2017 22:07:24 +0000 Subject: musixtex (26dec17) git-svn-id: svn://tug.org/texlive/trunk@46141 c570f23f-e606-0410-a88d-b1316a301751 --- .../doc/generic/musixtex/ChangeLog-127.txt | 15 +++++++++++ Master/texmf-dist/doc/generic/musixtex/README | 2 +- .../doc/generic/musixtex/examples/8bitchar.tex | 12 --------- .../doc/generic/musixtex/examples/eightbitchar.tex | 12 +++++++++ .../texmf-dist/doc/generic/musixtex/musixdoc.pdf | Bin 1301725 -> 1307890 bytes .../doc/generic/musixtex/musixdoc/beams.tex | 10 ++++++- .../doc/generic/musixtex/musixdoc/frontmatter.tex | 4 +-- .../generic/musixtex/musixdoc/miscellaneous.tex | 30 +++++++++++++++++---- .../doc/generic/musixtex/musixdoc/preparing.tex | 2 +- .../doc/generic/musixtex/musixdoc/settingup.tex | 30 ++++++++++++--------- .../doc/generic/musixtex/musixdoc/spacing.tex | 9 +++++-- .../doc/generic/musixtex/musixdoc/writingnotes.tex | 1 + .../doc/generic/musixtex/scripts/musixtex.pdf | Bin 7122 -> 7220 bytes 13 files changed, 91 insertions(+), 36 deletions(-) create mode 100644 Master/texmf-dist/doc/generic/musixtex/ChangeLog-127.txt delete mode 100644 Master/texmf-dist/doc/generic/musixtex/examples/8bitchar.tex create mode 100644 Master/texmf-dist/doc/generic/musixtex/examples/eightbitchar.tex (limited to 'Master/texmf-dist/doc/generic') diff --git a/Master/texmf-dist/doc/generic/musixtex/ChangeLog-127.txt b/Master/texmf-dist/doc/generic/musixtex/ChangeLog-127.txt new file mode 100644 index 00000000000..399d5a2eed1 --- /dev/null +++ b/Master/texmf-dist/doc/generic/musixtex/ChangeLog-127.txt @@ -0,0 +1,15 @@ + +Changes from MusiXTeX 126 to 127: + +* introduced \meterN, \xxtuplet + +* introduced \nqqb \nqqh \nqqqb \nqqqh abbreviations and + synonyms \nqql \nqqu \nqqql \nqqqu + +* introduced \hap, \happ analogous to \qap, \qapp + +* introduced \hbsk analogous to \hsk + +* introduced \bqsk, \bhsk, \btsk analogous to \qsk, \hqsk, \tqsk + +* eliminated \ds@oup diff --git a/Master/texmf-dist/doc/generic/musixtex/README b/Master/texmf-dist/doc/generic/musixtex/README index a772fbe7c86..db1370c4d72 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.26 (2017-11-15). +This is MusiXTeX, version 1.27 (2017-12-26). 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/examples/8bitchar.tex b/Master/texmf-dist/doc/generic/musixtex/examples/8bitchar.tex deleted file mode 100644 index 54969d68d02..00000000000 --- a/Master/texmf-dist/doc/generic/musixtex/examples/8bitchar.tex +++ /dev/null @@ -1,12 +0,0 @@ - -\input plainenc\relax\inputencoding{cp1252} -\input musixtex -\input musixlyr -\hsize50mm -\setlyrics1{á ä ö}\assignlyrics11% -\startpiece\addspace{4pt}% -\znotes\zcharnote{12}{Poème naïf}\en% -\Notes\qa{ggg}\en% -\endpiece -\vfill\eject -\end diff --git a/Master/texmf-dist/doc/generic/musixtex/examples/eightbitchar.tex b/Master/texmf-dist/doc/generic/musixtex/examples/eightbitchar.tex new file mode 100644 index 00000000000..54969d68d02 --- /dev/null +++ b/Master/texmf-dist/doc/generic/musixtex/examples/eightbitchar.tex @@ -0,0 +1,12 @@ + +\input plainenc\relax\inputencoding{cp1252} +\input musixtex +\input musixlyr +\hsize50mm +\setlyrics1{á ä ö}\assignlyrics11% +\startpiece\addspace{4pt}% +\znotes\zcharnote{12}{Poème naïf}\en% +\Notes\qa{ggg}\en% +\endpiece +\vfill\eject +\end diff --git a/Master/texmf-dist/doc/generic/musixtex/musixdoc.pdf b/Master/texmf-dist/doc/generic/musixtex/musixdoc.pdf index fe7cb5178f0..723a68628ef 100644 Binary files a/Master/texmf-dist/doc/generic/musixtex/musixdoc.pdf and b/Master/texmf-dist/doc/generic/musixtex/musixdoc.pdf differ diff --git a/Master/texmf-dist/doc/generic/musixtex/musixdoc/beams.tex b/Master/texmf-dist/doc/generic/musixtex/musixdoc/beams.tex index 2777cafc822..354906640ed 100644 --- a/Master/texmf-dist/doc/generic/musixtex/musixdoc/beams.tex +++ b/Master/texmf-dist/doc/generic/musixtex/musixdoc/beams.tex @@ -119,7 +119,7 @@ provide that.}: \end{verbatim}\end{quote} %\check - \section{Ending a beam} +\section{Ending a beam} The termination of a given beam must be declared \ital{before} coding the last spacing note connected to that beam. The macros for doing that are @@ -222,6 +222,10 @@ The following abbreviations have been provided: \item \keyindex{tqqh}\enpee~is equivalent to \verb|\tbbu{|$n$\verb|}\tqh|\enpee \item \keyindex{tqqqh}\enpee~is equivalent to \verb|\tbbbu{|$n$\verb|}\tqqh|\enpee \item \keyindex{tqqqb}\enpee~is equivalent to \verb|\tbbbl{|$n$\verb|}\tqqb|\enpee + \item \keyindex{nqqb}\enpee~is equivalent to \verb|\tbbl{|$n$\verb|}\qb|\enpee + \item \keyindex{nqqh}\enpee~is equivalent to \verb|\tbbu{|$n$\verb|}\qb|\enpee + \item \keyindex{nqqqh}\enpee~is equivalent to \verb|\tbbbu{|$n$\verb|}\qb|\enpee + \item \keyindex{nqqqb}\enpee~is equivalent to \verb|\tbbbl{|$n$\verb|}\qb|\enpee \end{description}\end{quote} and the following synonyms may be used: @@ -230,6 +234,10 @@ synonyms may be used: \keyindex{tqqu} & for & \keyindex{tqqh}\\ \keyindex{tqqql} & for & \keyindex{tqqqb}\\ \keyindex{tqqqu} & for & \keyindex{tqqqh}\\ +\keyindex{nqql} & for & \keyindex{nqqb}\\ +\keyindex{nqqu} & for & \keyindex{nqqh}\\ +\keyindex{nqqql} & for & \keyindex{nqqqb}\\ +\keyindex{nqqqu} & for & \keyindex{nqqqh}\\ \end{tabular}\end{quote} \medskip diff --git a/Master/texmf-dist/doc/generic/musixtex/musixdoc/frontmatter.tex b/Master/texmf-dist/doc/generic/musixtex/musixdoc/frontmatter.tex index 9c1e58a964c..4e772196c15 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.26} +instrumental music\\\Large\itshape Version 1.27} %\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.26. +\musixtex\ version~1.27. Novice users need not start here. Most diff --git a/Master/texmf-dist/doc/generic/musixtex/musixdoc/miscellaneous.tex b/Master/texmf-dist/doc/generic/musixtex/musixdoc/miscellaneous.tex index 9a909c34389..5b6a5b6f7c3 100644 --- a/Master/texmf-dist/doc/generic/musixtex/musixdoc/miscellaneous.tex +++ b/Master/texmf-dist/doc/generic/musixtex/musixdoc/miscellaneous.tex @@ -137,11 +137,12 @@ which will be placed by the first and third through sixth macros, and is initially defined as \verb|\def\txt{3}|. The macro \verb|\tuplettxt| serves the same role for the last two macros. -The font used is -\verb|\txtfont| which is by default \verb|\eightit| (in normal music size) but may be re-defined. -The first four -are to be used with beamed xtuplets. As indicated in the -last column, the last four produce a sloping bracket and are to be used with +The font used is defined by +\verb|\txtfont| and is, by default, \verb|\eightit| (in normal music size) but may be re-defined. + +The first four commands in the table +are normally used with beamed xtuplets. As indicated in the +last column, the last four produce a sloping bracket and may be used with unbeamed xtuplets. @@ -250,6 +251,25 @@ use the macros without gaps. \Notesp\downtuplet O16\qu e\en\notesp\cu g\en\bar \notesp\uptuplet o16\ccl l\en\notesp\cccl n\en \notesp\downtuplet O16\ccu e\en\notesp\cccu g\en +\end{verbatim}\end{quote} + +A modern notation uses a \emph{ratio} to specify the intended duration +of an x-tuplet. This is supported in \musixtex\ by the command +\keyindex{xxtuplet}, as in + +\begin{music} +\nostartrule +\startextract\addspace\afterruleskip +\notes\xxtuplet5:6o\ibl0j3\qb0{jklm}\tql0n\en +\endextract +\end{music} + +\noindent with coding \verb|\xxtuplet5:6o\ibl0j3\qb0{jklm}\tql0n|. For the +other x-tuplet commands (apart from \verb|\triolet|, which is defined in terms of \verb|\xtuplet|), +it is possible to define \verb|\txt| or +\verb|\tupletxt| as a ratio, as in +\begin{quote}\begin{verbatim} +\def\txt{5:6} \end{verbatim}\end{quote} \section{Ornaments} diff --git a/Master/texmf-dist/doc/generic/musixtex/musixdoc/preparing.tex b/Master/texmf-dist/doc/generic/musixtex/musixdoc/preparing.tex index 87bc2fe59b3..88e3756bf4c 100644 --- a/Master/texmf-dist/doc/generic/musixtex/musixdoc/preparing.tex +++ b/Master/texmf-dist/doc/generic/musixtex/musixdoc/preparing.tex @@ -265,7 +265,7 @@ For example, from the input \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. +skips (i.e., in every staff) and centered whole-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 diff --git a/Master/texmf-dist/doc/generic/musixtex/musixdoc/settingup.tex b/Master/texmf-dist/doc/generic/musixtex/musixdoc/settingup.tex index cfac63093f0..da410cc92e5 100644 --- a/Master/texmf-dist/doc/generic/musixtex/musixdoc/settingup.tex +++ b/Master/texmf-dist/doc/generic/musixtex/musixdoc/settingup.tex @@ -160,8 +160,18 @@ where $m$ describes the appearance of the meter indication, and can take several different forms. If the meter is a \ital{fraction} (e.g.,~$3/4$) the command is \verb|\generalmeter{|\keyindex{meterfrac}\verb|{3}{4}}|. Other possible tokens~$m$ are \keyindex{meterC}, -\keyindex{allabreve}, \keyindex{reverseC}, \keyindex{reverseallabreve} and -\keyindex{meterplus}. These are illustrated in the following example: +\keyindex{allabreve}, \keyindex{reverseC}, \keyindex{reverseallabreve}, \keyindex{meterN} and +\keyindex{meterplus}. +To insert extra space before the meter is +written, use \keyindex{meterskip}$d$ where $d$ is any hard \TeX\ +%dimension\footnote{{\Bslash\tt meterskip} is not a macro but a +dimension\footnote{{\tt\Bslash meterskip} is not a macro but a +dimension register. Whatever follows it +must be a \TeX\ dimension and {\it it must not be enclosed in braces}.}. +The assignment must occur outside \verb|\startpiece...\endpiece| and will be +reset to zero after first meter is posted. + +These are illustrated in the following example: %\check \begin{music} @@ -176,7 +186,9 @@ Other possible tokens~$m$ are \keyindex{meterC}, \generalmeter\reverseallabreve\changecontext \NOTEs\zwq g\en \generalmeter{\meterfrac{3\meterplus2\meterplus3}8}\changecontext -\Notes\Tqbu ceg\Dqbl jg\Tqbu gec\en\setemptybar +\notesp\Tqbu ceg\Dqbl jg\Tqbu gec\en +\generalmeter{\meterN3}\meterskip4pt\changecontext +\Notes\qa{ceg}\en\setemptybar \endpiece \end{music} \noindent which was coded as: @@ -192,7 +204,9 @@ Other possible tokens~$m$ are \keyindex{meterC}, \generalmeter\reverseallabreve\changecontext \NOTEs\zwq g\en \generalmeter{\meterfrac{3\meterplus2\meterplus3}8}\changecontext -\Notes\Tqbu ceg\Dqbl jg\Tqbu gec\en\setemptybar +\notesp\Tqbu ceg\Dqbl jg\Tqbu gec\en +\generalmeter{\meterN3}\meterskip4pt\changecontext +\Notes\qa{ceg}\en\setemptybar \endpiece \end{verbatim}\end{quote} @@ -203,14 +217,6 @@ This works just like \verb|\setclef|. For example, sets the meter to 12/8 for the first staff of the third instrument, and \ital{alla breve} for the second staff. -To insert extra space before the meter is -written, use \keyindex{meterskip}$d$ where $d$ is any hard \TeX\ -%dimension\footnote{{\Bslash\tt meterskip} is not a macro but a -dimension\footnote{{\tt\Bslash meterskip} is not a macro but a -dimension register. Whatever follows it -must be a \TeX\ dimension and {\it it must not be enclosed in braces}.}. -The assignment must occur outside \verb|\startpiece...\endpiece| and will be -reset to zero after first meter is posted. \subsection{Instrument names} diff --git a/Master/texmf-dist/doc/generic/musixtex/musixdoc/spacing.tex b/Master/texmf-dist/doc/generic/musixtex/musixdoc/spacing.tex index 0108fb080f5..f4bcf298176 100644 --- a/Master/texmf-dist/doc/generic/musixtex/musixdoc/spacing.tex +++ b/Master/texmf-dist/doc/generic/musixtex/musixdoc/spacing.tex @@ -25,10 +25,15 @@ restarting. For example, To skip forward by one half of a \verb|\noteskip|, use \keyindex{hsk}. +To skip \emph{backward} +by one or half \verb|\noteskip|, use \keyindex{bsk}, +or \keyindex{hbsk}, respectively. + To insert spacing of approximately one note head width, you can use \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, +or \keyindex{qqsk}, respectively. +To skip backward one note-head width or two-thirds or half that, use +\keyindex{bqsk}, \keyindex{btsk} or \keyindex{bhsk}, respectively. More generally, to skip an arbitrary distance, use \keyindex{off}\verb|{|$D$\verb|}| where $D$ is any \itxem{scalable dimension}, e.g.,~\verb|\noteskip| or \verb|\elemskip|. Indeed, if you look in the diff --git a/Master/texmf-dist/doc/generic/musixtex/musixdoc/writingnotes.tex b/Master/texmf-dist/doc/generic/musixtex/musixdoc/writingnotes.tex index f8656044ea6..7bd5c83375f 100644 --- a/Master/texmf-dist/doc/generic/musixtex/musixdoc/writingnotes.tex +++ b/Master/texmf-dist/doc/generic/musixtex/musixdoc/writingnotes.tex @@ -218,6 +218,7 @@ macros just introduced provide one or two dots after the notehead: \keyindex{zwp}, \keyindex{zwpp}, \keyindex{hup}, \keyindex{hupp}, \keyindex{hlp}, \keyindex{hlpp}, +\keyindex{hap}, \keyindex{happ}, \keyindex{zhp}, \keyindex{zhpp}, \keyindex{qup}, \keyindex{qupp}, \keyindex{qlp}, \keyindex{qlpp}, diff --git a/Master/texmf-dist/doc/generic/musixtex/scripts/musixtex.pdf b/Master/texmf-dist/doc/generic/musixtex/scripts/musixtex.pdf index a58fc7b32ee..4b99770a501 100644 Binary files a/Master/texmf-dist/doc/generic/musixtex/scripts/musixtex.pdf and b/Master/texmf-dist/doc/generic/musixtex/scripts/musixtex.pdf differ -- cgit v1.2.3