texlive[47655] trunk: musixtex (8may18)
commits+karl at tug.org
commits+karl at tug.org
Thu May 10 00:13:37 CEST 2018
Revision: 47655
http://tug.org/svn/texlive?view=revision&revision=47655
Author: karl
Date: 2018-05-10 00:13:37 +0200 (Thu, 10 May 2018)
Log Message:
-----------
musixtex (8may18)
Modified Paths:
--------------
trunk/Build/source/texk/texlive/linked_scripts/musixtex/musixtex.lua
trunk/Master/texmf-dist/doc/generic/musixtex/README
trunk/Master/texmf-dist/doc/generic/musixtex/musixdoc/frontmatter.tex
trunk/Master/texmf-dist/doc/generic/musixtex/musixdoc/miscellaneous.tex
trunk/Master/texmf-dist/doc/generic/musixtex/musixdoc/musixdoc.sty
trunk/Master/texmf-dist/doc/generic/musixtex/musixdoc/repeats.tex
trunk/Master/texmf-dist/doc/generic/musixtex/musixdoc.pdf
trunk/Master/texmf-dist/scripts/musixtex/musixtex.lua
Added Paths:
-----------
trunk/Master/texmf-dist/doc/generic/musixtex/ChangeLog-128.txt
trunk/Master/texmf-dist/doc/generic/musixtex/musixdoc/musixdoc.ltx
trunk/Master/texmf-dist/doc/generic/musixtex/musixdoc/musixdoc.pdf
Removed Paths:
-------------
trunk/Master/texmf-dist/doc/generic/musixtex/musixdoc/musixdoc.tex
Modified: trunk/Build/source/texk/texlive/linked_scripts/musixtex/musixtex.lua
===================================================================
--- trunk/Build/source/texk/texlive/linked_scripts/musixtex/musixtex.lua 2018-05-09 22:12:45 UTC (rev 47654)
+++ trunk/Build/source/texk/texlive/linked_scripts/musixtex/musixtex.lua 2018-05-09 22:13:37 UTC (rev 47655)
@@ -124,9 +124,10 @@
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/ltx, with the entry point determined by the extension.
+ aspc-etex/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.
+ routes are also available, see the options. The default processing route
+ for .tex files is etex-musixflx-etex.
Options: -v version
-h help
-l latex source
Added: trunk/Master/texmf-dist/doc/generic/musixtex/ChangeLog-128.txt
===================================================================
--- trunk/Master/texmf-dist/doc/generic/musixtex/ChangeLog-128.txt (rev 0)
+++ trunk/Master/texmf-dist/doc/generic/musixtex/ChangeLog-128.txt 2018-05-09 22:13:37 UTC (rev 47655)
@@ -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 at Inter for \nblines < 4
Property changes on: trunk/Master/texmf-dist/doc/generic/musixtex/ChangeLog-128.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/doc/generic/musixtex/README
===================================================================
--- trunk/Master/texmf-dist/doc/generic/musixtex/README 2018-05-09 22:12:45 UTC (rev 47654)
+++ trunk/Master/texmf-dist/doc/generic/musixtex/README 2018-05-09 22:13:37 UTC (rev 47655)
@@ -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
Modified: trunk/Master/texmf-dist/doc/generic/musixtex/musixdoc/frontmatter.tex
===================================================================
--- trunk/Master/texmf-dist/doc/generic/musixtex/musixdoc/frontmatter.tex 2018-05-09 22:12:45 UTC (rev 47654)
+++ trunk/Master/texmf-dist/doc/generic/musixtex/musixdoc/frontmatter.tex 2018-05-09 22:13:37 UTC (rev 47655)
@@ -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
Modified: trunk/Master/texmf-dist/doc/generic/musixtex/musixdoc/miscellaneous.tex
===================================================================
--- trunk/Master/texmf-dist/doc/generic/musixtex/musixdoc/miscellaneous.tex 2018-05-09 22:12:45 UTC (rev 47654)
+++ trunk/Master/texmf-dist/doc/generic/musixtex/musixdoc/miscellaneous.tex 2018-05-09 22:13:37 UTC (rev 47655)
@@ -253,7 +253,7 @@
\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
Added: trunk/Master/texmf-dist/doc/generic/musixtex/musixdoc/musixdoc.ltx
===================================================================
--- trunk/Master/texmf-dist/doc/generic/musixtex/musixdoc/musixdoc.ltx (rev 0)
+++ trunk/Master/texmf-dist/doc/generic/musixtex/musixdoc/musixdoc.ltx 2018-05-09 22:13:37 UTC (rev 47655)
@@ -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}
Property changes on: trunk/Master/texmf-dist/doc/generic/musixtex/musixdoc/musixdoc.ltx
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/generic/musixtex/musixdoc/musixdoc.pdf
===================================================================
(Binary files differ)
Index: trunk/Master/texmf-dist/doc/generic/musixtex/musixdoc/musixdoc.pdf
===================================================================
--- trunk/Master/texmf-dist/doc/generic/musixtex/musixdoc/musixdoc.pdf 2018-05-09 22:12:45 UTC (rev 47654)
+++ trunk/Master/texmf-dist/doc/generic/musixtex/musixdoc/musixdoc.pdf 2018-05-09 22:13:37 UTC (rev 47655)
Property changes on: trunk/Master/texmf-dist/doc/generic/musixtex/musixdoc/musixdoc.pdf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/pdf
\ No newline at end of property
Modified: trunk/Master/texmf-dist/doc/generic/musixtex/musixdoc/musixdoc.sty
===================================================================
--- trunk/Master/texmf-dist/doc/generic/musixtex/musixdoc/musixdoc.sty 2018-05-09 22:12:45 UTC (rev 47654)
+++ trunk/Master/texmf-dist/doc/generic/musixtex/musixdoc/musixdoc.sty 2018-05-09 22:13:37 UTC (rev 47655)
@@ -25,6 +25,7 @@
\usepackage{etex}
\usepackage{amssymb}
+
\newcommand{\comment}[1]{}
%\usepackage{indentfirst}
@@ -31,7 +32,7 @@
\usepackage{mflogo}
-%\usepackage[ansinew]{inputenc}
+\usepackage[cp1252]{inputenc} % needed for \xE7 in extensions.tex
% default is Computer Modern OT1 encoding
\usepackage[T1]{fontenc} % for CM, \input musixec after musixtex
Deleted: trunk/Master/texmf-dist/doc/generic/musixtex/musixdoc/musixdoc.tex
===================================================================
--- trunk/Master/texmf-dist/doc/generic/musixtex/musixdoc/musixdoc.tex 2018-05-09 22:12:45 UTC (rev 47654)
+++ trunk/Master/texmf-dist/doc/generic/musixtex/musixdoc/musixdoc.tex 2018-05-09 22:13:37 UTC (rev 47655)
@@ -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}
Modified: trunk/Master/texmf-dist/doc/generic/musixtex/musixdoc/repeats.tex
===================================================================
--- trunk/Master/texmf-dist/doc/generic/musixtex/musixdoc/repeats.tex 2018-05-09 22:12:45 UTC (rev 47654)
+++ trunk/Master/texmf-dist/doc/generic/musixtex/musixdoc/repeats.tex 2018-05-09 22:13:37 UTC (rev 47655)
@@ -5,7 +5,7 @@
\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,20 +32,113 @@
\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}
All volta commands must be entered right before the bar line command
@@ -61,6 +154,7 @@
\medskip \begin{music}
\parindent0pt
+ \nostartrule
\startpiece
\addspace\afterruleskip
\NOTEs\wh a\en\bar
@@ -103,7 +197,7 @@
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
Modified: trunk/Master/texmf-dist/doc/generic/musixtex/musixdoc.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/scripts/musixtex/musixtex.lua
===================================================================
--- trunk/Master/texmf-dist/scripts/musixtex/musixtex.lua 2018-05-09 22:12:45 UTC (rev 47654)
+++ trunk/Master/texmf-dist/scripts/musixtex/musixtex.lua 2018-05-09 22:13:37 UTC (rev 47655)
@@ -124,9 +124,10 @@
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/ltx, with the entry point determined by the extension.
+ aspc-etex/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.
+ routes are also available, see the options. The default processing route
+ for .tex files is etex-musixflx-etex.
Options: -v version
-h help
-l latex source
More information about the tex-live-commits
mailing list