diff options
Diffstat (limited to 'Master')
14 files changed, 361 insertions, 164 deletions
diff --git a/Master/texmf-dist/doc/generic/musixtex/ChangeLog-133.txt b/Master/texmf-dist/doc/generic/musixtex/ChangeLog-133.txt new file mode 100644 index 00000000000..e6e4a70cc92 --- /dev/null +++ b/Master/texmf-dist/doc/generic/musixtex/ChangeLog-133.txt @@ -0,0 +1,8 @@ + +Changes from MusiXTeX 132 to 133: + + * \tabfnt etc. now uses (Helvetica) bold for tablature notes + * replace ledger lines by slashes (/) for tablature notes below the staff + * new commands \tzqu, \tzcup, etc. for stems without noteheads, for use in + tablature + diff --git a/Master/texmf-dist/doc/generic/musixtex/README b/Master/texmf-dist/doc/generic/musixtex/README index da1567d60da..a9ae8ac381f 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.32a (2021-05-16). +This is MusiXTeX, version 1.33 (2021-07-04). 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 Binary files differindex ec5eac06421..d3410b5ddec 100644 --- a/Master/texmf-dist/doc/generic/musixtex/musixdoc.pdf +++ b/Master/texmf-dist/doc/generic/musixtex/musixdoc.pdf diff --git a/Master/texmf-dist/doc/generic/musixtex/musixdoc/examples.tex b/Master/texmf-dist/doc/generic/musixtex/musixdoc/examples.tex index d0aeb1e6cdb..6ca863122c1 100644 --- a/Master/texmf-dist/doc/generic/musixtex/musixdoc/examples.tex +++ b/Master/texmf-dist/doc/generic/musixtex/musixdoc/examples.tex @@ -79,14 +79,14 @@ to create staff-jumping doubly beamed notes. \end{itemize} -\section{Compiling \texttt{musixdoc.tex}} +\section{Compiling \texttt{musixdoc.ltx}} This manual is an excellent example of a primarily text document with embedded musical excerpts. For this reason, it is a \LaTeX\ document and must be compiled with \verb|latex| rather than \verb|etex|. Those wishing to combine text and musical excerpts should carefully study how it is done here. -Before compiling or recompiling \verb|musixdoc.tex|, you should remove all the auxiliary +Before compiling or recompiling \verb|musixdoc.ltx|, you should remove all the auxiliary files {\tt musixdoc.[mx1\|\allowbreak mx2\|\allowbreak aux\|\allowbreak toc\|\allowbreak ind\|\allowbreak idx\|\allowbreak ilg\|\allowbreak out]} if they are present. Then the following command sequence will produce \verb|musixdoc.ps|: \begin{quote}\begin{verbatim} @@ -101,16 +101,17 @@ dvips -e0 musixdoc The initial three steps \verb|latex|\allowbreak$\to$\allowbreak\verb|musixflx|\allowbreak$\to$\allowbreak\verb|latex| build up the basic appearance of the document including musical examples. The \verb|makeindex| step produces the database for the index. After that, \verb|latex| must be run at least twice to complete cross referencing. -Finally, \verb|dvips| converts the \verb|.dvi| file into \verb|.ps|. +Finally, \verb|dvips| converts the \verb|.dvi| file into \verb|.ps|; +the \texttt{-e0} option prevents \texttt{dvips} from making pixel adjustments +intended for letters in words. To produce \verb|musixdoc.pdf|, use \verb|ps2pdf| or the Distiller component of Adobe Acrobat, or open \verb|musixdoc.ps| in \texttt{GSview}, go to {\tt File\|Convert}, select \verb|pdfwrite| at 600 dpi resolution, and click \verb|OK|. -Or if you have the \verb|musixtex| script, just run -\begin{quote} -\verb|musixtex -l -x musixdoc| -\end{quote} -where the \verb|-l| option is to use \verb|latex| as the processing engine -and \verb|-x| is to create a new index database. + +Alternatively, if you have the \verb|musixtex| script, just run +\verb|musixtex -x musixdoc| +(where +the \verb|-x| option is only needed to create a new index database). %If you use an older version of \LaTeX\ which doesn't automatically %invoke $\varepsilon$\hbox{-}\nobreak\TeX, you will encounter the diff --git a/Master/texmf-dist/doc/generic/musixtex/musixdoc/extensions.tex b/Master/texmf-dist/doc/generic/musixtex/musixdoc/extensions.tex index c31772897eb..3871f732688 100644 --- a/Master/texmf-dist/doc/generic/musixtex/musixdoc/extensions.tex +++ b/Master/texmf-dist/doc/generic/musixtex/musixdoc/extensions.tex @@ -2179,14 +2179,15 @@ Available are: \section{musixvbm}\ixtt{musixvbm.tex} \label{musixvbm} 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 +unsightly minor discontinuities (gaps or bumps). The \texttt{musixvbm} add-on +by Hiroaki \textsc{Morimoto} produces smooth vectorized beams; simply input +\texttt{musixvbm} in the preamble of your score (after inputting \texttt{musixtex}). +For example, compare \medskip \begin{music} \let\extractline\hbox -\vectorizedbeamfalse +\vectorizedbeamfalse % disable vectorized beams \nostartrule \setclef1{\bass} \hbox to \hsize{% @@ -2197,7 +2198,7 @@ Compare \hss \raise20pt\hbox{ and } \hss -\vectorizedbeamtrue +\vectorizedbeamtrue % re-enable vectorized beams \startextract \nnotes\ibbl0G1\qb0{GJKLMLMLMLMLMLMK}\tqb0L\en \zendextract @@ -2206,8 +2207,10 @@ Compare \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. +on the right +shows the same beam with +\texttt{musixvbm} activated. +All the other beams in this report are vectorized. The only known disadvantage with use of \texttt{musixvbm} is that many \texttt{dvi} viewers @@ -2221,7 +2224,7 @@ output generated using \texttt{dvips} and \texttt{ps2pdf} (or using or by processing the score using \texttt{pdfetex}) should be satisfactory. If Postscript hairpins -as described in Section~\ref{PostscriptSlurs} are not being used, +(as described in Section~\ref{PostscriptSlurs}) are not being used, the \texttt{musixvbm} add-on also vectorizes crescendos and decrescendos. diff --git a/Master/texmf-dist/doc/generic/musixtex/musixdoc/frontmatter.tex b/Master/texmf-dist/doc/generic/musixtex/musixdoc/frontmatter.tex index 3eedf3665ca..bd14bf64bd8 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.32a} +instrumental music\\\Large\itshape Version 1.33} \author{} diff --git a/Master/texmf-dist/doc/generic/musixtex/musixdoc/introduction.tex b/Master/texmf-dist/doc/generic/musixtex/musixdoc/introduction.tex index e396c200f7b..cb6d87fb0fc 100644 --- a/Master/texmf-dist/doc/generic/musixtex/musixdoc/introduction.tex +++ b/Master/texmf-dist/doc/generic/musixtex/musixdoc/introduction.tex @@ -742,22 +742,21 @@ and \verb|etex| again. This will produce a \verb|.dvi| file. From this point forward, this file can be processed like the device-independent output file for any \TeX\ document. The most common approach and the only one to be discussed here is to next generate a Postscript file. This is accomplished -by running \verb|dvips|, which is included in every \TeX\ system. To view the +by running \verb|dvips|, which is included in every \TeX\ system; to prevent +inappropriate adjustments that \verb|dvips| makes by default, it is recommended to +add the option \verb|-e0|. To view the Postscript, most users run {\tt GSview} or {\tt gv}, a front-end to {\tt ghostscript}, which must be separately downloaded and installed. Finally, you may produce a PDF file using \verb|ps2pdf| or GSview, and view that with any PDF viewer, such as the Adobe Reader or {\tt GSview}. You also can view the \verb|.dvi| file directly using a DVI viewer such as Yap or \verb|xdvi|, -but, if you are using type K Postscript slurs, some DVI viewers will not display them. +but, if you are using type K Postscript slurs or vectorized beams, some DVI viewers will not display them. Rather than executing all the foregoing programs separately, most users will find it more convenient to use the \verb|musixtex| script that comes in most -distributions of \musixtex. For example, - -\verb|musixtex jobname| - -\noindent will run the three passes described in Section~\ref{threepass}, +distributions of \musixtex. For example, \verb|musixtex jobname| +will by default run the three passes described in Section~\ref{threepass}, convert the result to PDF and delete intermediate files. There are many options available to change the behavior; run diff --git a/Master/texmf-dist/doc/generic/musixtex/musixdoc/miscellaneous.tex b/Master/texmf-dist/doc/generic/musixtex/musixdoc/miscellaneous.tex index a9e8fad4bbf..3375bd121b5 100644 --- a/Master/texmf-dist/doc/generic/musixtex/musixdoc/miscellaneous.tex +++ b/Master/texmf-dist/doc/generic/musixtex/musixdoc/miscellaneous.tex @@ -844,7 +844,7 @@ are as follows: \item \keyindex{tab}\verb|{|$n$\verb|}|\verb|{|$p$\verb|}| puts $p$ on string $n$ (counting from top to bottom); $p$ is centered, using \verb|\ccharnote|. -Ledger lines are added for $n$ less than $1$ or greater than the current number of staff lines. +Ledger lines are replaced by slashes (/) for $n$ greater than the number of staff lines. \item \keyindex{ltab}\verb|{|$n$\verb|}|\verb|{|$p$\verb|}| uses \verb|\zcharnote| so $p$ spills to the right and @@ -858,7 +858,7 @@ is a non-spacing \verb|\ltab| and \keyindex{zrtab}\verb|{|$n$\verb|}|\verb|{|$p$\verb|}| is a non-spacing \verb|\rtab|. \end{itemize} -A size-dependent font \keyindex{tabfnt} is used for tab characters; Helvetica is the default font family. +A size-dependent font \keyindex{tabfnt} is used for tab characters; Helvetica bold is the default font family. The default tablature style is to place the fingering notations \emph{on} the staff line; Postscript specials are used to ``blank'' staff lines below @@ -868,7 +868,9 @@ the command \keyindex{tabstylespacetrue}. A size-dependent font \keyindex{tabstringfnt} is defined to allow string names to be listed using \verb|\setname|. -Here is an example of a guitar tablature (6th string lowered to D): +Here is an example +for baroque lute +(from \emph{Ciaccona} in D~minor by J.S.~Bach): \begin{music} \input musixps @@ -876,137 +878,225 @@ Here is an example of a guitar tablature (6th string lowered to D): \instrumentnumber{2} \songbottom1\songtop2 \generalmeter{\meterfrac34} -\generalsignature{-1} -\setlines16 -\setclefsymbol1\tabclef\setclefsymbol2\treblelowoct -\setsize1\largevalue -\setsign10 +\interinstrument=5\internote \nobarnumbers -\interinstrument=4\internote +\setlines16\setclefsymbol1\tabclef\setsize1{1.2}\setsign10 +\setsign2{-1}\setclefsymbol2\treblelowoct \parindent=2ex -\setname1{\tabstringfnt\baselineskip=1.5\internote% - \vbox{\hbox to\parindent{\hss E \hss}% - \hbox to\parindent{\hss B \hss}% - \hbox to\parindent{\hss G \hss}% - \hbox to\parindent{\hss D \hss}% - \hbox to\parindent{\hss A \hss}% - \hbox to\parindent{\hss D \hss}% -}} +\setname1{\tabstringfnt\baselineskip=1.2\internote% +\vbox{% +\hbox to\parindent{\hss F\hss}% +\hbox to\parindent{\hss D\hss}% +\hbox to\parindent{\hss A\hss}% +\hbox to\parindent{\hss F\hss}% +\hbox to\parindent{\hss D\hss}% +\hbox to\parindent{\hss A\hss}}} \startextract -\NOtesp\zltab55\zltab43\ltab32&\zh{d}\zhl{f}\qu{.h}\en -\Notes\ltab32&\cu{h}\en +\scale{0.88} +\NOtesp\zltab50\zltab40\ltab30&\zhl{d}\zhu{f}\qu{.h}\en +\Notes\ltab30&\cu{h}\en \bar% -\NOtes\zltab55\zltab45\zltab33\ltab10&\zq d\zql g\zq i\qu l\en -\NOtesp\zltab54\zltab45\zltab32\ltab10&\rhl{^c}\rhu{g}\zh{h}\qu{.l}\en -\Notes\ltab10&\cu{l}\en +\NOtes\zltab50\zltab42\zltab31\ltab22&\zql d\zqu g\zq i\qu l\en +\NOtesp\zltab64\zltab55\zltab30\ltab22&\rhl{^c}\rhu{g}\zh{h}\qu{.l}\en +\Notes\ltab22&\cu{l}\en \bar% -\NOtes\zltab40\zltab32\zltab23\ltab11&\zq d\zq h\zq k\qu{m}\en -\NOtes\zltab51\zltab43\zltab33\ltab23&\zhl b\zh f\zq{.i}\qu{.k}\en -\Notes\ltab35&\cu j\en +\NOtes\zltab50\zltab40\zltab30\ltab10&\zql d\zq f\zq h\qu{m}\en +\NOtes\zltab61\zltab40\ltab20&\zhl b\zh f\qu{.k}\en +\Notes\ltab33&\cu j\en \bar% -\NOtes\zltab65\zltab45\ltab33&\zql N\zq g\qu i\en -\NOtes\zltab50\zltab43\ltab32&\zql a\zq f\qu h\en -\notes\zltab54\ltab45\ilsluru04\ltab43\ltab42\tlslur04\ltab43% -&\zql{^c}\ibbu0g{-1}\qb0{g}\slur eed2\qb0{fe}\tqu0f\en +\NOtes\zltab70\zltab55\ltab45&\zql N\zq g\qu i\en +\NOtes\zltab60\zltab53\ltab44&\zql a\zq f\qu h\en +\notes\zltab64\ltab42\ilsluru03\ltab53\ltab52\tlslur03\ltab53% +&\zql{^c}\ibbu0g{-1}\qb0g\slur eed2\qb0{fe}\tqu0f\en +\bar% +\notes\ztab{10}0\ltab42\ilsluru03\ltab52\ltab53\tlslur03\ltab50% +&\zql K\ibbu0g{-1}\qb0g\slur edd2\qb0e\qb0f\tqu0d\en +\NOtesp\zltab50\zltab40\ltab30&\zhl{d}\zhu{f}\qu{.h}\en +\Notes\ltab30&\cu{h}\en \bar% -\notes\zltab60\zltab50\ltab45\ilsluru04\ltab42\ltab43\tlslur04\ltab40% -&\zq K\zql a\ibbu0g{-1}\qb0g\slur edd2\qb0e\qb0f\tqu0d\en -\znotes&\lcn{14}{J.S. Bach}\en \zendextract \end{music} - \noindent The coding is \begin{footnotesize} \begin{quote}\begin{verbatim} \instrumentnumber{2} \songbottom1\songtop2 -\setclefsymbol2\treblelowoct \generalmeter{\meterfrac34} -\generalsignature{-1} -\setlines16\setclefsymbol1\tabclef\setsize1\largevalue\setsign10 -\nobarnumbers \interinstrument=4\internote +\nobarnumbers +\setlines16\setclefsymbol1\tabclef\setsize1{1.2}\setsign10 +\setsign2{-1}\setclefsymbol2\treblelowoct \parindent=2ex -\setname1{\tabstringfnt\baselineskip=1.5\internote% - \vbox{\hbox to\parindent{\hss E\hss}% - \hbox to\parindent{\hss B\hss}% - \hbox to\parindent{\hss G\hss}% - \hbox to\parindent{\hss D\hss}% - \hbox to\parindent{\hss A\hss}% - \hbox to\parindent{\hss D\hss}}} +\setname1{\tabstringfnt\baselineskip=1.2\internote% +\vbox{% +\hbox to\parindent{\hss F\hss}% +\hbox to\parindent{\hss D\hss}% +\hbox to\parindent{\hss A\hss}% +\hbox to\parindent{\hss F\hss}% +\hbox to\parindent{\hss D\hss}% +\hbox to\parindent{\hss A\hss}}} \startextract -\NOtesp\zltab55\zltab43\ltab32&\zh{d}\zhl{f}\qu{.h}\en -\Notes\ltab32&\cu{h}\en +\NOtesp\zltab50\zltab40\ltab30&\zhl{d}\zhu{f}\qu{.h}\en +\Notes\ltab30&\cu{h}\en \bar% -\NOtes\zltab55\zltab45\zltab33\ltab10&\zq d\zql g\zq i\qu l\en -\NOtesp\zltab54\zltab45\zltab32\ltab10&\rhl{^c}\rhu{g}\zh{h}\qu{.l}\en -\Notes\ltab10&\cu{l}\en +\NOtes\zltab50\zltab42\zltab31\ltab22&\zql d\zqu g\zq i\qu l\en +\NOtesp\zltab64\zltab55\zltab30\ltab22&\rhl{^c}\rhu{g}\zh{h}\qu{.l}\en +\Notes\ltab22&\cu{l}\en \bar% -\NOtes\zltab40\zltab32\zltab23\ltab11&\zq d\zq h\zq k\qu{m}\en -\NOtes\zltab51\zltab43\zltab33\ltab23&\zhl b\zh f\zq{.i}\qu{.k}\en -\Notes\ltab35&\cu j\en +\NOtes\zltab50\zltab40\zltab30\ltab10&\zql d\zq f\zq h\qu{m}\en +\NOtes\zltab61\zltab40\ltab20&\zhl b\zh f\qu{.k}\en +\Notes\ltab33&\cu j\en \bar% -\NOtes\zltab65\zltab45\ltab33&\zql N\zq g\qu i\en -\NOtes\zltab50\zltab43\ltab32&\zql a\zq f\qu h\en -\notes\zltab54\ltab45\ilsluru04\ltab43\ltab42\tlslur04\ltab43% -&\zql{^c}\ibbu0g{-1}\qb0{g}\slur eed2\qb0{fe}\tqu0f\en +\NOtes\zltab70\zltab55\ltab45&\zql N\zq g\qu i\en +\NOtes\zltab60\zltab53\ltab44&\zql a\zq f\qu h\en +\notes\zltab64\ltab42\ilsluru03\ltab53\ltab52\tlslur03\ltab53% +&\zql{^c}\ibbu0g{-1}\qb0g\slur eed2\qb0{fe}\tqu0f\en +\bar% +\notes\ztab{10}0\ltab42\ilsluru03\ltab52\ltab53\tlslur03\ltab50% +&\zql K\ibbu0g{-1}\qb0g\slur edd2\qb0e\qb0f\tqu0d\en +\NOtesp\zltab50\zltab40\ltab30&\zhl{d}\zhu{f}\qu{.h}\en +\Notes\ltab30&\cu{h}\en \bar% -\notes\zltab60\zltab50\ltab45\ilsluru04\ltab42\ltab43\tlslur04\ltab40% -&\zq K\zql a\ibbu0g{-1}\qb0g\slur edd2\qb0e\qb0f\tqu0d\en -\znotes&\lcn{14}{J.S. Bach}\en \zendextract \end{verbatim}\end{quote} \end{footnotesize} \clearpage +\par\noindent Here is the same example with \verb|\tabstylespacetrue|: \begin{music} \input musixps \def\psslurhgt{0.5} +\tabstylespacetrue \instrumentnumber{2} \songbottom1\songtop2 \generalmeter{\meterfrac34} +\interinstrument=4\internote +\nobarnumbers +\setlines16\setclefsymbol1\tabclef\setsize1{1.2}\setsign10 +\setsign2{-1}\setclefsymbol2\treblelowoct +\parindent=2ex +\setname1{\tabstringfnt\baselineskip=1.2\internote% +\vbox{% +\hbox to\parindent{\hss F\hss}% +\hbox to\parindent{\hss D\hss}% +\hbox to\parindent{\hss A\hss}% +\hbox to\parindent{\hss F\hss}% +\hbox to\parindent{\hss D\hss}% +\hbox to\parindent{\hss A\hss}}} +\startextract +\scale{0.88} +\NOtesp\zltab50\zltab40\ltab30&\zhl{d}\zhu{f}\qu{.h}\en +\Notes\ltab30&\cu{h}\en +\bar% +\NOtes\zltab50\zltab42\zltab31\ltab22&\zql d\zqu g\zq i\qu l\en +\NOtesp\zltab64\zltab55\zltab30\ltab22&\rhl{^c}\rhu{g}\zh{h}\qu{.l}\en +\Notes\ltab22&\cu{l}\en +\bar% +\NOtes\zltab50\zltab40\zltab30\ltab10&\zql d\zq f\zq h\qu{m}\en +\NOtes\zltab61\zltab40\ltab20&\zhl b\zh f\qu{.k}\en +\Notes\ltab33&\cu j\en +\bar% +\NOtes\zltab70\zltab55\ltab45&\zql N\zq g\qu i\en +\NOtes\zltab60\zltab53\ltab44&\zql a\zq f\qu h\en +\notes\zltab64\ltab42\ilsluru03\ltab53\ltab52\tlslur03\ltab53% +&\zql{^c}\ibbu0g{-1}\qb0g\slur eed2\qb0{fe}\tqu0f\en +\bar% +\notes\ztab{10}0\ltab42\ilsluru03\ltab52\ltab53\tlslur03\ltab50% +&\zql K\ibbu0g{-1}\qb0g\slur edd2\qb0e\qb0f\tqu0d\en +\NOtesp\zltab50\zltab40\ltab30&\zhl{d}\zhu{f}\qu{.h}\en +\Notes\ltab30&\cu{h}\en +\bar% +\zendextract +\end{music} +\medskip + +\noindent +In pure tablature, note durations are typically specified by stems without noteheads immediately +above the staff, as in: +\medskip + +\begin{music} +\input musixps +\def\psslurhgt{0.5} +\instrumentnumber{1} +\generalmeter{\meterfrac34} \generalsignature{-1} -\setlines16 -\setclefsymbol1\tabclef\setclefsymbol2\treblelowoct -\tabstylespacetrue -\setsize1\largevalue -\setsign10 +\setlines16\setclefsymbol1\tabclef\setsize1{1.2}\setsign10 \nobarnumbers -\interinstrument=4\internote \parindent=2ex -\setname1{\tabstringfnt\baselineskip=1.5\internote% - \vbox{\hbox to\parindent{\hss E \hss}% - \hbox to\parindent{\hss B \hss}% - \hbox to\parindent{\hss G \hss}% - \hbox to\parindent{\hss D \hss}% - \hbox to\parindent{\hss A \hss}% - \hbox to\parindent{\hss D \hss}% -}} +\setname1{\tabstringfnt\baselineskip=1.2\internote% +\vbox{\hbox to\parindent{\hss F\hss}% +\hbox to\parindent{\hss D\hss}% +\hbox to\parindent{\hss A\hss}% +\hbox to\parindent{\hss F\hss}% +\hbox to\parindent{\hss D\hss}% +\hbox to\parindent{\hss A\hss}}} +\nostartrule \startextract -\NOtesp\zltab55\zltab43\ltab32&\zh{d}\zhl{f}\qu{.h}\en -\Notes\ltab32&\cu{h}\en +\scale{0.88} +\NOtesp\zltab50\zltab40\tzqup\ltab30\en +\Notes\tzcu\ltab30\en \bar% -\NOtes\zltab55\zltab45\zltab33\ltab10&\zq d\zql g\zq i\qu l\en -\NOtesp\zltab54\zltab45\zltab32\ltab10&\rhl{^c}\rhu{g}\zh{h}\qu{.l}\en -\Notes\ltab10&\cu{l}\en +\NOtes\zltab50\zltab42\zltab31\tzqu\ltab22\en +\NOtesp\zltab64\zltab35\zltab30\tzqup\ltab22\en +\Notes\tzcu\ltab22\en \bar% -\NOtes\zltab40\zltab32\zltab23\ltab11&\zq d\zq h\zq k\qu{m}\en -\NOtes\zltab51\zltab43\zltab33\ltab23&\zhl b\zh f\zq{.i}\qu{.k}\en -\Notes\ltab35&\cu j\en +\NOtes\zltab50\zltab30\zltab20\tzqu\ltab10\en +\NOtes\zltab61\zltab40\tzqup\ltab20\en +\Notes\tzcu\ltab33\en \bar% -\NOtes\zltab65\zltab45\ltab33&\zql N\zq g\qu i\en -\NOtes\zltab50\zltab43\ltab32&\zql a\zq f\qu h\en -\notes\zltab54\ltab45\ilsluru05\ltab43\ltab42\tlslur05\ltab43% -&\zql{^c}\ibbu0g{-1}\qb0{g}\slur eed2\qb0{fe}\tqu0f\en +\NOtes\zltab70\zltab55\tzqu\ltab45\en +\NOtes\zltab60\zltab53\ltab44\en +\notes\zltab64\tzccu\ltab42\ilsluru03\ltab53\ltab52\tlslur03\ltab53\en +\bar% +\notes\ztab{10}0\tzccu\ltab42\ilsluru03\ltab52\ltab53\tlslur03\ltab50\en +\NOtesp\zltab50\zltab40\tzqup\ltab30\en +\Notes\tzcu\ltab30\en \bar% -\notes\zltab60\zltab50\ltab45\ilsluru05\ltab42\ltab43\tlslur05\ltab40% -&\zq K\zql a\ibbu0g{-1}\qb0g\slur edd2\qb0e\qb0f\tqu0d\en -\znotes&\lcn{14}{J.S. Bach}\en \zendextract \end{music} +\medskip +\noindent +Note that this notation does not +specify the duration of \emph{every} note. + +\smallskip + +A stem (without a notehead) is generated immediately above the staff using one of the commands +\keyindex{tzqu}, \keyindex{tzqup}, \keyindex{tzcu}, \keyindex{tzcup}, \keyindex{tzccu}, \ldots\ +\emph{before} a spacing command. Coding +for the notes in the example above is as follows: +\begin{footnotesize} +\begin{quote}\begin{verbatim} +\startextract +\scale{0.88} +\NOtesp\zltab50\zltab40\tzqup\ltab30\en +\Notes\tzcu\ltab30\en +\bar% +\NOtes\zltab50\zltab42\zltab31\tzqu\ltab22\en +\NOtesp\zltab64\zltab35\zltab30\tzqup\ltab22\en +\Notes\tzcu\ltab22\en +\bar% +\NOtes\zltab50\zltab30\zltab20\tzqu\ltab10\en +\NOtes\zltab61\zltab40\tzqup\ltab20\en +\Notes\tzcu\ltab33\en +\bar% +\NOtes\zltab70\zltab55\tzqu\ltab45\en +\NOtes\zltab60\zltab53\ltab44\en +\notes\zltab64\tzccu\ltab42\ilsluru03\ltab53\ltab52\tlslur03\ltab53\en +\bar% +\notes\ztab{10}0\tzccu\ltab42\ilsluru03\ltab52\ltab53\tlslur03\ltab50\en +\NOtesp\zltab50\zltab40\tzqup\ltab30\en +\Notes\tzcu\ltab30\en +\bar% +\zendextract +\end{verbatim}\end{quote} +\end{footnotesize} + +\medskip Tablature support in \musixtex\ has been adapted from \verb|tabdefs.tex| by R.J.~Gelten, which is available \href{http://icking-music-archive.org/software/musixtex/add-ons/tabdefs.tex} diff --git a/Master/texmf-dist/doc/generic/musixtex/musixdoc/musixdoc.sty b/Master/texmf-dist/doc/generic/musixtex/musixdoc/musixdoc.sty index d06328eb8eb..d07d8ddcd4d 100644 --- a/Master/texmf-dist/doc/generic/musixtex/musixdoc/musixdoc.sty +++ b/Master/texmf-dist/doc/generic/musixtex/musixdoc/musixdoc.sty @@ -22,7 +22,7 @@ \pagestyle{headings} \usepackage{makeidx} \usepackage{multicol} -\usepackage{etex} +%\usepackage{etex} \usepackage{amssymb} diff --git a/Master/texmf-dist/doc/generic/musixtex/scripts/musixtex.pdf b/Master/texmf-dist/doc/generic/musixtex/scripts/musixtex.pdf Binary files differindex 30246ff59f9..8df9e182dca 100644 --- a/Master/texmf-dist/doc/generic/musixtex/scripts/musixtex.pdf +++ b/Master/texmf-dist/doc/generic/musixtex/scripts/musixtex.pdf diff --git a/Master/texmf-dist/doc/man/man1/musixtex.man1.pdf b/Master/texmf-dist/doc/man/man1/musixtex.man1.pdf Binary files differindex bb00b6cb5b0..0a404da18c0 100644 --- a/Master/texmf-dist/doc/man/man1/musixtex.man1.pdf +++ b/Master/texmf-dist/doc/man/man1/musixtex.man1.pdf diff --git a/Master/texmf-dist/scripts/musixtex/musixtex.lua b/Master/texmf-dist/scripts/musixtex/musixtex.lua index 930e90d70fe..b568bb89030 100755 --- a/Master/texmf-dist/scripts/musixtex/musixtex.lua +++ b/Master/texmf-dist/scripts/musixtex/musixtex.lua @@ -1,12 +1,12 @@ #!/usr/bin/env texlua -VERSION = "0.23a" +VERSION = "0.23b" --[[ musixtex.lua: processes MusiXTeX files using xml2pmx and/or prepmx and/or pmxab and/or autosp as pre-processors (and deletes intermediate files) - (c) Copyright 2011-2020 Bob Tennent rdt@cs.queensu.ca + (c) Copyright 2011-2021 Bob Tennent rdt@cs.queensu.ca and Dirk Laurie dirk.laurie@gmail.com This program is free software; you can redistribute it and/or modify it @@ -29,6 +29,9 @@ VERSION = "0.23a" ChangeLog: + version 0.23b 2020-05-27 RDT + improve the -h output + version 0.23a 2020-08-14 RDT pmxprep files now deleted by xml2pmx @@ -138,15 +141,22 @@ function usage() orig_print [[ Usage: [texlua] musixtex.lua { option | basename[ .xml | .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 xml-pmx-tex or mtx-pmx-tex or - aspc-tex, 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. The default 3-pass processing route - for .tex files is etex-musixflx-etex. + When no extension is given, extensions are tried in the above order + until a source file is found. Preprocessing goes + .xml - .pmx - .tex + .mtx - .pmx - .tex + .pmx - .tex + .aspc - .tex + with the entry point determined by the filename extension. + The normal route after preprocessing goes .tex - .dvi - .ps - .pdf, + but shorter routes are also available; see the options. + The default 3-pass processing route for .tex files is + etex - musixflx - etex. + .ltx files, possibly after autosp preprocessing, are treated as latex + source and processed by latex (or pdflatex) rather than etex. Options: -v, --version version -h, --help help - -l latex source + -l latex source; implied by .ltx extension -p direct tex-pdf (pdftex etc) -F fmt use fmt as the TeX processor -d tex-dvi-pdf (using dvipdfm if -D not used) @@ -212,7 +222,11 @@ end -- possible by exploiting the the fact that Lua has two false values. -- dvi == nil "do not produce a DVI file" (but maybe PDF) -- dvi == false "do not process the DVI file" (but stop after TeX) -local dvips = "dvips -e0" + +local dvips = "dvips -e0" +-- option -e0 suppresses dvips "feature" of adjusting location to align +-- characters in words of text + function defaults() xml2pmx = "xml2pmx" prepmx = "prepmx" diff --git a/Master/texmf-dist/tex/generic/musixtex/musixtex.tex b/Master/texmf-dist/tex/generic/musixtex/musixtex.tex index 9cf493ca184..a105d6dfb65 100644 --- a/Master/texmf-dist/tex/generic/musixtex/musixtex.tex +++ b/Master/texmf-dist/tex/generic/musixtex/musixtex.tex @@ -25,15 +25,21 @@ \def\mufl@x{0.83}% \def\mxmajorvernumber{1} -\def\mxminorvernumber{32} +\def\mxminorvernumber{33} \def\mxvernumber{\mxmajorvernumber\mxminorvernumber}% make it possible to compare with \ifnum \def\mxversuffix{}% \edef\mxversion{\mxmajorvernumber.\mxminorvernumber\mxversuffix} -\def\mxdate{2021-05-13} +\def\mxdate{2021-07-04} \immediate\write16{MusiXTeX(c) \mxversion\space<\mxdate>}% \everyjob{\immediate\write16{MusiXTeX(c) \mxversion\space<\mxdate>}}% +% version 1.33 +% +% \tabfnt etc. now uses (Helvetica) bold +% replace ledger lines by slashes (/) for tablature notes below the staff +% new commands \tzqu, \tzcup, etc. for stems without noteheads, for use in tablature + % version 1.32 % commented out spurious \let\doublebar\doublebar@II @@ -645,14 +651,12 @@ \def\fontid{cm} % deprecated but used in pmx.tex %% -% Small sans serif fonts % version 1.29 RDT +% Small bold sans serif fonts % version 1.33 RDT %% -\font\threess=phvr8t at 3pt -\font\fourss=phvr8t at 4pt -\font\fivess=phvr8t at 5pt +\font\threedc=phvb8t at 3pt +\font\fourdc=phvb8t at 4pt \font\fivedc=phvb8t at 5pt -\font\sixss=phvr8t at 6pt \font\sixdc=phvb8t at 6pt %% @@ -690,6 +694,7 @@ \font\ninebi=cmbxti10 at 9pt % version 1.22 RDT \font\ninesc=cmcsc10 at 9pt \font\niness=phvr8t at 9pt % version 1.29 RDT +\font\ninedc=phvb8t at 9pt %% % Ten point fonts @@ -712,6 +717,7 @@ \font\elevenbi=cmbxti10 at 11pt % version 1.22 RDT \font\elevensc=cmcsc10 at 11pt \font\elevenss=phvr8t at 11pt % version 1.29 RDT +\font\elevendc=phvb8t at 11pt %% % Twelve point fonts @@ -1757,8 +1763,8 @@ \else\ifdim\internote<1.19\Internote \smalltype\it \else\ifdim\internote<1.43\Internote \Smalltype\it \else\normtype\it\fi\fi\fi}% - \let\tabnorfnt\fivess \let\tablargefnt\sixss - \let\tabLargefnt\eightss \let\tabsmallfnt\fourss + \let\tabnorfnt\fivedc \let\tablargefnt\sixdc % 1.33 RDT + \let\tabLargefnt\eightdc \let\tabsmallfnt\fourdc \let\tabnorcleffnt\eightdc \let\tablargecleffnt\tendc \let\tabLargecleffnt\twelvedc \let\tabsmallcleffnt\sixdc \def\tabstringfnt{\ifdim\internote<.95\Internote \fourss % 1.29 RDT @@ -1789,8 +1795,8 @@ \else\ifdim\internote<1.19\Internote \Smalltype\it \else\ifdim\internote<1.43\Internote \normtype\it \else\medtype\it\fi\fi\fi}% - \let\tabnorfnt\eightss \let\tablargefnt\niness - \let\tabLargefnt\elevenss \let\tabsmallfnt\sixss + \let\tabnorfnt\eightdc \let\tablargefnt\ninedc % 1.33 RDT + \let\tabLargefnt\elevendc \let\tabsmallfnt\sixdc \let\tabnorcleffnt\twelvedc \let\tablargecleffnt\frtdc \let\tabLargecleffnt\svtdc \let\tabsmallcleffnt\tendc \def\tabstringfnt{\ifdim\internote<.95\Internote \sixss % 1.29 RDT @@ -1823,8 +1829,8 @@ \else\ifdim\internote<1.19\Internote \medtype\it \else\ifdim\internote<1.43\Internote \bigfont\it \else\Bigfont\it\fi\fi\fi}% - \let\tabnorfnt\niness \let\tablargefnt\elevenss - \let\tabLargefnt\twelvess \let\tabsmallfnt\eightss + \let\tabnorfnt\ninedc \let\tablargefnt\elevendc % 1.33 RDT + \let\tabLargefnt\twelvedc \let\tabsmallfnt\eightdc \let\tabnorcleffnt\frtdc \let\tablargecleffnt\svtdc \let\tabLargecleffnt\twtydc \let\tabsmallcleffnt\twelvedc \def\tabstringfnt{\ifdim\internote<.95\Internote \eightss % 1.29 RDT @@ -1861,8 +1867,8 @@ \else\ifdim\internote<1.19\Internote \Smalltype\it \else\ifdim\internote<1.43\Internote \normtype\it \else\medtype\it\fi\fi\fi}% - \let\tabnorfnt\sixss \let\tablargefnt\eightss - \let\tabLargefnt\niness \let\tabsmallfnt\fivess + \let\tabnorfnt\sixdc \let\tablargefnt\eightdc % 1.33 RDT + \let\tabLargefnt\ninedc \let\tabsmallfnt\fivedc \let\tabnorcleffnt\tendc \let\tablargecleffnt\twelvedc \let\tabLargecleffnt\frtdc \let\tabsmallcleffnt\eightdc \def\tabstringfnt{\ifdim\internote<.95\Internote \fivess % 1.29 RDT @@ -5477,13 +5483,17 @@ -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% Macros for tablature. They put numbers on or above the staff lines.% -% Based on tabdefs.tex by R.J. Gelten % -% version 1.29 RDT -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% Macros for tablature. They put numbers on or above the staff lines. % +% Based on tabdefs.tex by R.J. Gelten % +% % +% 1.33 RDT % +% replace ledger lines by slashes (/) for string numbers > number of staff lines % +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\newcount\stringraise \newif\iftabstylespace\tabstylespacefalse + % \tabbox ensures a white background for the tab number in the ps-file % so the stafflines don't overwrite the number. Symbols are centered. \def\tabbox#1#2{% @@ -5525,36 +5535,75 @@ \lcharnote{\the\stringraise}{\box0}% } +\newcount\stringnum +\newcount\nslashes + % \tab takes two arguments. % #1 is the string number % #2 is the symbol to be put on the string % the symbols are horizontally centered and a \sk is put behind it, -% to jump to the position of the next symbol -\newcount\stringraise +% to jump to the position of the next symbol. +% if the string number > \nblines, ledger lines are replaced by slashes (/) \def\tab#1#2{% - \tabbox{#1}{#2}\sk% -} +\stringnum=#1 +\ifnum\stringnum>\nblines +\nslashes=\stringnum +\advance\nslashes by -\nblines +\def\numslashes{\the\nslashes} +\ifcase\numslashes\or\ccn{-3}{\tabfnt/#2}\or\ccn{-3}{\tabfnt//#2}\or\ccn{-3}{\tabfnt///#2}\or\ccn{-3}{\tabfnt////#2}\ccn{-3}{\tabfnt/////#2}\or\ccn{-3}{\tabfnt//////#2}\or\ccn{-3}{\tabfnt///////#2}\fi% +\else\tabbox{#1}{#2}\fi\sk} + % left spilling \tab \def\ltab#1#2{% - \ltabbox{#1}{#2}\sk% -} +\stringnum=#1 +\ifnum\stringnum>\nblines +\nslashes=\stringnum +\advance\nslashes by -\nblines +\def\numslashes{\the\nslashes} +\ifcase\numslashes\or\zcn{-3}{\tabfnt/#2}\or\zcn{-3}{\tabfnt//#2}\or\zcn{-3}{\tabfnt///#2}\or\zcn{-3}{\tabfnt////#2}\or\zcn{-3}{\tabfnt/////#2}\or\zcn{-3}{\tabfnt//////#2}\or\zcn{-3}{\tabfnt///////#2}\fi% +\else\ltabbox{#1}{#2}\fi\sk} + % right spilling \tab \def\rtab#1#2{% - \rtabbox{#1}{#2}\sk% -} +\stringnum=#1 +\ifnum\stringnum>\nblines +\nslashes=\stringnum +\advance\nslashes by -\nblines +\def\numslashes{\the\nslashes} +\ifcase\numslashes\or\lcn{-3}{\tabfnt/#2}\or\lcn{-3}{\tabfnt//#2}\or\lcn{-3}{\tabfnt///#2}\or\lcn{-3}{\tabfnt////#2}\or\lcn{-3}{\tabfnt/////#2}\or\lcn{-3}{\tabfnt//////#2}\or\lcn{-3}{\tabfnt///////#2}\fi% +\else\rtabbox{#1}{#2}\fi\sk} + % \chord-tab symbol. Same as \tab, but no \sk is given, so multiple % symbols can be placed above one another \def\ztab#1#2{% - \tabbox{#1}{#2}% -} +\stringnum=#1 +\ifnum\stringnum>\nblines +\nslashes=\stringnum +\advance\nslashes by -\nblines +\def\numslashes{\the\nslashes} +\ifcase\numslashes\or\ccn{-3}{\tabfnt/#2}\or\ccn{-3}{\tabfnt//#2}\or\ccn{-3}{\tabfnt///#2}\or\ccn{-3}{\tabfnt////#2}\or\ccn{-3}{\tabfnt/////#2}\or\ccn{-3}{\tabfnt//////#2}\or\ccn{-3}{\tabfnt///////#2}\fi% +\else\tabbox{#1}{#2}\fi} + % left spilling \ztab \def\zltab#1#2{% - \ltabbox{#1}{#2}% -} +\stringnum=#1 +\ifnum\stringnum>\nblines +\nslashes=\stringnum +\advance\nslashes by -\nblines +\def\numslashes{\the\nslashes} +\ifcase\numslashes\or\zcn{-3}{\tabfnt/#2}\or\zcn{-3}{\tabfnt//#2}\or\zcn{-3}{\tabfnt///#2}\or\zcn{-3}{\tabfnt////#2}\or\zcn{-3}{\tabfnt/////#2}\or\zcn{-3}{\tabfnt//////#2}\or\zcn{-3}{\tabfnt///////#2}\fi% +\else\ltabbox{#1}{#2}\fi} + % right spilling \ztab \def\zrtab#1#2{% - \rtabbox{#1}{#2}% -} +\stringnum=#1 +\ifnum\stringnum>\nblines +\nslashes=\stringnum +\advance\nslashes by -\nblines +\def\numslashes{\the\nslashes} +\ifcase\numslashes\or\lcn{-3}{\tabfnt/#2}\or\lcn{-3}{\tabfnt//#2}\or\lcn{-3}{\tabfnt///#2}\or\lcn{-3}{\tabfnt////#2}\or\lcn{-3}{\tabfnt/////#2}\or\lcn{-3}{\tabfnt//////#2}\or\lcn{-3}{\tabfnt///////#2}\fi% +\else\rtabbox{#1}{#2}\fi} + % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -5572,6 +5621,38 @@ \ifnum\nblines=6\lower1.5\internote\box1 \else\ifnum\nblines=4\lower3.5\internote\box1\else\lower2.5\internote\box1\fi\fi} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% stems without noteheads for use above tablature staff % +% 1.33 RDT % +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +\newcount\stem@hgt % = 2 * \nblines -1 +\def\tzqu{\advancefalse% +\stem@hgt=\nblines\multiply\stem@hgt by 2\advance\stem@hgt by -1 +\def\q@u{}\@qu{\the\stem@hgt}} +\def\tzqup{\advancefalse% +\stem@hgt=\nblines\multiply\stem@hgt by 2\advance\stem@hgt by -1 +\def\q@u{}\@qup{\the\stem@hgt}} +\def\tzcu{\advancefalse% +\stem@hgt=\nblines\multiply\stem@hgt by 2\advance\stem@hgt by -1 +\def\q@u{}\@cu{\the\stem@hgt}} +\def\tzcup{\advancefalse% +\stem@hgt=\nblines\multiply\stem@hgt by 2\advance\stem@hgt by -1 +\def\q@u{}\@cup{\the\stem@hgt}} +\def\tzccu{\advancefalse% +\stem@hgt=\nblines\multiply\stem@hgt by 2\advance\stem@hgt by -1 +\def\q@u{}\@ccu{\the\stem@hgt}} +\def\tzccup{\advancefalse% +\stem@hgt=\nblines\multiply\stem@hgt by 2\advance\stem@hgt by -1 +\def\q@u{}\@ccup{\the\stem@hgt}} +\def\tzcccu{\advancefalse% +\stem@hgt=\nblines\multiply\stem@hgt by 2\advance\stem@hgt by -1 +\def\q@u{}\@cccu{\the\stem@hgt}} +\def\tzcccup{\advancefalse% +\stem@hgt=\nblines\multiply\stem@hgt by 2\advance\stem@hgt by -1 +\def\q@u{}\@cccup{\the\stem@hgt}} + + \let\origin@lwrit@staffs\writ@staffs \def\writ@staffs{% diff --git a/Master/texmf-dist/tex/generic/musixtex/musixvbm.tex b/Master/texmf-dist/tex/generic/musixtex/musixvbm.tex index a22a60e4c91..9a2898c9357 100644 --- a/Master/texmf-dist/tex/generic/musixtex/musixvbm.tex +++ b/Master/texmf-dist/tex/generic/musixtex/musixvbm.tex @@ -3,6 +3,7 @@ %% by tpic specials / pdfTeX raw literal %% %% Copyright (C) 2000-2007 Hiroaki MORIMOTO (Kuuku) +%% 2021-05-17: RDT added comments on the tpic \specials %% %% This program is free software; you can redistribute it and/or %% modify it under the terms of the GNU General Public License @@ -31,7 +32,7 @@ %% This is a successor of `musixtpb.tex' ver.1.10. %% \ifx\ifvectorizedbeam\undefined\else\endinput\fi -\immediate\write16{MusiXTeX Extension, Vectorized Beams and crescendos v1.20-beta6 <2007/01/01>}% +\immediate\write16{MusiXTeX Extension, Vectorized Beams and crescendos <2007/01/01>}% % \edef\catcodeat{\the\catcode`\@}\catcode`\@=11 % @@ -87,13 +88,13 @@ \advance\y@iv \tw@\b@amthick \@dimentomil{-\y@iv}{\@Yend@u}% % \special{pn 1}% - \special{sh 1}% set beam shading to black - \@addbeampath{0}{\@Ystart@l}% add points to define the beam perimeter + \special{sh 1}% RDT: set beam shading to black + \@addbeampath{0}{\@Ystart@l}% RDT: add points to define the beam perimeter \@addbeampath{\@Xend}{\@Yend@l}% \@addbeampath{\@Xend}{\@Yend@u}% \@addbeampath{0}{\@Ystart@u}% - \@addbeampath{0}{\@Ystart@l}% close the perimeter - \special{ip}% draw the beam (without the outline) + \@addbeampath{0}{\@Ystart@l}% RDT: close the perimeter + \special{ip}% RDT: draw the beam (without the outline) \kern\y@ii }% % |