From 8a5ed0afa496837dadba1833d731b613cf58f135 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 9 May 2018 22:13:37 +0000 Subject: musixtex (8may18) git-svn-id: svn://tug.org/texlive/trunk@47655 c570f23f-e606-0410-a88d-b1316a301751 --- .../doc/generic/musixtex/ChangeLog-128.txt | 7 ++ Master/texmf-dist/doc/generic/musixtex/README | 2 +- .../texmf-dist/doc/generic/musixtex/musixdoc.pdf | Bin 1307890 -> 1316500 bytes .../doc/generic/musixtex/musixdoc/frontmatter.tex | 2 +- .../generic/musixtex/musixdoc/miscellaneous.tex | 2 +- .../doc/generic/musixtex/musixdoc/musixdoc.ltx | 102 ++++++++++++++++++ .../doc/generic/musixtex/musixdoc/musixdoc.pdf | Bin 0 -> 1316500 bytes .../doc/generic/musixtex/musixdoc/musixdoc.sty | 3 +- .../doc/generic/musixtex/musixdoc/musixdoc.tex | 102 ------------------ .../doc/generic/musixtex/musixdoc/repeats.tex | 118 ++++++++++++++++++--- 10 files changed, 220 insertions(+), 118 deletions(-) create mode 100644 Master/texmf-dist/doc/generic/musixtex/ChangeLog-128.txt create mode 100644 Master/texmf-dist/doc/generic/musixtex/musixdoc/musixdoc.ltx create mode 100644 Master/texmf-dist/doc/generic/musixtex/musixdoc/musixdoc.pdf delete mode 100644 Master/texmf-dist/doc/generic/musixtex/musixdoc/musixdoc.tex (limited to 'Master/texmf-dist/doc') diff --git a/Master/texmf-dist/doc/generic/musixtex/ChangeLog-128.txt b/Master/texmf-dist/doc/generic/musixtex/ChangeLog-128.txt new file mode 100644 index 00000000000..39c5fa708ea --- /dev/null +++ b/Master/texmf-dist/doc/generic/musixtex/ChangeLog-128.txt @@ -0,0 +1,7 @@ + +Changes from MusiXTeX 127 to 128: + + * introduced \z[left|right|leftright]repeat, for use *within* a bar + and \zz...repeat, to force to the end of a system + + * corrected definition of \C@Inter for \nblines < 4 diff --git a/Master/texmf-dist/doc/generic/musixtex/README b/Master/texmf-dist/doc/generic/musixtex/README index db1370c4d72..84374a87110 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.27 (2017-12-26). +This is MusiXTeX, version 1.28 (2018-05-07). 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 index 723a68628ef..0bbde1ea6c3 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/frontmatter.tex b/Master/texmf-dist/doc/generic/musixtex/musixdoc/frontmatter.tex index 4e772196c15..96e47348d88 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.27} +instrumental music\\\Large\itshape Version 1.28} %\author{\Large\rm Daniel \sc Taupin\\\large\sl diff --git a/Master/texmf-dist/doc/generic/musixtex/musixdoc/miscellaneous.tex b/Master/texmf-dist/doc/generic/musixtex/musixdoc/miscellaneous.tex index 5b6a5b6f7c3..6efd0ec7d27 100644 --- a/Master/texmf-dist/doc/generic/musixtex/musixdoc/miscellaneous.tex +++ b/Master/texmf-dist/doc/generic/musixtex/musixdoc/miscellaneous.tex @@ -253,7 +253,7 @@ use the macros without gaps. \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 +A modern notation uses a \emph{ratio} such as $5$:$6$ to specify the intended duration of an x-tuplet. This is supported in \musixtex\ by the command \keyindex{xxtuplet}, as in diff --git a/Master/texmf-dist/doc/generic/musixtex/musixdoc/musixdoc.ltx b/Master/texmf-dist/doc/generic/musixtex/musixdoc/musixdoc.ltx new file mode 100644 index 00000000000..c48e40b7739 --- /dev/null +++ b/Master/texmf-dist/doc/generic/musixtex/musixdoc/musixdoc.ltx @@ -0,0 +1,102 @@ +% +% 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. +% +% +% musixdoc.tex : the document +% +\documentclass[twoside,11pt,notitlepage]{report} + +\usepackage{musixdoc} + + +%\includeonly{% +%frontmatter, +%introduction, +%settingup, +%preparing, +%writingnotes, +%beams, +%restsdoc, +%spacing, +%accidentals, +%transposition, +%slurstiesfont, +%slurstiesTypeK, +%barlines, +%barnumbering, +%layout, +%changing, +%repeats, +%fonts, +%miscellaneous, +%smaller, +%staffsize, +%parameters, +%extracting, +%lyrics, +%embedding, +%extensions, +%examples, +%summary, +%index +%} + +\startmuflex + +\makeindex + +\begin{document} + +\include{frontmatter} + +\setcounter{page}{1} +\pagenumbering{arabic} +\renewcommand{\thepage}{\arabic{page}} + +\include{introduction} +\include{settingup} +\include{preparing} +\include{writingnotes} +\include{beams} +\include{restsdoc} +\include{spacing} +\include{accidentals} +\include{transposition} +\include{slurstiesfont} +\include{slurstiesTypeK} +\include{barlines} +\include{barnumbering} +\include{layout} +\include{changing} +\include{repeats} +\include{fonts} +\include{miscellaneous} +\include{smaller} +\include{staffsize} +\include{parameters} +\include{extracting} +\include{lyrics} +\include{embedding} +\include{extensions} +\include{examples} + +\include{summary} + +\include{index} + +\end{document} diff --git a/Master/texmf-dist/doc/generic/musixtex/musixdoc/musixdoc.pdf b/Master/texmf-dist/doc/generic/musixtex/musixdoc/musixdoc.pdf new file mode 100644 index 00000000000..0bbde1ea6c3 Binary files /dev/null and b/Master/texmf-dist/doc/generic/musixtex/musixdoc/musixdoc.pdf differ diff --git a/Master/texmf-dist/doc/generic/musixtex/musixdoc/musixdoc.sty b/Master/texmf-dist/doc/generic/musixtex/musixdoc/musixdoc.sty index 747bbf6e8cd..d752fc8b027 100644 --- a/Master/texmf-dist/doc/generic/musixtex/musixdoc/musixdoc.sty +++ b/Master/texmf-dist/doc/generic/musixtex/musixdoc/musixdoc.sty @@ -25,13 +25,14 @@ \usepackage{etex} \usepackage{amssymb} + \newcommand{\comment}[1]{} %\usepackage{indentfirst} \usepackage{mflogo} -%\usepackage[ansinew]{inputenc} +\usepackage[cp1252]{inputenc} % needed for ç in extensions.tex % default is Computer Modern OT1 encoding \usepackage[T1]{fontenc} % for CM, \input musixec after musixtex diff --git a/Master/texmf-dist/doc/generic/musixtex/musixdoc/musixdoc.tex b/Master/texmf-dist/doc/generic/musixtex/musixdoc/musixdoc.tex deleted file mode 100644 index c48e40b7739..00000000000 --- a/Master/texmf-dist/doc/generic/musixtex/musixdoc/musixdoc.tex +++ /dev/null @@ -1,102 +0,0 @@ -% -% 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. -% -% -% musixdoc.tex : the document -% -\documentclass[twoside,11pt,notitlepage]{report} - -\usepackage{musixdoc} - - -%\includeonly{% -%frontmatter, -%introduction, -%settingup, -%preparing, -%writingnotes, -%beams, -%restsdoc, -%spacing, -%accidentals, -%transposition, -%slurstiesfont, -%slurstiesTypeK, -%barlines, -%barnumbering, -%layout, -%changing, -%repeats, -%fonts, -%miscellaneous, -%smaller, -%staffsize, -%parameters, -%extracting, -%lyrics, -%embedding, -%extensions, -%examples, -%summary, -%index -%} - -\startmuflex - -\makeindex - -\begin{document} - -\include{frontmatter} - -\setcounter{page}{1} -\pagenumbering{arabic} -\renewcommand{\thepage}{\arabic{page}} - -\include{introduction} -\include{settingup} -\include{preparing} -\include{writingnotes} -\include{beams} -\include{restsdoc} -\include{spacing} -\include{accidentals} -\include{transposition} -\include{slurstiesfont} -\include{slurstiesTypeK} -\include{barlines} -\include{barnumbering} -\include{layout} -\include{changing} -\include{repeats} -\include{fonts} -\include{miscellaneous} -\include{smaller} -\include{staffsize} -\include{parameters} -\include{extracting} -\include{lyrics} -\include{embedding} -\include{extensions} -\include{examples} - -\include{summary} - -\include{index} - -\end{document} diff --git a/Master/texmf-dist/doc/generic/musixtex/musixdoc/repeats.tex b/Master/texmf-dist/doc/generic/musixtex/musixdoc/repeats.tex index 6bb6fe340c2..5924d92d437 100644 --- a/Master/texmf-dist/doc/generic/musixtex/musixdoc/repeats.tex +++ b/Master/texmf-dist/doc/generic/musixtex/musixdoc/repeats.tex @@ -5,7 +5,7 @@ commands \keyindex{leftrepeat}, \keyindex{rightrepeat} or \keyindex{leftrightrepeat} in place of \verb|\bar|. If a \verb|\leftrepeat| happens to come at the end of a system, it will automatically be moved to the start of the next system. If a \verb|\leftrightrepeat| happens to come at the -end if a system, \musixtex\ will automatically post a right repeat at the end +end of a system, \musixtex\ will automatically post a right repeat at the end of the system and a left repeat at the beginning of the next. For example, @@ -32,19 +32,112 @@ For example, \NOTEs\wh j\en \end{verbatim}\end{quote} -To insert a right repeat at a forced line break or at the end of a piece, use +To insert a right-repeat at a forced line break or at the end of a piece, use \verb|\setrightrepeat| \textit{before}\ \verb|\alaligne| or \verb|\endpiece|. -In contrast, to insert a left repeat at a forced line break or at the -beginning of a piece, simply use \verb|\leftrepeat| immediately \textit{after} -\verb|\startpiece| or \verb|\alaligne|. To insert a left-right repeat at a -forced line break, use \verb|\setrightrepeat\alaligne\leftrepeat|. - In fact it is possible to use \keyindex{setleftrepeat}, \keyindex{setrightrepeat} or \keyindex{setleftrightrepeat} before any -\keyindex{bar}, \keyindex{stoppiece} or \keyindex{changecontext}. But -be aware that while \verb|\setleftrepeat| behaves properly if the -bar is at the end of a system, \verb|\setleftrightrepeat| does not, placing -the symbol only at the end of the system. +\keyindex{bar}, \keyindex{stoppiece} or \keyindex{changecontext}; but +be aware that whereas \verb|\setrightrepeat| behaves properly if the bar is at the +end of a system, \verb|\setleftrepeat| and \verb|\setleftrightrepeat| do not, +placing +the left-repeat symbol at the end of the system rather +than at the beginning of the next system; see the +\verb|\zleftrepeat| \verb|\zzleftrepeat| \verb|\zzleftrightrepeat| +and \verb|\zzleftrightrepeat| commands described below. + + +The following commands generate repeat symbols as usual, but +are assumed to be in the \emph{middle} of a bar; that is, +the bar counter is not incremented: +\begin{itemize} +\item[] \keyindex{zrightrepeat} +\item[] \keyindex{zleftrepeat} +\item[] \keyindex{zleftrightrepeat} +\end{itemize} +For example, to insert a left-repeat at a forced line break or at the +beginning of a piece, simply use \verb|\zleftrepeat| immediately \textit{after} +\verb|\startpiece| or \verb|\alaligne|. To insert a left-right repeat at a +forced line break, use \verb|\setrightrepeat\alaligne\zleftrepeat|. + +The following commands are similar but force the mid-bar break to the +end of a system: +\begin{itemize} +\item[] \keyindex{zzrightrepeat} +\item[] \keyindex{zzleftrepeat} +\item[] \keyindex{zzleftrightrepeat} +\end{itemize} +For +\verb|\zzleftrepeat| and \verb|\zzleftrightrepeat|, the left-repeats occur +at the beginning of the following system. The bar numbers are +correctly adjusted, using \keyindex{writezbarno} for the continuation +if \keyindex{systemnumbers} is in use. + +As an example, here is +a \emph{bour\'ee} by G.-F.~Handel coded using \verb|\zleftrepeat| at the beginning +of the \textbf{A} section and \verb|\zzleftrightrepeat| +between the \textbf{A} and the \textbf{B} sections: + +\begin{music} +\smallmusicsize +\generalmeter{\allabreve} +\generalsignature{1} +\startbarno=0 +\nobarnumbers +\nostartrule +\startpiece\addspace\afterruleskip +\systemnumbers +\zleftrepeat% +\znotes\ccn{10}{\boxit{\bf A}}\en +\NOtes\qa d\en% +\bar%1 +\NOtes\qa{g}\qa{i}\qa{h}\qa{g}\en% +\bar%2 +\NOTes\ha{k}\ha{i}\en% +\bar%3 +\NOtes\qa{l}\qa{k}\qa{j}\qa{i}\en% +\bar%4 +\NOtes\qa j\en +\NOTes\ha i\en% +\zzleftrightrepeat% +\znotes\ccn{10}{\boxit{\bf B}}\en +\NOtes\qa k\en% +\bar%5 +\NOtes\qa{l}\qa{j}\qa{h}\en +\Notes\ibl3i2\qb3i\tql3j\en% +\bar%6 +\NOtes\qa{k}\qa{i}\qa{g}\en +\Notes\ibu3h2\qb3h\tqu3i\en% +\bar%7 +\NOtes\qa{j}\qa{i}\qa{h}\qa{g}\en% +\bar%8 +\Notes\ibu3h1\qb3{h}\qb3{g}\qb3{h}\tqu3i\en +\NOtes\qa h\en +\Notes\ibl3i2\qb3i\tql3j\en% +\bar%9 +\NOtes\qa k\en +\Notes\ibl3i2\qb3i\tql3j\en +\NOtes\qa k\en +\Notes\ibl3j{-2}\qb3j\tql3i\en% +\bar%10 +\NOtes\qa j\en +\Notes\ibu3h2\qb3h\tqu3i\en +\NOtes\qa j\en +\Notes\ibu3i{-2}\qb3i\tqu3h\en% +\bar%11 +\NOtes\qa{i}\qa{g}\en +\NOtesp\tr{11}\qa{.h}\en +\Notes\ca g\en% +\bar%12 +\NOTesp\ha{.g}\en% +\setrightrepeat% +\endpiece% +\end{music} + +\noindent No explicit adjustment of \verb|\barno| was necessary. The right-repeat +at the end of the \textbf{B}~section was produced by +\verb|\setrightrepeat\endpiece|. + + \section{First and second endings (Voltas)}\index{volta} @@ -61,6 +154,7 @@ mentioned above are all that are required: \medskip \begin{music} \parindent0pt + \nostartrule \startpiece \addspace\afterruleskip \NOTEs\wh a\en\bar @@ -103,7 +197,7 @@ that starts it, and it will automatically terminate at the second bar line command: \medskip \begin{music} - \parindent0pt \startpiece \addspace\afterruleskip + \parindent0pt \nostartrule\startpiece \addspace\afterruleskip \NOTEs\wh a\en\bar \NOTEs\wh b\en\setvolta{1.-3}\bar \NOTEs\wh c\en\setvolta4\rightrepeat \NOTEs\wh d\en\bar -- cgit v1.2.3