summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/musixtex/musixtex.lua20
-rw-r--r--Master/texmf-dist/doc/generic/musixtex/ChangeLog-130.txt5
-rw-r--r--Master/texmf-dist/doc/generic/musixtex/README2
-rw-r--r--Master/texmf-dist/doc/generic/musixtex/musixdoc.pdfbin1332076 -> 1373998 bytes
-rw-r--r--Master/texmf-dist/doc/generic/musixtex/musixdoc/barlines.tex2
-rw-r--r--Master/texmf-dist/doc/generic/musixtex/musixdoc/beams.tex4
-rw-r--r--Master/texmf-dist/doc/generic/musixtex/musixdoc/frontmatter.tex4
-rw-r--r--Master/texmf-dist/doc/generic/musixtex/musixdoc/layout.tex5
-rw-r--r--Master/texmf-dist/doc/generic/musixtex/musixdoc/miscellaneous.tex64
-rw-r--r--Master/texmf-dist/doc/generic/musixtex/musixdoc/musixdoc.pdfbin1332076 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/generic/musixtex/musixdoc/parameters.tex80
-rw-r--r--Master/texmf-dist/doc/generic/musixtex/musixdoc/slurstiesTypeK.tex6
-rw-r--r--Master/texmf-dist/doc/generic/musixtex/musixdoc/writingnotes.tex31
-rw-r--r--Master/texmf-dist/doc/generic/musixtex/scripts/musixtex.pdfbin7305 -> 23215 bytes
-rw-r--r--Master/texmf-dist/doc/man/man1/musixtex.113
-rw-r--r--Master/texmf-dist/doc/man/man1/musixtex.man1.pdfbin23231 -> 23021 bytes
-rwxr-xr-xMaster/texmf-dist/scripts/musixtex/musixtex.lua20
-rw-r--r--Master/texmf-dist/tex/generic/musixtex/musixps.tex11
-rw-r--r--Master/texmf-dist/tex/generic/musixtex/musixtex.tex43
19 files changed, 259 insertions, 51 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/musixtex/musixtex.lua b/Build/source/texk/texlive/linked_scripts/musixtex/musixtex.lua
index f591940b20f..5f600b99558 100755
--- a/Build/source/texk/texlive/linked_scripts/musixtex/musixtex.lua
+++ b/Build/source/texk/texlive/linked_scripts/musixtex/musixtex.lua
@@ -1,12 +1,12 @@
#!/usr/bin/env texlua
-VERSION = "0.21"
+VERSION = "0.22"
--[[
musixtex.lua: processes MusiXTeX files using prepmx and/or pmxab and/or
autosp as pre-processors (and deletes intermediate files)
- (c) Copyright 2011-2018 Bob Tennent rdt@cs.queensu.ca
+ (c) Copyright 2011-2020 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,10 @@ VERSION = "0.21"
ChangeLog:
+ version 0.22 2020-03-20 RDT
+ add -X option
+ add -version, --version, -help, --help options
+
version 0.21 2018-07-27 RDT
add -P option.
@@ -134,8 +138,8 @@ Usage: [texlua] musixtex.lua { option | basename[.mtx | .pmx | .aspc | .tex | .
The normal route after preprocessing goes tex-dvi-ps-pdf, but shorter
routes are also available, see the options. The default processing route
for .tex files is etex-musixflx-etex.
-Options: -v version
- -h help
+Options: -v, --version version
+ -h, --help help
-l latex source
-p direct tex-pdf (pdftex etc)
-F fmt use fmt as the TeX processor
@@ -146,6 +150,7 @@ Options: -v version
-m stop at pmx
-M prepmxx use prepmxx as the mtx preprocessor
-A autospx use autospx as the aspc preprocessor
+ -X pmxabx use pmxabx as the pmx preprocessor
-t stop at tex/mid
-s stop at dvi
-g stop at ps
@@ -289,9 +294,9 @@ function report_error(filename)
end
function process_option(this_arg)
- if this_arg == "-v" then
+ if this_arg == "-v" or this_arg == "-version" or this_arg == "--version" then
os.exit(0)
- elseif this_arg == "-h" then
+ elseif this_arg == "-h" or this_arg == "-help" or this_arg == "--help" then
usage()
os.exit(0)
elseif this_arg == "-l" then
@@ -345,6 +350,9 @@ function process_option(this_arg)
elseif this_arg == "-P" then
narg = narg+1
ps2pdf = arg[narg]
+ elseif this_arg == "-X" then
+ narg = narg+1
+ pmx = arg[narg]
else
print("! Unknown option "..this_arg.." ignored")
end
diff --git a/Master/texmf-dist/doc/generic/musixtex/ChangeLog-130.txt b/Master/texmf-dist/doc/generic/musixtex/ChangeLog-130.txt
new file mode 100644
index 00000000000..69dae51de71
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/musixtex/ChangeLog-130.txt
@@ -0,0 +1,5 @@
+
+Changes from MusiXTeX 129 to 130:
+
+ * defined \zdoublebar for use within a bar
+ * defined \hbp and \hbpp
diff --git a/Master/texmf-dist/doc/generic/musixtex/README b/Master/texmf-dist/doc/generic/musixtex/README
index aebd633e312..3e87b0e509f 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.29 (2018-08-04).
+This is MusiXTeX, version 1.30 (2020-03-20).
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 d2b3b793db2..073774546f7 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/barlines.tex b/Master/texmf-dist/doc/generic/musixtex/musixdoc/barlines.tex
index 0303b7a9a44..92cd5624c77 100644
--- a/Master/texmf-dist/doc/generic/musixtex/musixdoc/barlines.tex
+++ b/Master/texmf-dist/doc/generic/musixtex/musixdoc/barlines.tex
@@ -14,10 +14,10 @@ To typeset a double bar line with two thin rules, use \keyindex{doublebar}. You
also issue \keyindex{setdoublebar} to cause the next \verb|\bar| (or
\keyindex{stoppiece}, \keyindex{alaligne}, or \keyindex{alapage}) to be replaced
by a double bar.
-
There is no specific command to print a thin-thick double bar line, but
\keyindex{setdoubleBAR} will cause one in the same cases where
\verb|\setdoublebar| would cause a thin-thin double bar line.
+To typeset a double-bar line in the middle of a bar, use \keyindex{zdoublebar}.
To make the next bar line invisible, use \keyindex{setemptybar} before
\verb|\bar|.
diff --git a/Master/texmf-dist/doc/generic/musixtex/musixdoc/beams.tex b/Master/texmf-dist/doc/generic/musixtex/musixdoc/beams.tex
index 354906640ed..2805e0aff61 100644
--- a/Master/texmf-dist/doc/generic/musixtex/musixdoc/beams.tex
+++ b/Master/texmf-dist/doc/generic/musixtex/musixdoc/beams.tex
@@ -340,6 +340,10 @@ using the \keyindex{hb} macro:
\Notes\ibbl0j0\hb0j\tbl0\hb0j\en
\Notes\ibbl0h4\hb0h\tbl0\hb0j\en
\end{verbatim}\end{quote}\noindent
+There are also dotted and double-dotted versions \keyindex{hbp} and
+\keyindex{hbpp}.
+
+
A different look could be obtained as follows:
\begin{music}\nostartrule
diff --git a/Master/texmf-dist/doc/generic/musixtex/musixdoc/frontmatter.tex b/Master/texmf-dist/doc/generic/musixtex/musixdoc/frontmatter.tex
index 42d4e645c0f..64be0c29fec 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.29}
+instrumental music\\\Large\itshape Version 1.30}
\author{}
@@ -68,7 +68,7 @@ Since then, the only significant update to \musixtex\ has been in version 1.15 (
takes advantage of the greater capacity of the e\TeX\ version of \TeX.
This manual
is the definitive reference to all features of
-\musixtex\ version~1.29.
+\musixtex\ version~1.30.
Novice users need not start here.
Most
diff --git a/Master/texmf-dist/doc/generic/musixtex/musixdoc/layout.tex b/Master/texmf-dist/doc/generic/musixtex/musixdoc/layout.tex
index 10d8bbc3cfa..5d2b353b796 100644
--- a/Master/texmf-dist/doc/generic/musixtex/musixdoc/layout.tex
+++ b/Master/texmf-dist/doc/generic/musixtex/musixdoc/layout.tex
@@ -16,9 +16,10 @@ mid-bar location as an optional line-breaking point, use \keyindex{zbar}.
The heavy final double bar of a piece is one of the consequences of
\keyindex{Endpiece} or \keyindex{Stoppiece}. If you just want to terminate
the text with a simple bar, say \keyindex{stoppiece} or \keyindex{endpiece}.
-If you want to suppress right-justification of the last line of a score,
-use \keyindex{raggedstoppiece}.
To terminate it with no bar line at all, code \keyindex{zstoppiece}.
+If you want to suppress right-justification of the last line of a score,
+use \keyindex{raggedstoppiece}; the bar line can be suppressed by
+using \keyindex{setemptybar}.
Once you have stopped the score by any of these means, you may want to restart
it, and there are several ways to do so. If you don't need to change the key
diff --git a/Master/texmf-dist/doc/generic/musixtex/musixdoc/miscellaneous.tex b/Master/texmf-dist/doc/generic/musixtex/musixdoc/miscellaneous.tex
index 50be2c03442..f212b769d74 100644
--- a/Master/texmf-dist/doc/generic/musixtex/musixdoc/miscellaneous.tex
+++ b/Master/texmf-dist/doc/generic/musixtex/musixdoc/miscellaneous.tex
@@ -81,9 +81,14 @@ small circle above a note head at pitch $p$.
\end{itemize}
These marks are horizontally centered relative to solid note heads.
To
-compensate for the fact that whole notes are wider, you should use
-\keyindex{wholeshift}\verb|{|\ital{Any nonspacing macro}\verb|}| to center accents
-and other items (e.g.,~\verb|\Fermataup|) above a whole note.
+compensate for the fact that whole notes are wider, you may use
+\begin{quote}
+\keyindex{wholeshift}\verb|{|\ital{Any nonspacing macro}\verb|}|
+\end{quote}
+to center accents
+(and other items) above or below a whole note. For example,
+\keyindex{Fermataup}\pitchp~(described in Section~{\ref{ornaments}}) is
+\emph{defined} as \keyindex{wholeshift}\verb|{|\keyindex{fermataup}\pitchp\verb|}|.
There are also variants of the most common accents\footnote{Thanks to Klaus
{\sc Bechert}'s corrections.} which will be automatically positioned
@@ -139,6 +144,7 @@ The macro
\verb|\tuplettxt| serves the same role for the last two macros.
The font used is defined by
\verb|\txtfont| and is, by default, \verb|\eightit| (in normal music size) but may be re-defined.
+\zkeyindex{txtfont}
The first four commands in the table
are normally used with beamed xtuplets. As indicated in the
@@ -273,6 +279,7 @@ it is possible to define \verb|\txt| or
\end{verbatim}\end{quote}
\section{Ornaments}
+\label{ornaments}
\subsection{Simple ornaments}\index{ornaments}
@@ -302,7 +309,7 @@ compensate for the fact that whole notes are wider, you may use
\keyindex{wholeshift}\verb|{|\mbox{\ital{Any nonspacing macro}}\verb|}|
\end{quote}
to center any of these ornaments
-above a whole note.
+above (or below) a whole note.
In the following macros for fermatas, the argument $p$ is the pitch of the
@@ -951,6 +958,55 @@ The coding is
\zendextract
\end{verbatim}\end{quote}
\end{footnotesize}
+
+\clearpage
+
+Here is the same example with \verb|\tabstylespacetrue|:
+\begin{music}
+\input musixps
+\def\psslurhgt{0.5}
+\instrumentnumber{2}
+\songbottom1\songtop2
+\generalmeter{\meterfrac34}
+\generalsignature{-1}
+\setlines16
+\setclefsymbol1\tabclef\setclefsymbol2\treblelowoct
+\tabstylespacetrue
+\setsize1\largevalue
+\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}%
+}}
+\startextract
+\NOtesp\zltab55\zltab43\ltab32&\zh{d}\zhl{f}\qu{.h}\en
+\Notes\ltab32&\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
+\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
+\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
+\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}
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.pdf b/Master/texmf-dist/doc/generic/musixtex/musixdoc/musixdoc.pdf
deleted file mode 100644
index d2b3b793db2..00000000000
--- a/Master/texmf-dist/doc/generic/musixtex/musixdoc/musixdoc.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/musixtex/musixdoc/parameters.tex b/Master/texmf-dist/doc/generic/musixtex/musixdoc/parameters.tex
index 6cdd48b62f9..8ecffdad46c 100644
--- a/Master/texmf-dist/doc/generic/musixtex/musixdoc/parameters.tex
+++ b/Master/texmf-dist/doc/generic/musixtex/musixdoc/parameters.tex
@@ -138,3 +138,83 @@ to their default values: \keyindex{staffbotmarg} (\verb|3\Interligne|),
number of lines per staff for all instruments ($5$); and will reset all clef
symbols to standard clef symbols.
+ \section{Split and Shortened Systems}
+It is sometimes desirable to typeset a ``shortened'' system or to split
+a system into left and right segments, as in the following (extracted from a
+Geminiani \emph{concerto grosso}):
+
+\begin{music}
+\smallmusicsize
+\setclef1\bass
+\setclef5\treble\settrebleclefsymbol5\trebleoct
+\generalsignature{-2}
+\instrumentnumber5
+\songbottom{1}\songtop{5}
+\setinterinstrument4{1\internote}
+\nobarnumbers
+\generalmeter{\meterfrac38}
+\hbox to\hsize\bgroup\vbox\bgroup\hsize=1.7in
+\startpiece\addspace\afterruleskip
+\Notes\qa G\sk&\ibu1i{-1}\qb1i\qb1{.g}&\ca d\qa g&\ca n\itieu3n\qa n&\ca g\ds\en
+\notes\ds\sk&\sk\tbbu1\tqu1g&\sk\sk&\sk\sk\ttie3&\ds\sk\en
+\znotes&&&&\lcn{q}{\bf D.S. al\kern3ex}\coda p\en
+\setdoublebar\endpiece
+\egroup\hfill\vbox\bgroup\hsize=3.7in
+\generalmeter{\allabreve}
+\startpiece\addspace\afterruleskip
+\znotes&&&&\coda o\en
+\NOtes\qa{.G}&\qa{.k}&\qa{.d}&\qa n&\qa g\en
+\notes\sk\sk\qs\cca N&\sk\sk\qs\cca i&\sk\sk\qs\cca k&\qs\ibbl3p{-2}\qb3{p}\qb3{o}\tql3n&\qp\sk\sk\sk\en
+\NOtes\qa{.M}&\qa{.h}&\qa{.k}&\qa o&\ha k\en
+\Notes\sk&\sk&\sk&\itieu3r\qa r&\sk\en
+\notes\qs\cca M&\qs\cca h&\qs\cca k&\sk\sk&\sk\sk\en
+\bar
+\NOtes\wh L\sk&\qa{g}\qa{g}&\ha{l}\sk&\ttie3\ha r\sk&\ha{g}\sk\en
+\NOTes\sk&\ha j&\ha{n}&\tr s\ha q&\ha{n}\en
+\bar
+\nspace
+\NOtesp\ha{.K}&\ha{.h}&\ha{.k}&\ha{.r}&\ha{.^m}\en
+\setdoublebar\endpiece
+\egroup\egroup
+\end{music}
+
+This was coded as follows:
+\begin{footnotesize}
+\begin{quote}\begin{verbatim}
+\setclef1\bass\setclef5\treble\settrebleclefsymbol5\trebleoct
+\generalsignature{-2}
+\instrumentnumber5\songbottom{1}\songtop{5}
+\nobarnumbers
+\generalmeter{\meterfrac38}
+\hbox to\hsize\bgroup\vbox\bgroup\hsize=1.7in % specify length of left segment
+\startpiece\addspace\afterruleskip
+\Notes\qa G\sk&\ibu1i{-1}\qb1i\qb1{.g}
+ &\ca d\qa g&\ca n\itieu3n\qa n&\ca g\ds\en
+\notes\ds\sk&\sk\tbbu1\tqu1g
+ &\sk\sk&\sk\sk\ttie3&\ds\sk\en
+\znotes&&&&\lcn{q}{\bf D.S. al\kern3ex}\coda p\en
+\setdoublebar\endpiece
+\egroup\hfill\vbox\bgroup\hsize=3.7in % specify length of right segment
+\generalmeter{\allabreve}
+\startpiece\addspace\afterruleskip
+\znotes&&&&\coda o\en
+\NOtes\qa{.G}&\qa{.k}&\qa{.d}&\qa n&\qa g\en
+\notes\sk\sk\qs\cca N&\sk\sk\qs\cca i
+ &\sk\sk\qs\cca k
+ &\qs\ibbl3p{-2}\qb3{p}\qb3{o}\tql3n
+ &\qp\sk\sk\sk\en
+\NOtes\qa{.M}&\qa{.h}&\qa{.k}&\qa o&\ha k\en
+\Notes\sk&\sk&\sk&\itieu3r\qa r&\sk\en
+\notes\qs\cca M&\qs\cca h&\qs\cca k
+ &\sk\sk&\sk\sk\en
+\bar
+\NOtes\wh L\sk&\qa{g}\qa{g}&\ha{l}\sk
+ &\ttie3\ha r\sk&\ha{g}\sk\en
+\NOTes\sk&\ha j&\ha{n}&\tr s\ha q&\ha{n}\en
+\bar
+\nspace
+\NOtesp\ha{.K}&\ha{.h}&\ha{.k}&\ha{.r}&\ha{.^m}\en
+\setdoublebar\endpiece
+\egroup\egroup % close open \bgroups
+\end{verbatim}\end{quote}
+\end{footnotesize}
diff --git a/Master/texmf-dist/doc/generic/musixtex/musixdoc/slurstiesTypeK.tex b/Master/texmf-dist/doc/generic/musixtex/musixdoc/slurstiesTypeK.tex
index b7bfca7d649..c387eb2b685 100644
--- a/Master/texmf-dist/doc/generic/musixtex/musixdoc/slurstiesTypeK.tex
+++ b/Master/texmf-dist/doc/generic/musixtex/musixdoc/slurstiesTypeK.tex
@@ -61,7 +61,11 @@ or right by substituting one of the commands \keyindex{ilsluru},
For shifts farther to the left, use
\keyindex{iLsluru},
\keyindex{iLslurd}
-or \keyindex{tLslur}.
+or \keyindex{tLslur};
+for shifts farther to the right, use
+\keyindex{iRsluru},
+\keyindex{iRslurd}
+or \keyindex{tRslur}.
You can control the shape of type~K slurs with variants of
diff --git a/Master/texmf-dist/doc/generic/musixtex/musixdoc/writingnotes.tex b/Master/texmf-dist/doc/generic/musixtex/musixdoc/writingnotes.tex
index 7bd5c83375f..bc8b3cd4d70 100644
--- a/Master/texmf-dist/doc/generic/musixtex/musixdoc/writingnotes.tex
+++ b/Master/texmf-dist/doc/generic/musixtex/musixdoc/writingnotes.tex
@@ -44,7 +44,7 @@ macro from the letter.
\item[\keyindex{breve}{\tt\char123}$p${\tt\char125} :]breve (\hbox to 8pt{\zbreve1\hss}) .
\item[\keyindex{longa}{\tt\char123}$p${\tt\char125} :]longa (\hbox to8pt{\zlonga1\hss}) .
\item[\keyindex{longaa}{\tt\char123}$p${\tt\char125} :]longa with automatic stem direction\footnote{Editor's note: Evidently there is no explicit up-stemmed longa} .
- \item[\keyindex{zmaxima}{\tt\char123}$p${\tt\char125} :]maxima(\hbox to16pt{\zmaxima1\hss}) .
+ \item[\keyindex{maxima}{\tt\char123}$p${\tt\char125} :]maxima (\hbox to16pt{\zmaxima1\hss}) .
\item[\keyindex{wq}{\tt\char123}$p${\tt\char125} :]arbitrary duration note (\hbox to8pt{\zwq1\hss})
(also used as alternate representation of a \ital{breve}).
\item[\keyindex{wqq}{\tt\char123}$p${\tt\char125} :]long arbitrary duration note
@@ -214,7 +214,7 @@ Non spacing variants are also provided, namely
By appending one or two \verb|p|'s (for ``pointed'') to the name, many of the
macros just introduced provide one or two dots after the notehead:
-\keyindex{whp}\pitchp, \keyindex{whpp},
+\keyindex{whp}, \keyindex{whpp},
\keyindex{zwp}, \keyindex{zwpp},
\keyindex{hup}, \keyindex{hupp},
\keyindex{hlp}, \keyindex{hlpp},
@@ -226,12 +226,14 @@ macros just introduced provide one or two dots after the notehead:
\keyindex{zqp}, \keyindex{zqpp},
\keyindex{cup}, \keyindex{cupp},
\keyindex{clp}, \keyindex{clpp},
-\keyindex{qbp} and \keyindex{qbpp}.
-Naturally, the ones that start with ``\verb|z|'' are used in chords.
+\keyindex{qbp} and \keyindex{qbpp}, all followed by a pitch argument.
+The ones that start with ``\verb|z|'' are used in chords.
The dot(s) will be raised if the note is on a line.
-A more explicit way uses one of the macros \keyindex{pt}{\tt\char123}$p${\tt\char125},
-\keyindex{ppt}, or \keyindex{pppt} right
+A more explicit way uses one of the macros
+\keyindex{pt}{\tt\char123}$p${\tt\char125},
+\keyindex{ppt}{\tt\char123}$p${\tt\char125}, or
+\keyindex{pppt}{\tt\char123}$p${\tt\char125} right
before any note macro to place one to three dots after the normal note
head at pitch $p$. Again they will be raised if on a line. In fact this is the only
way to get a triple-dotted note.
@@ -239,6 +241,10 @@ For example a
quarter note with one dot could be coded \verb|\pt h\qu h|, with two dots
as \keyindex{ppt}\verb| h\qu h| and with three as
\keyindex{pppt}\verb| h\qu h|.
+As a matter of style, if two voices share one staff, the dots in
+the lower voice should be \emph{lowered} if the note is on a line. For
+this you can use \keyindex{lpt},
+\keyindex{lppt} and \keyindex{lpppt}.
Yet another method for posting a dot is to insert a \ital{period} before
the letter representing the pitch. Thus \verb|\qu{.a}| is equivalent to
@@ -248,14 +254,17 @@ section.
Non-spacing dotted notes can be produced using
\keyindex{zhup}, \keyindex{zhlp}, \keyindex{zqup}, \keyindex{zqlp},
-\keyindex{zcup}, \keyindex{zclp}, \keyindex{zqbp},
+\keyindex{zcup}, \keyindex{zclp}, \keyindex{zqbp}, followed by a pitch,
+and similarly with two \verb|p|'s for
+double-dotted notes.
+The following provide dotted chord notes shifted left or right:
+\keyindex{lhp},
+\keyindex{rhp},
+\keyindex{lqp},
+\keyindex{rqp},
and similarly with two \verb|p|'s for
double-dotted notes.
-As a matter of style, if two voices share one staff, the dots in
-the lower voice should be lowered if the note is on a line. For
-this you can use \keyindex{lpt}{\tt\char123}$p${\tt\char125} and
-\keyindex{lppt}{\tt\char123}$p${\tt\char125}.
\section{Sequences of equally spaced notes; collective coding}
\label{CollectiveCoding}
diff --git a/Master/texmf-dist/doc/generic/musixtex/scripts/musixtex.pdf b/Master/texmf-dist/doc/generic/musixtex/scripts/musixtex.pdf
index e8caf62c92e..ec49d4a3d6e 100644
--- a/Master/texmf-dist/doc/generic/musixtex/scripts/musixtex.pdf
+++ b/Master/texmf-dist/doc/generic/musixtex/scripts/musixtex.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/man/man1/musixtex.1 b/Master/texmf-dist/doc/man/man1/musixtex.1
index 5c3b84ca2cd..839d07a882b 100644
--- a/Master/texmf-dist/doc/man/man1/musixtex.1
+++ b/Master/texmf-dist/doc/man/man1/musixtex.1
@@ -1,5 +1,5 @@
.\" This manpage is licensed under the GNU Public License
-.TH MUSIXTEX 1 2018-07-27 "musixtex version 0.21" ""
+.TH MUSIXTEX 1 2020-03-20 "musixtex version 0.22" ""
.SH NAME
musixtex \- processes MusiXTeX files, using pre-processors prepmx, pmxab and autosp as necessary,
@@ -67,10 +67,10 @@ or
in that order, and process it as above.
.SH OPTIONS
.TP 10
-.B -v
+.B -v, -version, --version
output program name and version number, and quit
.TP
-.B -h
+.B -h, -help, --help
output usage summary and quit
.TP
.B -l
@@ -118,12 +118,16 @@ use
.B mtxx
as the mtx preprocessor; e.g., -M "prepmx -i".
.TP
+.B -X pmxx
+use
+.B pmxx
+as the pmx preprocessor; e.g., -X "./pmxab",
+.TP
.B -A aspcx
use
.B aspcx
as the aspc preprocessor; e.g., -A "autosp -l".
.TP
-.TP
.B -t
stop processing at the tex/mid files
.TP
@@ -153,7 +157,6 @@ quiet mode (only musixtex's own messages); other messages are diverted to a temp
If an error occurs at the TeX stage, processing halts immediately and the tail of the log file is sent to stderr.
Version information is copied from the temporary file to the log file.
-
.TP 0
Options affect processing of all succeeding MusiXTeX files unless changed by another option. Option flags cannot be combined; e.g., use \fB -l -x \fP rather than \fB -lx\fP.
diff --git a/Master/texmf-dist/doc/man/man1/musixtex.man1.pdf b/Master/texmf-dist/doc/man/man1/musixtex.man1.pdf
index 4e4c2ca4c95..8511904f36e 100644
--- a/Master/texmf-dist/doc/man/man1/musixtex.man1.pdf
+++ b/Master/texmf-dist/doc/man/man1/musixtex.man1.pdf
Binary files differ
diff --git a/Master/texmf-dist/scripts/musixtex/musixtex.lua b/Master/texmf-dist/scripts/musixtex/musixtex.lua
index f591940b20f..5f600b99558 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.21"
+VERSION = "0.22"
--[[
musixtex.lua: processes MusiXTeX files using prepmx and/or pmxab and/or
autosp as pre-processors (and deletes intermediate files)
- (c) Copyright 2011-2018 Bob Tennent rdt@cs.queensu.ca
+ (c) Copyright 2011-2020 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,10 @@ VERSION = "0.21"
ChangeLog:
+ version 0.22 2020-03-20 RDT
+ add -X option
+ add -version, --version, -help, --help options
+
version 0.21 2018-07-27 RDT
add -P option.
@@ -134,8 +138,8 @@ Usage: [texlua] musixtex.lua { option | basename[.mtx | .pmx | .aspc | .tex | .
The normal route after preprocessing goes tex-dvi-ps-pdf, but shorter
routes are also available, see the options. The default processing route
for .tex files is etex-musixflx-etex.
-Options: -v version
- -h help
+Options: -v, --version version
+ -h, --help help
-l latex source
-p direct tex-pdf (pdftex etc)
-F fmt use fmt as the TeX processor
@@ -146,6 +150,7 @@ Options: -v version
-m stop at pmx
-M prepmxx use prepmxx as the mtx preprocessor
-A autospx use autospx as the aspc preprocessor
+ -X pmxabx use pmxabx as the pmx preprocessor
-t stop at tex/mid
-s stop at dvi
-g stop at ps
@@ -289,9 +294,9 @@ function report_error(filename)
end
function process_option(this_arg)
- if this_arg == "-v" then
+ if this_arg == "-v" or this_arg == "-version" or this_arg == "--version" then
os.exit(0)
- elseif this_arg == "-h" then
+ elseif this_arg == "-h" or this_arg == "-help" or this_arg == "--help" then
usage()
os.exit(0)
elseif this_arg == "-l" then
@@ -345,6 +350,9 @@ function process_option(this_arg)
elseif this_arg == "-P" then
narg = narg+1
ps2pdf = arg[narg]
+ elseif this_arg == "-X" then
+ narg = narg+1
+ pmx = arg[narg]
else
print("! Unknown option "..this_arg.." ignored")
end
diff --git a/Master/texmf-dist/tex/generic/musixtex/musixps.tex b/Master/texmf-dist/tex/generic/musixtex/musixps.tex
index e2033e2b076..6e877494e7f 100644
--- a/Master/texmf-dist/tex/generic/musixtex/musixps.tex
+++ b/Master/texmf-dist/tex/generic/musixtex/musixps.tex
@@ -1,5 +1,6 @@
%% PostScript slurs, ties and crescendos
% Coded by Stanislav Kneifl
+% RDT added \psRslurskip \iRslur \tRslur \psRtieskip \tRtie \psLtieskip \tLtie 2019/06/17
\ifx\undefined\startpiece\errmessage{Input musixtex.tex before musixps.tex}\fi
\ifx\undefined\liftcresc\else\endinput\fi
@@ -26,6 +27,7 @@
\def\psbslurraise{2} % vert. offset for slurs on beams
\def\psLslurskip{-0.2} % horiz. offset of slurs shifted more to the left
+\def\psRslurskip{4} % horiz. offset of slurs shifted more to the right
\def\pslslurskip{0.4} % horiz. offset of slurs shifted to the left
\def\psislurskip{1.4} % horiz. offset of the slur beginnings
\def\pstslurskip{1.2} % horiz. offset of the slur endings
@@ -48,6 +50,8 @@
\def\psttieskip{0.3} % horiz. offset of the tie endings
\def\psltieskip{-0.2} % horiz. offset of ties shifted to the left
\def\psrtieskip{3} % horiz. offset of ties shifted to the right
+\def\psLtieskip{-0.4} % horiz. offset of ties shifted more to the left
+\def\psRtieskip{4} % horiz. offset of ties shifted more to the right
\def\pstiehgt{0.7} % height coeficient of the ties
\def\pstiemaxhgt{30} % maximal height if the ties
@@ -554,7 +558,9 @@
\def\ilsluru#1#2{\iSlur{#1}{#2}{\psslurraise}{\pslslurskip}}
\def\ilslurd#1#2{\iSlur{#1}{#2}{-\psslurraise}{\pslslurskip}}
\def\iLsluru#1#2{\iSlur{#1}{#2}{\psslurraise}{\psLslurskip}}
-\def\iLslurd#1#2{\iSlur{#1}{#2}{-\psslurraise}{\psLslurskip}}
+\def\iLsluru#1#2{\iSlur{#1}{#2}{\psslurraise}{\psLslurskip}}
+\def\iRslurd#1#2{\iSlur{#1}{#2}{-\psslurraise}{\psRslurskip}}
+\def\iRslurd#1#2{\iSlur{#1}{#2}{-\psslurraise}{\psRslurskip}}
\def\tfslur#1#2{\tSlur{#1}{#2}{\psslurraise}{\pstslurskip}{\psfslurhgt}{\psslurangul}}
\def\tslur#1#2{\tSlur{#1}{#2}{\psslurraise}{\pstslurskip}{\psslurhgt}{\psslurangul}}
@@ -576,6 +582,7 @@
\def\tLfslur#1#2{\tSlur{#1}{#2}{\psslurraise}{\psLslurskip}{\psfslurhgt}{\psslurangul}}
\def\tLslur#1#2{\tSlur{#1}{#2}{\psslurraise}{\psLslurskip}{\psslurhgt}{\psslurangul}}
+\def\tRslur#1#2{\tSlur{#1}{#2}{\psslurraise}{\psRslurskip}{\psslurhgt}{\psslurangul}}
\def\tLhslur#1#2{\tSlur{#1}{#2}{\psslurraise}{\psLslurskip}{\pshslurhgt}{\psslurangul}}
\def\tLHslur#1#2{\tSlur{#1}{#2}{\psslurraise}{\psLslurskip}{\psHslurhgt}{\psHslurangul}}
\def\tLHHslur#1#2{\tSlur{#1}{#2}{\psslurraise}{\psLslurskip}{\psHHslurhgt}{\psHHslurangul}}
@@ -599,6 +606,8 @@
\def\ttie#1{\tTie{#1}{\psttieskip}}
\def\tltie#1{\tTie{#1}{\psltieskip}}
\def\trtie#1{\tTie{#1}{\psrtieskip}}
+\def\tLtie#1{\tTie{#1}{\psLtieskip}}
+\def\tRtie#1{\tTie{#1}{\psRtieskip}}
\def\icresc#1{\Icresc{#1}{\d@nh}{0}}
\def\idecresc#1{\Idecresc{#1}{\d@nh}{0}}
diff --git a/Master/texmf-dist/tex/generic/musixtex/musixtex.tex b/Master/texmf-dist/tex/generic/musixtex/musixtex.tex
index 55382f5dfe1..b11caaa6b54 100644
--- a/Master/texmf-dist/tex/generic/musixtex/musixtex.tex
+++ b/Master/texmf-dist/tex/generic/musixtex/musixtex.tex
@@ -25,16 +25,20 @@
\def\mufl@x{0.83}%
\def\mxmajorvernumber{1}
-\def\mxminorvernumber{29}
+\def\mxminorvernumber{30}
\def\mxvernumber{\mxmajorvernumber\mxminorvernumber}% make it possible to compare with \ifnum
-\def\mxversuffix{}%
+\def\mxversuffix{beta}%
\edef\mxversion{\mxmajorvernumber.\mxminorvernumber\mxversuffix}
-\def\mxdate{2018-08-04}
+\def\mxdate{2018-08-09}
\immediate\write16{MusiXTeX(c) \mxversion\space<\mxdate>}%
\everyjob{\immediate\write16{MusiXTeX(c) \mxversion\space<\mxdate>}}%
+% version 1.30
+% defined \zdoublebar for use within a bar
+% defined \hbp and \hbpp
+
% version 1.29
% defined \tabfnt, \tabcleffnt, \tabstringfnt, \tab etc. to support tablature
@@ -2284,6 +2288,7 @@
% if you need a line which appears ragged
\def\raggedstoppiece{\ifx\ragg@d\empty \fil@{r}\fi % version 1.18 RDT (from musixext)
\check@nopen\n@wbar\hfill\z@suspend\@nds@ction}
+\def\zendpiece{\setemptybar\raggedstoppiece}
\def\Stoppiece{\setdoubleBAR\stoppiece}
\let\Endpiece\Stoppiece
@@ -2580,14 +2585,13 @@
\fi}
\def\zzleftrightrepeat{% % RDT 1.28
- \advance\barno\m@ne
- \setrightrepeat
- \stoppiece
- \let\z@sw\@ne
- \contpiece
- \addspace{\h@lf\afterruleskip}%
- \kernm\afterruleskip\l@eftrepeat\kern\afterruleskip
- \advance\lastbarpos\afterruleskip \b@rrul@
+\advance\barno\m@ne%
+\setrightrepeat%
+\stoppiece%
+\let\z@sw\@ne%
+\contpiece%
+\advance\barno\m@ne%
+\leftrepeat% % RDT revised 1.30
}
\def\zleftrightrepeat@II{% % RDT 1.28
@@ -2603,6 +2607,9 @@
\let\leftrightrepeat\leftrightrepeat@II
\let\zleftrightrepeat\zleftrightrepeat@II % RDT 1.28
+
+\def\zdoublebar{\advance\barno\m@ne\doublebar} % RDT 1.30
+
\def\alapage{\stoppiece\eject\contpiece}
\def\zalapage{\zstoppiece\eject\contpiece}
@@ -3657,6 +3664,8 @@
\def\hlpp{\h@symbol\@qlpp}
\def\hb{\h@symbol\@qb}
+\def\hbp{\h@symbol\@qbp}
+\def\hbpp{\h@symbol\@qbpp}
\def\zh{\h@symbol\@zq}
\def\zhp{\h@symbol\@zqp}
@@ -4156,6 +4165,18 @@
\def\lppt{\g@pt\m@ne\@ne}
\def\lpppt{\g@pt\m@ne\tw@}
+
+% Shifted, pointed chord notes
+%
+\def\lhp#1{\loff{\zhp{#1}}}
+\def\rhp#1{\roff{\zhp{#1}}}
+\def\lqp#1{\loff{\zqp{#1}}}
+\def\rqp#1{\roff{\zqp{#1}}}
+\def\rhpp#1{\roff{\zhpp{#1}}}
+\def\lhpp#1{\loff{\zhpp{#1}}}
+\def\rqpp#1{\roff{\zqpp{#1}}}
+\def\lqpp#1{\loff{\zqpp{#1}}}
+
\def\g@pt#1#2#3{\check@staff
\inhgetn@i#3\relax \relax % two \relax since the first one
\ifnum\n@i<\@c % in swallowed by \inhgetn@i