From 97eca13a92a0b8ad423b606c8970c9ce64d9b2bf Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Tue, 18 May 2021 03:01:12 +0000 Subject: CTAN sync 202105180301 --- macros/musixtex/README | 2 +- macros/musixtex/doc/musixdoc.pdf | Bin 1396006 -> 1395131 bytes macros/musixtex/doc/musixdoc/beams.tex | 4 +- macros/musixtex/doc/musixdoc/extensions.tex | 70 ++++++++++++++++----------- macros/musixtex/doc/musixdoc/frontmatter.tex | 2 +- macros/musixtex/doc/musixdoc/musixdoc.sty | 2 +- macros/musixtex/scripts/musixflx.bat | 6 +++ macros/musixtex/scripts/musixtex.bat | 6 +++ macros/musixtex/tex/musixvbm.tex | 12 ++--- macros/musixtex/windows/musixflx.bat | 6 --- macros/musixtex/windows/musixtex.bat | 6 --- 11 files changed, 64 insertions(+), 52 deletions(-) create mode 100644 macros/musixtex/scripts/musixflx.bat create mode 100644 macros/musixtex/scripts/musixtex.bat delete mode 100644 macros/musixtex/windows/musixflx.bat delete mode 100644 macros/musixtex/windows/musixtex.bat (limited to 'macros/musixtex') diff --git a/macros/musixtex/README b/macros/musixtex/README index 257051bce4..da1567d60d 100644 --- a/macros/musixtex/README +++ b/macros/musixtex/README @@ -1,4 +1,4 @@ -This is MusiXTeX, version 1.32 (2021-05-13). +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/macros/musixtex/doc/musixdoc.pdf b/macros/musixtex/doc/musixdoc.pdf index 8503c82411..ec5eac0642 100644 Binary files a/macros/musixtex/doc/musixdoc.pdf and b/macros/musixtex/doc/musixdoc.pdf differ diff --git a/macros/musixtex/doc/musixdoc/beams.tex b/macros/musixtex/doc/musixdoc/beams.tex index 6cf562a9c3..dbf57e2eb4 100644 --- a/macros/musixtex/doc/musixdoc/beams.tex +++ b/macros/musixtex/doc/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/macros/musixtex/doc/musixdoc/extensions.tex b/macros/musixtex/doc/musixdoc/extensions.tex index 5bf8dd667d..c31772897e 100644 --- a/macros/musixtex/doc/musixdoc/extensions.tex +++ b/macros/musixtex/doc/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/macros/musixtex/doc/musixdoc/frontmatter.tex b/macros/musixtex/doc/musixdoc/frontmatter.tex index e0d9515830..3eedf3665c 100644 --- a/macros/musixtex/doc/musixdoc/frontmatter.tex +++ b/macros/musixtex/doc/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/macros/musixtex/doc/musixdoc/musixdoc.sty b/macros/musixtex/doc/musixdoc/musixdoc.sty index 95b9c5a291..d06328eb8e 100644 --- a/macros/musixtex/doc/musixdoc/musixdoc.sty +++ b/macros/musixtex/doc/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/macros/musixtex/scripts/musixflx.bat b/macros/musixtex/scripts/musixflx.bat new file mode 100644 index 0000000000..684441ebb3 --- /dev/null +++ b/macros/musixtex/scripts/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/macros/musixtex/scripts/musixtex.bat b/macros/musixtex/scripts/musixtex.bat new file mode 100644 index 0000000000..249ae595c4 --- /dev/null +++ b/macros/musixtex/scripts/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/macros/musixtex/tex/musixvbm.tex b/macros/musixtex/tex/musixvbm.tex index 09fa03da42..a22a60e4c9 100644 --- a/macros/musixtex/tex/musixvbm.tex +++ b/macros/musixtex/tex/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 }% % diff --git a/macros/musixtex/windows/musixflx.bat b/macros/musixtex/windows/musixflx.bat deleted file mode 100644 index 684441ebb3..0000000000 --- a/macros/musixtex/windows/musixflx.bat +++ /dev/null @@ -1,6 +0,0 @@ -:: 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/macros/musixtex/windows/musixtex.bat b/macros/musixtex/windows/musixtex.bat deleted file mode 100644 index 249ae595c4..0000000000 --- a/macros/musixtex/windows/musixtex.bat +++ /dev/null @@ -1,6 +0,0 @@ -:: 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 -- cgit v1.2.3