summaryrefslogtreecommitdiff
path: root/Master/texmf-dist
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2021-05-17 20:40:09 +0000
committerKarl Berry <karl@freefriends.org>2021-05-17 20:40:09 +0000
commitb8c42d8dfc02f1a441b946388d6fe72749982e20 (patch)
tree895c6549f47cb9612c2f20471eb65c3fb4533cf0 /Master/texmf-dist
parent02d9f17ba92ad3f076e2dc14711462e1dfea6ec0 (diff)
musixtex (17may21)
git-svn-id: svn://tug.org/texlive/trunk@59240 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r--Master/texmf-dist/doc/generic/musixtex/README2
-rw-r--r--Master/texmf-dist/doc/generic/musixtex/musixdoc.pdfbin1396006 -> 1395131 bytes
-rw-r--r--Master/texmf-dist/doc/generic/musixtex/musixdoc/beams.tex4
-rw-r--r--Master/texmf-dist/doc/generic/musixtex/musixdoc/extensions.tex70
-rw-r--r--Master/texmf-dist/doc/generic/musixtex/musixdoc/frontmatter.tex2
-rw-r--r--Master/texmf-dist/doc/generic/musixtex/musixdoc/musixdoc.sty2
-rwxr-xr-xMaster/texmf-dist/scripts/musixtex/musixflx.bat6
-rwxr-xr-xMaster/texmf-dist/scripts/musixtex/musixtex.bat6
-rw-r--r--Master/texmf-dist/tex/generic/musixtex/musixvbm.tex12
9 files changed, 64 insertions, 40 deletions
diff --git a/Master/texmf-dist/doc/generic/musixtex/README b/Master/texmf-dist/doc/generic/musixtex/README
index 248beeb18bd..da1567d60da 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.31 (2021-01-07).
+This is MusiXTeX, version 1.32a (2021-05-16).
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 8503c824110..ec5eac06421 100644
--- a/Master/texmf-dist/doc/generic/musixtex/musixdoc.pdf
+++ b/Master/texmf-dist/doc/generic/musixtex/musixdoc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/musixtex/musixdoc/beams.tex b/Master/texmf-dist/doc/generic/musixtex/musixdoc/beams.tex
index 6cf562a9c3c..dbf57e2eb46 100644
--- a/Master/texmf-dist/doc/generic/musixtex/musixdoc/beams.tex
+++ b/Master/texmf-dist/doc/generic/musixtex/musixdoc/beams.tex
@@ -622,6 +622,6 @@ In this example we see not only multiple uses of \keyindex{nextstaff} and
\section{Discontinuities in Long Beams}
-Beams are normally produced by \texttt{musixtex} using special fonts. Unfortunately, very long beams may have
+By default, \texttt{musixtex} produces beams using special fonts. Unfortunately, long beams may have
unsightly discontinuities (gaps or bumps). See Section~\ref{musixvbm}
-for an experimental solution to this problem.
+for a solution to this problem.
diff --git a/Master/texmf-dist/doc/generic/musixtex/musixdoc/extensions.tex b/Master/texmf-dist/doc/generic/musixtex/musixdoc/extensions.tex
index 5bf8dd667d8..c31772897eb 100644
--- a/Master/texmf-dist/doc/generic/musixtex/musixdoc/extensions.tex
+++ b/Master/texmf-dist/doc/generic/musixtex/musixdoc/extensions.tex
@@ -2178,38 +2178,52 @@ Available are:
\section{musixvbm}\ixtt{musixvbm.tex}
\label{musixvbm}
-Beams are normally produced by \texttt{musixtex} using special fonts. Unfortunately, very long beams may have
-unsightly discontinuities (gaps or bumps). This experimental add-on
-(by Hiroaki \textsc{Morimoto}) produces vectorized beams without these
-discontinuities. Compare
-\begin{description}
-\item{}
+By default, \texttt{musixtex} produces beams using special fonts. Unfortunately, long beams may have
+unsightly discontinuities (gaps or bumps). The \texttt{musixvbm} add-on
+by Hiroaki \textsc{Morimoto} produces smooth vectorized beams.
+Compare
+
+\medskip
\begin{music}
+\let\extractline\hbox
+\vectorizedbeamfalse
\nostartrule
\setclef1{\bass}
+\hbox to \hsize{%
+\hss
\startextract
\nnotes\ibbl0G1\qb0{GJKLMLMLMLMLMLMK}\tqb0L\en
-\endextract
-\end{music}
-\end{description}
-and
-\begin{description}
-\item{}
-\begin{music}
-\input musixvbm
-\nostartrule
-\setclef1{\bass}
+\zendextract
+\hss
+\raise20pt\hbox{ and }
+\hss
+\vectorizedbeamtrue
\startextract
\nnotes\ibbl0G1\qb0{GJKLMLMLMLMLMLMK}\tqb0L\en
-\endextract
+\zendextract
+\hss}
\end{music}
-\end{description}
-especially when magnified.
-
-The only known disadvantage is that some \texttt{dvi} viewers
-including \texttt{xdvi} and \texttt{yap} do not support the \texttt{tpic} specials
-that implement the vectorized beams so that no beams are shown; however, Postscript and PDF
-output generated using \texttt{dvips} and \texttt{ps2pdf} (or \texttt{dvipdfm}) should be satisfactory.
+\medskip
+\noindent
+with various magnifications. The output on the left shows a font-based beam; the one
+on the right (like all the other beams in this report) shows the same beam with
+\texttt{musixvbm} activated.
+
+
+The only known disadvantage with use of \texttt{musixvbm} is that many \texttt{dvi} viewers
+(including \texttt{xdvi} and \texttt{yap}) do not support the ``\texttt{tpic} specials''
+that implement vectorized beams in \texttt{dvi} output, so that no beams are shown\footnote{%
+The \texttt{dviout} program for Windows supports \texttt{tpic} specials;
+it is available from CTAN and in the Win32 distribution of TeXLive.};
+however, Postscript and PDF
+output generated using \texttt{dvips} and \texttt{ps2pdf} (or using
+\texttt{dvipdfm},
+or by processing the score using \texttt{pdfetex}) should be satisfactory.
+
+If Postscript hairpins
+as described in Section~\ref{PostscriptSlurs} are not being used,
+the \texttt{musixvbm} add-on also vectorizes crescendos and
+decrescendos.
\section{tuplet}
@@ -2218,9 +2232,7 @@ This file does nothing; it is provided for compatibility with
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}
+\keyindex{tuplettxt},
+\keyindex{uptuplet} and
+\keyindex{downtuplet}.
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 e0d9515830c..3eedf3665ca 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.32}
+instrumental music\\\Large\itshape Version 1.32a}
\author{}
diff --git a/Master/texmf-dist/doc/generic/musixtex/musixdoc/musixdoc.sty b/Master/texmf-dist/doc/generic/musixtex/musixdoc/musixdoc.sty
index 95b9c5a2915..d06328eb8eb 100644
--- a/Master/texmf-dist/doc/generic/musixtex/musixdoc/musixdoc.sty
+++ b/Master/texmf-dist/doc/generic/musixtex/musixdoc/musixdoc.sty
@@ -47,7 +47,7 @@
\usepackage{textcomp}
\input musixtex
-%\input musixvbm % experimental vectorized beams
+\input musixvbm % experimental vectorized beams
\input musixbm
\input musixcho
\input musixdat
diff --git a/Master/texmf-dist/scripts/musixtex/musixflx.bat b/Master/texmf-dist/scripts/musixtex/musixflx.bat
new file mode 100755
index 00000000000..684441ebb3d
--- /dev/null
+++ b/Master/texmf-dist/scripts/musixtex/musixflx.bat
@@ -0,0 +1,6 @@
+:: wrapper script to call musixflx.lua
+:: Usage: musixflx basename[.mx1 | .tex] [debug mode]
+:: Suggested by Tomasz Luczak (Tomek) t34www@googlemail.com
+
+@for /f "delims=" %%I in ('kpsewhich --format=texmfscripts %~n0.lua') do texlua "%%I" %*
+:end
diff --git a/Master/texmf-dist/scripts/musixtex/musixtex.bat b/Master/texmf-dist/scripts/musixtex/musixtex.bat
new file mode 100755
index 00000000000..249ae595c43
--- /dev/null
+++ b/Master/texmf-dist/scripts/musixtex/musixtex.bat
@@ -0,0 +1,6 @@
+:: wrapper script to call musixtex.lua
+:: Usage: musixtex [options] basename[.tex|.ltx|.mtx|.pmx|.aspc]
+:: Suggested by Tomasz Luczak (Tomek) t34www@googlemail.com
+
+@for /f "delims=" %%I in ('kpsewhich --format=texmfscripts %~n0.lua') do texlua "%%I" %*
+:end
diff --git a/Master/texmf-dist/tex/generic/musixtex/musixvbm.tex b/Master/texmf-dist/tex/generic/musixtex/musixvbm.tex
index 09fa03da422..a22a60e4c91 100644
--- a/Master/texmf-dist/tex/generic/musixtex/musixvbm.tex
+++ b/Master/texmf-dist/tex/generic/musixtex/musixvbm.tex
@@ -1,5 +1,5 @@
%%
-%% musixvbm.tex - MusiXTeX Extention, Vectorized Beams (& crescendos)
+%% musixvbm.tex - MusiXTeX Extension, Vectorized Beams (& crescendos)
%% by tpic specials / pdfTeX raw literal
%%
%% Copyright (C) 2000-2007 Hiroaki MORIMOTO (Kuuku)
@@ -31,7 +31,7 @@
%% This is a successor of `musixtpb.tex' ver.1.10.
%%
\ifx\ifvectorizedbeam\undefined\else\endinput\fi
-\immediate\write16{MusiXTeX Extention, Vectorized Beams and crescendos v1.20-beta6 <2007/01/01>}%
+\immediate\write16{MusiXTeX Extension, Vectorized Beams and crescendos v1.20-beta6 <2007/01/01>}%
%
\edef\catcodeat{\the\catcode`\@}\catcode`\@=11
%
@@ -87,13 +87,13 @@
\advance\y@iv \tw@\b@amthick
\@dimentomil{-\y@iv}{\@Yend@u}%
% \special{pn 1}%
- \special{sh 1}%
- \@addbeampath{0}{\@Ystart@l}%
+ \special{sh 1}% set beam shading to black
+ \@addbeampath{0}{\@Ystart@l}% add points to define the beam perimeter
\@addbeampath{\@Xend}{\@Yend@l}%
\@addbeampath{\@Xend}{\@Yend@u}%
\@addbeampath{0}{\@Ystart@u}%
- \@addbeampath{0}{\@Ystart@l}%
- \special{ip}%
+ \@addbeampath{0}{\@Ystart@l}% close the perimeter
+ \special{ip}% draw the beam (without the outline)
\kern\y@ii
}%
%