summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-04-07 17:14:54 +0000
committerKarl Berry <karl@freefriends.org>2016-04-07 17:14:54 +0000
commit4fc0fce826bc3e62885c787654e6a39740d0f31d (patch)
tree4208a8aa428963af55b95e74fca6c17418a9f800
parent09272d5b17e3f64de89b93da1b07432bbde91f7e (diff)
musixtex 1.22 (25feb16)
git-svn-id: svn://tug.org/texlive/trunk@40306 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/musixtex/musixtex.lua115
-rw-r--r--Master/texmf-dist/doc/generic/musixtex/ChangeLog-121.txt16
-rw-r--r--Master/texmf-dist/doc/generic/musixtex/ChangeLog-122.txt8
-rw-r--r--Master/texmf-dist/doc/generic/musixtex/README2
-rw-r--r--Master/texmf-dist/doc/generic/musixtex/examples/pedal.tex24
-rw-r--r--Master/texmf-dist/doc/generic/musixtex/musixdoc.pdfbin1252604 -> 1280018 bytes
-rw-r--r--Master/texmf-dist/doc/generic/musixtex/musixdoc/changing.tex82
-rw-r--r--Master/texmf-dist/doc/generic/musixtex/musixdoc/extensions.tex62
-rw-r--r--Master/texmf-dist/doc/generic/musixtex/musixdoc/extracting.tex2
-rw-r--r--Master/texmf-dist/doc/generic/musixtex/musixdoc/fonts.tex81
-rw-r--r--Master/texmf-dist/doc/generic/musixtex/musixdoc/frontmatter.tex10
-rw-r--r--Master/texmf-dist/doc/generic/musixtex/musixdoc/introduction.tex2
-rw-r--r--Master/texmf-dist/doc/generic/musixtex/musixdoc/miscellaneous.tex113
-rw-r--r--Master/texmf-dist/doc/generic/musixtex/musixdoc/musixdoc.sty3
-rw-r--r--Master/texmf-dist/doc/generic/musixtex/musixdoc/musixdoc.tex2
-rw-r--r--Master/texmf-dist/doc/generic/musixtex/musixdoc/preparing.tex9
-rw-r--r--Master/texmf-dist/doc/generic/musixtex/musixdoc/restsdoc.tex113
-rw-r--r--Master/texmf-dist/doc/generic/musixtex/musixdoc/slurstiesTypeK.tex7
-rw-r--r--Master/texmf-dist/doc/generic/musixtex/musixdoc/slurstiesfont.tex29
-rw-r--r--Master/texmf-dist/doc/generic/musixtex/musixdoc/spacing.tex2
-rw-r--r--Master/texmf-dist/doc/generic/musixtex/musixdoc/summary.tex16
-rw-r--r--Master/texmf-dist/doc/generic/musixtex/musixtex-install.pdfbin93367 -> 30982 bytes
-rw-r--r--Master/texmf-dist/doc/generic/musixtex/reference/musixre1.pdfbin81896 -> 85655 bytes
-rw-r--r--Master/texmf-dist/doc/generic/musixtex/scripts/musixtex.pdfbin6895 -> 6975 bytes
-rw-r--r--Master/texmf-dist/doc/man/man1/musixtex.112
-rw-r--r--Master/texmf-dist/doc/man/man1/musixtex.man1.pdfbin21624 -> 21893 bytes
-rwxr-xr-xMaster/texmf-dist/scripts/musixtex/musixtex.lua115
-rw-r--r--Master/texmf-dist/tex/generic/musixtex/musixec.tex145
-rw-r--r--Master/texmf-dist/tex/generic/musixtex/musixhv.tex158
-rw-r--r--Master/texmf-dist/tex/generic/musixtex/musixlit.tex15
-rw-r--r--Master/texmf-dist/tex/generic/musixtex/musixplt.tex191
-rw-r--r--Master/texmf-dist/tex/generic/musixtex/musixsty.tex1
-rw-r--r--Master/texmf-dist/tex/generic/musixtex/musixtex.tex467
-rw-r--r--Master/texmf-dist/tex/generic/musixtex/musixtmr.tex147
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds1
35 files changed, 1197 insertions, 753 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/musixtex/musixtex.lua b/Build/source/texk/texlive/linked_scripts/musixtex/musixtex.lua
index f4de32954af..041eff342ba 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.15"
+VERSION = "0.16c"
--[[
musixtex.lua: processes MusiXTeX files using prepmx and/or pmxab and/or
autosp as pre-processors (and deletes intermediate files)
- (c) Copyright 2011-2015 Bob Tennent rdt@cs.queensu.ca
+ (c) Copyright 2011-2016 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,19 @@ VERSION = "0.15"
ChangeLog:
+ version 0.16c 2016-02-24 RDT
+ -interaction batchmode for -q
+ report_error reports only the first error
+
+ version 0.16b 2016-02-20 DL
+ Improved help message as suggested by Bob Tennent.
+
+ version 0.16a 2015-12-30 DL
+ Corrects bug in -g option reported by Christian Mondrup.
+
+ version 0.16 2015-12-24 DL
+ Versions read from tempfile and written to musixtex.log.
+
version 0.15 2015-12-03 DL
Option -q added, which redirects most screen output into
a temporary file. If an error occurs at the TeX stage, processing
@@ -109,7 +122,7 @@ Options: -v version
-s stop at dvi
-g stop at ps
-i retain intermediate and log files
- -q quiet mode (give only musixtex's own messages)
+ -q quiet mode (redirect screen logs, write summary on musixtex.log)
-1 one-pass [pdf][la]tex processing
-x run makeindex
-f restore default processing
@@ -118,10 +131,14 @@ Four TeX engines are available via the -l and -p options.
latex -l
pdfetex -p
pdflatex -l -p
-The -F option allows any engine to be named. In that case, an attempt is made
-to deduce implied -l and -p settings from the presence or absence of the
-strings `latex` and `pdf` in the name of the engine. If this is not correct,
-the user should explicitly specify the appropriate option.]]
+If the -F option is used, options -l and -p need to be set if the engine
+name does not contain "latex" and "pdf" respectively. For example, the
+above four engines can be replaced by:
+ -F "luatex --output-format=dvi"
+ -F "lualatex --output-format=dvi"
+ -F "luatex" -p
+ -F "lualatex" -p
+]]
end
function whoami ()
@@ -172,6 +189,7 @@ function defaults()
quiet = "" -- set by "-q"
end
+------------------------------------------------------------------------
if #arg == 0 then
whoami()
@@ -188,6 +206,8 @@ if not musixlog then
os.exit(1)
end
+------------------------------------------------------------------------
+
print = function(...)
orig_print(...)
musixlog:write(...,"\n") -- only the first argument gets written!
@@ -228,6 +248,10 @@ function report_error(filename)
end
local trigger = false
for line in log:lines() do
+ if trigger and line:match"^!" then
+ -- report just the first error
+ break
+ end
trigger = trigger or line:match"^!"
if trigger then
io.stderr:write("! "..line,"\n")
@@ -235,7 +259,7 @@ function report_error(filename)
end
end
- function process_option(this_arg)
+function process_option(this_arg)
if this_arg == "-v" then
os.exit(0)
elseif this_arg == "-h" then
@@ -256,9 +280,9 @@ end
tex = arg[narg]
force_engine = true
elseif this_arg == "-s" then
- dvi = false; ps2pdf = nil;
+ dvi = false; ps2pdf = nil; protect.dvi = true
elseif this_arg == "-g" then
- dvi = dvips; ps2pdf = nil
+ dvi = dvips; ps2pdf = nil; protect.ps = true
elseif this_arg == "-i" then
cleanup = false
elseif this_arg == "-x" then
@@ -269,8 +293,10 @@ end
defaults()
elseif this_arg == "-t" then
tex, dvi, ps2pdf = nil,nil,nil
+ protect.tex = true
elseif this_arg == "-m" then
- pmx, tex, dvi, ps2pdf = nil,nil,nil
+ pmx, tex, dvi, ps2pdf = nil,nil,nil,nil
+ protect.pmx = true
elseif this_arg == "-q" then
if not tempname then
tempname = tempname or os.tmpname()
@@ -381,7 +407,7 @@ function tex_process(tex,basename,extension)
latex = true
end
if quiet ~= "" then
- tex = tex .. " -halt-on-error"
+ tex = tex .. " -interaction batchmode"
end
local OK = (execute(tex .. " " .. filename) == 0)
if passes ~= 1 then
@@ -421,12 +447,70 @@ function tex_process(tex,basename,extension)
end
end
+-- Extracting version and path information from tempname.
+-- The targets below rely on the exact output format used by various
+-- programs and TeX files.
+targets = {
+mtxtex = "%(([^(]+mtx%.tex)%s*$",
+mtxlatex = "%(([^(]+mtxlatex%.sty)",
+mtxLaTeX = ".*mtxLaTeX.*",
+pmxtex = "%(([^(]+pmx%.tex)",
+musixtex = "%(([^(]+musixtex%.tex)",
+musixltx = "%(([^(]+musixltx%.tex)",
+musixlyr = "%(([^(]+musixlyr%.tex)",
+MTx = "This is (M%-Tx.->)",
+PMX = "This is (PMX[^\n]+)",
+pdftex = "This is (pdfTeX[^\n]+)",
+musixflx = "Musixflx%S+",
+autosp = "This is autosp.*$",
+index = "autosp,MTx,mtxtex,mtxlatex,mtxLaTeX,PMX,pmxtex,"..
+ "musixtex,musixltx,musixlyr,musixflx,pdftex"
+}
+
+extra_line = { mtxtex=true, musixtex=true, musixltx=true, pmxtex=true,
+ musixlyr=true }
+
+function report_versions(tempname)
+ if not tempname then return end -- only available with -q
+ local logs = io.open(tempname)
+ if not logs then
+ print ("No version information: could not open "..tempname)
+ return
+ end
+ local versions = {}
+ local extra
+ musixlog:write("--- Packages actually used according to "..
+ tempname.." ---\n")
+ for line in logs:lines() do
+ if extra then
+ versions[extra] = versions[extra] .. "\n " ..line
+ extra = false
+ else for target, pattern in pairs(targets) do
+ if not versions[target] then
+ local found = line:match(pattern)
+ if found then
+ extra = extra_line[target] and target
+ versions[target] = found
+ end
+ end
+ end end
+ end
+ logs:close()
+ for target in targets.index:gmatch"[^,]+" do if versions[target] then
+ if target=="mtxLaTeX" then musixlog:write" " end
+ musixlog:write(versions[target],"\n")
+ end end
+end
+
+------------------------------------------------------------------------
+
whoami()
defaults()
exit_code = 0
narg = 1
+protect = {} -- extensions not to be deleted, even if cleanup requested
repeat
this_arg = arg[narg]
@@ -438,12 +522,15 @@ repeat
if basename and cleanup then
remove("pmxaerr.dat")
for ext in ("mx1,mx2,dvi,ps,idx,log,ilg,pml"):gmatch"[^,]+" do
- remove(basename.."."..ext)
+ if not protect[ext] then remove(basename.."."..ext)
+ end
end
- end
+ end
+ protect = {}
end
narg = narg+1
until narg > #arg
+report_versions(tempname)
musixlog:close()
os.exit( exit_code )
diff --git a/Master/texmf-dist/doc/generic/musixtex/ChangeLog-121.txt b/Master/texmf-dist/doc/generic/musixtex/ChangeLog-121.txt
new file mode 100644
index 00000000000..2a2464441b7
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/musixtex/ChangeLog-121.txt
@@ -0,0 +1,16 @@
+Changes from MusiXTeX 120 to 121:
+
+ + adjusted the offsets and/or vertical positions for some tremolos
+
+ + moved \lastbarpos\lin@pos after calls to \Writ@meters
+ to correct \centerbar positioning
+
+ + copied the definition of \Hpause from musixlit.tex
+
+ + introduced \Changeclefs, \cHpause and \centerHpause
+
+ + replaced \smalltype\it by \txtfont in octave clef commands
+
+ + moved definitions of \txtfont into \comput@fonts
+
+ + added support for piano-pedal bracket notation
diff --git a/Master/texmf-dist/doc/generic/musixtex/ChangeLog-122.txt b/Master/texmf-dist/doc/generic/musixtex/ChangeLog-122.txt
new file mode 100644
index 00000000000..87a76a65d34
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/musixtex/ChangeLog-122.txt
@@ -0,0 +1,8 @@
+
+Changes from MusiXTeX 121 to 122:
+
+ + bi and sc font definitions added; sl and tt definitions for musixsty moved
+ + explicit font choices for \txtfont replaced by generic commands
+ \smalltype\it etc.
+ + \pdlud \halfwidthbigwedge and \raise height font-dependent
+ + \zbreath and \cbreath use BIGtype rather than BIGfont
diff --git a/Master/texmf-dist/doc/generic/musixtex/README b/Master/texmf-dist/doc/generic/musixtex/README
index c3ef5af699b..b95ea1f8894 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.20-2015-12-13.
+This is MusiXTeX, version 1.22 (2016-02-25).
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/examples/pedal.tex b/Master/texmf-dist/doc/generic/musixtex/examples/pedal.tex
new file mode 100644
index 00000000000..e6667335157
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/musixtex/examples/pedal.tex
@@ -0,0 +1,24 @@
+\input musixtex
+%\largemusicsize
+\setstaffs12
+\setclef1{\bass}
+\def\raiseped{-8}
+\nobarnumbers
+\startpiece\addspace\afterruleskip%
+\NOtes\qa H\qa I\pdld\qa J\qa K|\wh l\en
+\NOtes\pdlu\qa L\qa M|\wh l\en
+\bar%
+\NOtes\pdld\qa J\qa K\pdlud\qa L\qa M\pdlu\qa N|\wh l\en
+\bar%
+\NOtes\pdld\qa J\qa K|\wh l\en
+\NOtes\qa L\qa M|\wh l\en
+\bar%
+\NOtes\qa J\qa K\qa L\pdlu\qa M|\wh l\en
+\NOtes\pdld\qa J\qa K\qa L\pdlu\qa M|\wh l\en
+\bar%
+\NOtes\qa J\qa K\qa L\qa M|\wh l\en
+\NOtes\pdld\qa J\pdlud\qa K\pdlud\qa L\pdlu\qa M|\wh l\en
+\bar%
+\Notes\pdld\qa J\sk\qa K\sk\pdlud\qa L\sk\pdlu\qa M|\ibu1e2\qb1{efghij}\tqu1k\en
+\stoppiece
+\end
diff --git a/Master/texmf-dist/doc/generic/musixtex/musixdoc.pdf b/Master/texmf-dist/doc/generic/musixtex/musixdoc.pdf
index 9e880520bb4..8f1ceea39a9 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/changing.tex b/Master/texmf-dist/doc/generic/musixtex/musixdoc/changing.tex
index eef0b1296f7..24b329a5f2d 100644
--- a/Master/texmf-dist/doc/generic/musixtex/musixdoc/changing.tex
+++ b/Master/texmf-dist/doc/generic/musixtex/musixdoc/changing.tex
@@ -111,7 +111,7 @@ Note the comments between the code lines.
\end{music}
-\section{Clefs}\label{treblelowoct}
+\section{Clefs}\label{treblelowoct}\label{ClefChanges}
Macros that define clefs have already been discussed in Section~\ref{whatspecify}. By way of review, here are all of the possible clefs
(applied to the lowest staff):
@@ -142,10 +142,10 @@ Macros that define clefs have already been discussed in Section~\ref{whatspecify
%avre
Just as with key signatures, these commands only \ital{prepare} for clef changes.
-To \ital{activate} them, any of the first eleven commands listed in Section~\ref{contextintro} could be used. However, one should keep in mind that
+To \ital{activate} them, any of the first eleven commands listed in Section~\ref{contextintro} could be used. However, one should keep in mind that,
according to modern conventions, a clef change at a bar line is posted
-before the bar line, while for example \verb|\changecontext| would post it
-after the bar line. In part for this reason, we have the special command
+\emph{before} the bar line, whereas, for example, \verb|\changecontext|, would post it
+\emph{after} the bar line. In part for this reason, we have the special command
\keyindex{changeclefs}. It can be used anywhere outside
\verb+\notes...\en+ to activate a clef change and insert an amount of
horizontal space to accommodate the new clef symbol(s), without printing a
@@ -212,6 +212,51 @@ Here are some examples of clef changes:
\noindent Of course the examples in the last two bars are contrary
to accepted practice.
+If \keyindex{atnextbar} is being used to center material and new clefs before
+the bar line should be
+excluded from the ``notes'' region within which material is centered,
+you may use the command \keyindex{Changeclefs}, as in the following:
+
+\begin{music}
+\nobarnumbers
+\nostartrule
+\generalmeter{\meterC}
+\startextract%
+\NOTEs\en
+\def\atnextbar{\znotes\centerHpause{11}\en}%
+\setclef1\bass\Changeclefs%
+\setleftrepeat%
+\generalmeter{\allabreve}%
+\changecontext%
+\NOTEs\en
+\def\atnextbar{\znotes\centerHpause{12}\en}%
+\setclef1\treble\Changeclefs%
+\setrightrepeat\bar%
+\NOTEs\en
+\def\atnextbar{\znotes\centerHpause{13}\en}%
+\endextract
+\end{music}\noindent
+which was coded as
+\begin{quote}
+\begin{verbatim}
+\generalmeter{\meterC}
+\startextract%
+\NOTEs\en
+\def\atnextbar{\znotes\centerHpause{11}\en}%
+\setclef1\bass\Changeclefs%
+\setleftrepeat%
+\generalmeter{\allabreve}%
+\changecontext%
+\NOTEs\en
+\def\atnextbar{\znotes\centerHpause{12}\en}%
+\setclef1\treble\Changeclefs%
+\setrightrepeat\bar%
+\NOTEs\en
+\def\atnextbar{\znotes\centerHpause{13}\en}%
+\endextract
+\end{verbatim}
+\end{quote}
+
Clef changes initiated with the \verb|\setclef| command have several features
in common. When activated after the beginning of the piece, the printed symbol
is smaller than the normal one used at the beginning of the piece. Also,
@@ -324,7 +369,6 @@ nonsense; \verb|\resetclefsymbols| puts matters in order at (6) and (7).
\noindent This is the code:
\begin{quote}\begin{verbatim}
-\begin{music}\nostartrule
\instrumentnumber1\setclef1\bass
\startpiece
\notes\zchar{-5}{1}\qu H\en\setclef1\treble\changeclefs
@@ -424,3 +468,31 @@ in a single staff.
\Notes\qu k&\cu{de}|\qu e\en
\endextract
\end{music}
+
+\section{Changes at the end of a system}
+It is conventional music-typesetting practice to indicate changes of clef, time signature,
+and key signature that apply to the start of a \emph{new} system
+also at the end of the previous system, as in the following:
+
+\begin{music}
+\nobarnumbers
+\setstaffs12
+\setclef{1}{\bass}
+\generalmeter{\meterfrac44}
+\generalsignature{+2}
+\startextract%
+\Notes\wh K|\qa{fghi}\en
+\setclef{1}{66}\changeclefs%
+\generalmeter{\meterfrac34}%
+\generalsignature{-1}%
+\Changecontext%
+\zendextract%
+\generalsignature{-1}
+\setclef{1}{66}
+\generalmeter{\meterfrac34}
+\startextract%
+\NOtes\ha{.K}|\qa{Mad}\en%
+\bar%
+\Notes\ha{.K}|\qa{Mad}\en%
+\endextract%
+\end{music}
diff --git a/Master/texmf-dist/doc/generic/musixtex/musixdoc/extensions.tex b/Master/texmf-dist/doc/generic/musixtex/musixdoc/extensions.tex
index fbe5991497d..a0eaf645f58 100644
--- a/Master/texmf-dist/doc/generic/musixtex/musixdoc/extensions.tex
+++ b/Master/texmf-dist/doc/generic/musixtex/musixdoc/extensions.tex
@@ -283,8 +283,22 @@ Use as follows:
\begin{quote}\begin{verbatim}
\input musixtex
\input musixec
+[\input musixsty]
...
\end{verbatim}\end{quote}
+For example,
+
+\begin{music}
+\input musixec
+é è â ç ü ñ\\
+\end{music}
+ \noindent may be coded as
+\begin{quote}
+\begin{verbatim}
+\input musixec
+é è â ç ü ñ\\
+\end{verbatim}
+\end{quote}
\section{musixeng}
@@ -1323,6 +1337,7 @@ Use as follows:
The usual ``small'' type commands are supported:
\begin{quote}
\begin{tabular}{lr}
+\keyindex{tinytype} & 7pt \\
\keyindex{smalltype} & 8pt \\
\keyindex{Smalltype} & 9pt \\
\keyindex{normtype}& 10pt \\
@@ -1334,8 +1349,8 @@ For all of these, the following variants are supported:
\begin{tabular}{ll}
\verb|\rm| & ``Roman'' (sans serif) \\
\verb|\bf| & bold \\
-\verb|\it| & ``italic'' (oblique) \\
-\verb|\bi| & ``bold-italic'' (bold-oblique) \\
+\verb|\it| & ``italic'' (actually oblique) \\
+\verb|\bi| & ``bold-italic'' (actually bold-oblique) \\
\verb|\sc| & small capitals\\
\end{tabular}
\end{quote}
@@ -1364,10 +1379,6 @@ The following bold-oblique fonts for dynamic marks are defined:
\keyindex{ppfftwentynine} & 17pt \\
\end{tabular}\end{quote}
-The default font for typesetting \keyindex{txt} and \keyindex{tuplettxt}
-arguments
-is \keyindex{eightit} (\verb\8pt\~oblique).
-
\section{musixlit}\label{litu}\label{otherbars}
Provides a notation style intermediate between gregorian and baroque, for
example
@@ -1474,21 +1485,24 @@ quarter note at pitch $p$.
\item\keyindex{cnhu} $p$ and \keyindex{cnhl} $p$ provide a stemless square
headed half note at pitch $p$.
- \item\keyindex{Hpause} $p$ $n$ provides an arbitrary length pause at pitch
-$p$ and of length $n$ \keyindex{noteskip}. However, in the first of the above
-example, this feature has been used to denote an arbitrary length note rather
-than a rest!
+%\item\keyindex{Hpause} $p$ $n$ provides an arbitrary length pause at pitch
+%$p$ and of length $n$ \keyindex{noteskip}. However, in the first of the above
+%example, this feature has been used to denote an arbitrary length note rather
+%than a rest!
\item\keyindex{Hlonga} $p$ $n$ provides an arbitrary length note at pitch
$p$ and of length $n$ \keyindex{noteskip}.
This feature has been used to denote an arbitrary length note in the second of
-the above examples.
+the above examples;
+in the first example, \keyindex{Hpause}
+was used to denote an arbitrary length note rather
+than a rest.
\item\keyindex{shortbarrules} has been used to provide bar rules shorter than
the staff vertical width.
\item\keyindex{interbarrules} has been used to provide bars between the
-staffs, rather that over them. This is an arbitrary question of taste...
+staffs, rather that over them. This is an arbitrary question of taste\ldots
\end{itemize}
\section{musixlyr} \ixtt{musixlyr.tex}
@@ -1766,6 +1780,7 @@ Use as follows:
The usual ``small'' type commands are supported:
\begin{quote}
\begin{tabular}{lr}
+\keyindex{tinytype} & 7pt \\
\keyindex{smalltype} & 8pt \\
\keyindex{Smalltype} & 9pt \\
\keyindex{normtype}& 10pt \\
@@ -1780,7 +1795,6 @@ For all of these, the following variants are supported:
\verb|\it| & italic \\
\verb|\bi| & bold italic \\
\verb|\sc| & small capitals (and old-style figures)\\
-\verb|\sl| & oblique \\
\end{tabular}
\end{quote}
The ``big'' type commands are as follows:
@@ -1792,7 +1806,8 @@ The ``big'' type commands are as follows:
\keyindex{BIGtype} & 25pt\\
\end{tabular}
\end{quote}
-The default variant for all of these is small-caps;
+The default variant for the ``small'' types is Roman and for
+the ``big'' ones, small-caps;
however, \keyindex{font} commands are defined
for all the usual variants at all of these sizes.
To letter-space a title, use the \verb|\so|
@@ -1808,10 +1823,6 @@ The following bold-italic fonts for dynamic marks are defined:
\keyindex{ppfftwentynine} & 17pt \\
\end{tabular}\end{quote}
-The default font for typesetting \keyindex{txt} and \keyindex{tuplettxt}
-arguments
-is \keyindex{eightit} (\verb\8pt\~italic).
-
\section{musixpoi}
Adds definitions of less common singly and doubly dotted notes.
Available are
@@ -1983,6 +1994,7 @@ Use as follows:
The usual ``small'' type commands are supported:
\begin{quote}
\begin{tabular}{lr}
+\keyindex{tinytype} & $7$pt \\
\keyindex{smalltype} & $8$pt \\
\keyindex{Smalltype} & $9$pt \\
\keyindex{normtype}& $10$pt \\
@@ -1997,7 +2009,6 @@ For all of these, the following variants are supported:
\verb|\it| & italic \\
\verb|\bi| & bold italic \\
\verb|\sc| & small capitals \\
-\verb|\sl| & oblique \\
\end{tabular}
\end{quote}
The ``big'' type commands are as follows:
@@ -2025,10 +2036,6 @@ The following bold-italic fonts for dynamic marks are defined:
\keyindex{ppfftwentynine} & 17pt \\
\end{tabular}\end{quote}
-The default font for typesetting \keyindex{txt} and \keyindex{tuplettxt}
-arguments
-is \keyindex{eightit} (\verb|8pt| italic).
-
\section{musixtnt}\label{musixtnt}
This package (tnt = Transform Notes) provides a macro \keyindex{TransformNotes} which makes
possible several ``transformations'' of the effect of notes commands such as \keyindex{notes}.
@@ -2084,8 +2091,9 @@ Caveats:
\item
Some additional revisions to the source for the part might be necessary:
\begin{itemize}
-\item adjusting \verb|\setname1|, \verb|\setclef1|, \verb|\setsign1|,
-\verb|\setmeter1| and \verb|\setstaffs1| commands, as necessary;
+\item adjusting \verb|\setname|, \verb|\setclef|, \verb|\setsign|,
+\verb|\setmeter| and \verb|\setstaffs| commands, as necessary; see
+Section~\ref{CodingRules} for coding techniques that will make this easier.
\item ensuring that tempo and roadmap markings (\textbf{D.C.}, \textbf{Fine}, etc.) are in
the appropriate instrument segment;
@@ -2094,8 +2102,8 @@ Some additional revisions to the source for the part might be necessary:
When the extracted part score is compiled and viewed, it may be seen
that horizontal-spacing commands designed for \emph{multiple} instruments can produce bad
spacing when used for a \emph{single} instrument. Bad spacing can be corrected manually but
-this is very tedious; an auxiliary program called \verb\fixmsxpart\
-automates this process (for single-staff instruments only).
+this is very tedious; an auxiliary program called \verb\autosp\
+can be used to automate this process; see Section~\ref{autosp}.
\end{itemize}
\subsection{Other applications}
diff --git a/Master/texmf-dist/doc/generic/musixtex/musixdoc/extracting.tex b/Master/texmf-dist/doc/generic/musixtex/musixdoc/extracting.tex
index e2d8c297fe3..2039733fd05 100644
--- a/Master/texmf-dist/doc/generic/musixtex/musixdoc/extracting.tex
+++ b/Master/texmf-dist/doc/generic/musixtex/musixdoc/extracting.tex
@@ -13,7 +13,7 @@ The following is the most general approach to part extraction when
using \musixtex\ without \textbf{PMX} or \textbf{M-Tx} pre-processors. A
simpler approach which will work for most purposes is described in Section~\ref{musixtnt}.
-\section{Coding rules}
+\section{Coding rules}\label{CodingRules}
To make a ``selectable'' orchestral score you must prepare the master score
(i.e., the score with all instruments typed) as follows:
diff --git a/Master/texmf-dist/doc/generic/musixtex/musixdoc/fonts.tex b/Master/texmf-dist/doc/generic/musixtex/musixdoc/fonts.tex
index a9ee236baac..2326b86c95f 100644
--- a/Master/texmf-dist/doc/generic/musixtex/musixdoc/fonts.tex
+++ b/Master/texmf-dist/doc/generic/musixtex/musixdoc/fonts.tex
@@ -1,26 +1,28 @@
\chapter{Font Selection and Text Placement}
\section{Predefined text fonts}
-While any \TeX\ font can be used by \musixtex, there are certain styles and
-sizes that can be selected using shortcut commands.
-For ordinary text the shortcuts cover fonts of eight different
-sizes and three styles. The sizes in points are $8$, $9$, $10$, $12$, $14$, $17$, $20$, and $25$;
-the styles are from the standard Computer Modern family: Roman, bold and italic. The
-four smallest sizes are each available in all three styles, while the larger
-sizes, which are intended for titles, are available only in bold style.
-The size selection macros from smallest to biggest are \keyindex{smalltype},
+While any font with support for \TeX\ can be used by \musixtex, certain styles and
+sizes can be selected using shortcut commands.
+For ordinary text, the shortcuts cover fonts of nine different
+sizes and six styles. The sizes in points are $7$, $8$, $9$, $10$, $12$, $14$, $17$, $20$, and $25$;
+the styles are from the standard Computer Modern family: Roman, bold, italic, bold italic
+and small capitals.
+The size selection macros from smallest to biggest are
+\keyindex{tinytype},
+\keyindex{smalltype},
\keyindex{Smalltype},
\keyindex{normtype}, \keyindex{medtype}, \keyindex{bigtype},
\keyindex{Bigtype},
-\keyindex{BIgtype} and \keyindex{BIGtype}. Following size selection, the
-style may be selected or changed using \keyindex{rm} (Roman), \keyindex{bf}
-(bold) or \keyindex{it} (italic). If no style is explicitly selected, Roman style
-will be used for the sizes \verb|\medtype| or smaller. For the larger sizes,
-only bold style is provided and no style selection is required. Thus, for example,
+\keyindex{BIgtype} and \keyindex{BIGtype}.
+The style may be selected or changed using \keyindex{rm} (Roman), \keyindex{bf}
+(bold), \keyindex{it} (italic), \keyindex{bi} (bold italic) or
+\keyindex{sc} (small-capitals). If no style is explicitly selected, Roman style
+will be used for the sizes \verb|\medtype| or smaller; for the larger sizes,
+bold style is the default. Thus, for example,
eight point italic is selected with \verb|\smalltype\it|, while
twelve point Roman is selected using \verb|\medtype\rm| or simply
\verb|\medtype|. To change between styles while maintaining the same size,
-code \verb|\rm|, \verb|\it| or \verb|\bf| as in Plain \TeX.
+code \verb|\rm|, \verb|\it|, \verb|\bf|, \verb|\bi| or \verb|\sc|, as in Plain \TeX.
When \musixtex\ is started, the default font for ordinary text is
ten point Roman, equivalent to \verb|\normtype\rm|.
@@ -31,8 +33,11 @@ font specification. Macros \keyindex{tinydyn}, \keyindex{smalldyn}, \keyindex{no
used to redefine \verb|\ppff| to represent one of the smallest four.
-All predefined fonts are summarized in Table~\ref{predefinedfonts}. The second column gives an
+A selection of predefined fonts is summarized in Table~\ref{predefinedfonts}. The second column gives an
explicit control sequence that can alternatively be used locally as a font specification.
+\font\ctinytype=cmr7
+\font\ctinytypebf=cmbx7
+\font\ctinytypeit=cmti7
\font\csmalltype=cmr8
\font\csmalltypebf=cmbx8
\font\csmalltypeit=cmti8
@@ -42,9 +47,13 @@ explicit control sequence that can alternatively be used locally as a font speci
\font\cnormtype=cmr10
\font\cnormtypebf=cmbx10
\font\cnormtypeit=cmti10
+\font\cnormtypebi=cmbxti10
+\font\cnormtypesc=cmcsc10
\font\cmedtype=cmr12
\font\cmedtypebf=cmbx12
\font\cmedtypeit=cmti12
+\font\cmedtypebi=cmbxti10 scaled \magstep1
+\font\cmedtypesc=cmcsc10 scaled \magstep1
\font\cbigtype=cmbx12 scaled \magstep1
\font\cBigtype=cmbx12 scaled \magstep2
\font\cBIgtype=cmbx12 scaled \magstep3
@@ -60,10 +69,14 @@ explicit control sequence that can alternatively be used locally as a font speci
\font\cBIGfont=cmbx12 scaled \magstep4
\begin{table}
\begin{center}
+\renewcommand{\arraystretch}{1.15}
\begin{tabular}{lll}
\hline
Size and style & Font specification & Example \\
\hline
+ \verb|\tinytype| & \verb|\sevenrm| & {\ctinytype tiny Roman} \\
+ \verb|\tinytype\bf| & \verb|\sevenbf| & {\ctinytypebf tiny bold} \\
+ \verb|\tinytype\it| & \verb|\sevenit| & {\ctinytypeit tiny italic} \\
\verb|\smalltype| & \verb|\eightrm| & {\csmalltype small Roman} \\
\verb|\smalltype\bf| & \verb|\eightbf| & {\csmalltypebf small bold} \\
\verb|\smalltype\it| & \verb|\eightit| & {\csmalltypeit small italic} \\
@@ -73,22 +86,26 @@ explicit control sequence that can alternatively be used locally as a font speci
\verb|\normtype| & \verb|\tenrm| & {\cnormtype normal Roman} \\
\verb|\normtype\bf| & \verb|\tenbf| & {\cnormtypebf normal bold} \\
\verb|\normtype\it| & \verb|\tenit| & {\cnormtypeit normal italic}\\
+ \verb|\normtype\bi| & \verb|\tenbi| & {\cnormtypebi normal bold italic}\\
+ \verb|\normtype\sc| & \verb|\tensc| & {\cnormtypesc normal small capitals}\\
\verb|\medtype| & \verb|\twelverm| & {\cmedtype medium Roman} \\
\verb|\medtype\bf| & \verb|\twelvebf| & {\cmedtypebf medium bold} \\
\verb|\medtype\it| & \verb|\twelveit| & {\cmedtypeit medium italic}\\
- \verb|\bigtype| & \verb|\bigfont| & {\cbigtype big bold} \\
- \verb|\Bigtype| & \verb|\Bigfont| & {\cBigtype Big bold} \\
- \verb|\BIgtype| & \verb|\BIgfont| & {\cBIgtype BIg bold} \\
- \verb|\BIGtype| & \verb|\BIGfont| & {\cBIGtype BIG bold} \\
- \verb|\tinydyn| & \verb|\ppfftwelve| & {\cppfftwelve pp ff diminuendo}\\
- \verb|\smalldyn| & \verb|\ppffsixteen| & {\cppffsixteen pp ff diminuendo}\\
- \verb|\normdyn| & \verb|\ppfftwenty| & {\cppfftwenty pp ff crescendo}\\
- \verb|\meddyn| & \verb|\ppfftwentyfour| & {\cppfftwentyfour pp ff crescendo}\\[.4ex]
- ~ & \verb|\ppfftwentynine| & {\cppfftwentynine pp ff diminuendo}\\[.4ex]
+ \verb|\medtype\bi| & \verb|\twelvebi| & {\cmedtypebi medium bold italic}\\
+ \verb|\medtype\sc| & \verb|\twelvesc| & {\cmedtypesc medium small capitals}\\
+ \verb|\bigtype| & \verb|\frtbf| & {\cbigtype big bold} \\[.4ex]
+ \verb|\Bigtype| & \verb|\svtbf| & {\cBigtype Big bold} \\[.4ex]
+ \verb|\BIgtype| & \verb|\twtybf| & {\cBIgtype BIg bold} \\[.4ex]
+ \verb|\BIGtype| & \verb|\twfvbf| & {\cBIGtype BIG bold} \\
+ ~ & \verb|\ppfftwelve| & {\cppfftwelve pp ff diminuendo}\\
+ ~ & \verb|\ppffsixteen| & {\cppffsixteen pp ff diminuendo}\\
+ ~ & \verb|\ppfftwenty| & {\cppfftwenty pp ff diminuendo}\\
+ ~ & \verb|\ppfftwentyfour| & {\cppfftwentyfour pp ff diminuendo}\\[.4ex]
+ ~ & \verb|\ppfftwentynine| & {\cppfftwentynine pp ff diminuendo}\\[.4ex]
\hline
\end{tabular}
\end{center}
-\caption{Predefined fonts}
+\caption{Various predefined fonts}
\label{predefinedfonts}
\end{table}
@@ -96,10 +113,10 @@ explicit control sequence that can alternatively be used locally as a font speci
Since \musixtex\ is a superset of \TeX, you are free to use the standard \TeX\
machinery for defining and using any special font you desire. You must first
-of course ensure that (a) all the necessary font files (e.g., \verb|bla10.tfm|,
-\verb|bla10.pfb|, or equivalents) are installed in the right places in your system, (b) all
+of course ensure that (a)~all the necessary font files (e.g., \verb|bla10.tfm|,
+\verb|bla10.pfb|, or equivalents) are installed in the right places in your system, (b)~all
configuration files (e.g., \verb|config.ps| or equivalent) have been updated, and
-(c) the \TeX\ system has been ``rehashed''. Then you can use the font just as
+(c)~the \TeX\ file-name database has been updated, as required by your \TeX\ system. Then you can use the font just as
in any \TeX\ document, e.g., by coding \verb|\font blafont=bla10| and then
\verb|\zchar{10}{\blafont Text in user-defined font}|.
@@ -139,16 +156,16 @@ Palatino and Helvetica fonts:
\hline
{\tnormtype normal Times Roman} & {\pnormtype normal Palatino Roman} &{\hnormtype normal Helvetica Roman} \\
{\tnormtypebf normal Times bold} & {\pnormtypebf normal Palatino bold}& {\hnormtypebf normal Helvetica bold} \\
- {\tnormtypeit normal Times italic} & {\pnormtypeit normal Palatino italic } & {\hnormtypeit normal Helvetica italic }\\
- {\tbigtype Times big} & {\pbigtype Palatino big } & {\hbigtype Helvetica big } \\
+ {\tnormtypeit normal Times italic} & {\pnormtypeit normal Palatino italic } & {\hnormtypeit normal Helvetica italic }\\[.4ex]
+ {\tbigtype Times big} & {\pbigtype Palatino big } & {\hbigtype Helvetica big } \\[.4ex]
{\tBigtype Times Big } & {\pBigtype Palatino Big } & {\hBigtype Helvetica Big } \\
\hline
\end{tabular}
\end{center}
For users who prefer to stick with the default Computer Modern
-family but want to use the EC variants, the extension library
-\verb|musixec.tex| is available; see Section~\ref{ecfonts}.
+family but want to use the T$1$-encoded EC variants, the extension library
+\verb|musixec.tex| is available; see Section~\ref{ecfonts}\@.
\section{Text placement}\label{textplacement}
Special macros are provided to allow precise placement of any \TeX\ text, vertically
diff --git a/Master/texmf-dist/doc/generic/musixtex/musixdoc/frontmatter.tex b/Master/texmf-dist/doc/generic/musixtex/musixdoc/frontmatter.tex
index 5b2b0852366..759a438edca 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.20}
+instrumental music\\\Large\itshape Version 1.22}
%\author{\Large\rm Daniel \sc Taupin\\\large\sl
@@ -26,7 +26,7 @@ Hans {\sc Kuykens} (ca.~1995)
\vspace*{4ex}
In my humble opinion, that whole statement is obsolete.\\[\smallskipamount]
-Christof\/ {\sc Biericher} (2006)
+Christof\/ {\sc Biebricher} (2006)
\end{flushright}
\clearpage
@@ -65,11 +65,9 @@ event. You may read tributes to Daniel Taupin that are archived at the
Since then, the only significant update to \musixtex\ has been in version 1.15 (April 2011) which
takes advantage of the greater capacity of the e\TeX\ version of \TeX.
-In the current version~1.20 (December~2015),
-new commands for tremolos HAVE BEEN added and discussion
-of non-spacing rests has been added to this manual, which
+This manual
is the definitive reference to all features of
-\musixtex\ version~1.20.
+\musixtex\ version~1.22.
Novice users need not start here.
Most
diff --git a/Master/texmf-dist/doc/generic/musixtex/musixdoc/introduction.tex b/Master/texmf-dist/doc/generic/musixtex/musixdoc/introduction.tex
index 3407902e615..74dfd8712a3 100644
--- a/Master/texmf-dist/doc/generic/musixtex/musixdoc/introduction.tex
+++ b/Master/texmf-dist/doc/generic/musixtex/musixdoc/introduction.tex
@@ -588,7 +588,7 @@ within \ital{zero}-boxes like \verb|\rlap|, \verb|\llap|,
values to scalable dimensions like \verb|\noteskip|,
\verb|\elemskip|, \verb|\afterruleskip| and \verb|\beforeruleskip|\footnote{Note that {\Bslash hardspace} does not fall in this
category; it is specifically designed to enter hard space in a way
-the \musixtex\ can properly record it}.
+that \musixtex\ can properly record it}.
Here is a checklist of tips related to spacing issues. Because the
foregoing several paragraphs are so important, some of their content
diff --git a/Master/texmf-dist/doc/generic/musixtex/musixdoc/miscellaneous.tex b/Master/texmf-dist/doc/generic/musixtex/musixdoc/miscellaneous.tex
index 3ef4e25ff00..4d136bd7ef2 100644
--- a/Master/texmf-dist/doc/generic/musixtex/musixdoc/miscellaneous.tex
+++ b/Master/texmf-dist/doc/generic/musixtex/musixdoc/miscellaneous.tex
@@ -467,8 +467,8 @@ if it is necessary to raise or lower the tremolo indication.
%must be alphabetic and not numeric,
%because transposition is used to adjust the vertical position of the mini-beams.
- \subsection{Piano pedal commands}
-The macro \keyindex{PED} inserts a piano pedal command below the staff;
+ \section{Piano pedal commands}
+The macro \keyindex{PED} inserts a piano-pedal command below the staff;
\keyindex{DEP}, a pedal release. Alternate symbols, the first of which
occupies less space, are invoked with \keyindex{sPED} and \keyindex{sDEP}.
For example,
@@ -498,8 +498,7 @@ For example,
\NOtes|\hu k\en
\Notes\sDEP\en
\end{verbatim}\end{quote}
-
- The vertical position of
+The vertical position of
\keyindex{PED}, \keyindex{sPED}, \keyindex{DEP} and \keyindex{sDEP} can be
globally changed by redefining its elevation, which has the default
definition \verb|\def|\keyindex{raiseped}\verb|{-5}|.
@@ -509,6 +508,112 @@ macros \keyindex{Ped}, \keyindex{sPed}, \keyindex{Dep} and \keyindex{sDep}
in combination with \keyindex{zchar} or \keyindex{zcharnote}.
Since the \hbox to .7cm{ \Ped\hss} symbol is rather wide, it might collide
with adjacent bass notes. To shift it horizontally, you could use \verb|\loff{\PED}|.
+\vfill
+
+The following excerpt from \textit{Liebestr\"aume} by Franz Liszt illustrates
+a more modern approach to specifying piano-pedal usage:
+
+\begin{music}
+\smallmusicsize
+\relativeaccid
+\parindent=0pt
+\generalmeter{\meterfrac64}\generalsignature{-4}
+\nobarnumbers
+\setstaffs12\setclef1{\bass}
+\def\raiseped{-11}
+\def\qpl{\raise-2\Interligne\qp}
+\def\qpu{\raise2\Interligne\qp}
+\def\hppl{\lifthpausep{-2}}
+\startpiece\addspace\afterruleskip%
+\NOtes\zqu L\qpl|\qp\en
+\bar%
+\Notes\loff{\pdld}\ql H\sk\qpl\sk\qpl|%
+ \zhl{.c}\ds\ibu1i0\qb1{ehjh}\tqu1e\en
+\Notes\zhu{.c}\hppl|%
+ \ds\ibu1i0\qb1{ehjh}\tqu1e\en
+\bar%
+\Notes\pdlud\ql G\sk\qpl\sk\qpl|%
+ \itied1c\zhl{.c}\ds\ibu1i0\qb1{^eiji}\tqu1e\en
+\Notes\hppl\sk\sk\sk\qu c|%
+ \ttie1\zhl{c}\ds\ibu1i0\qb1{eiji}\tqu1e\en
+\stoppiece%
+\def\raiseped{-15}
+\contpiece%%
+\Notes\pdlud\ql F\sk\qpl\sk\zqu c\qpl|%
+ \zhl{c}\ds\ibu1i0\qb1{=e^hjh}\tqu1e\en
+\Notes\hppl\sk\sk\sk\qu c|%
+ \zhl{d}\ds\ibu1i0\qb1{ehjh}\tqu1e\en
+\bar%
+\Notes\pdlud\ql B\sk\qpl\sk\qpl|%
+ \zhl{.c}\ds\ibu1i0\qb1{^d^hjh}\tqu1d\en
+\Notes\zqu{M}\hppl\sk\qpu\sk\qu M|%
+ \ds\ibu1i0\qb1{dhjh}\tqu1d\en
+\bar%
+\Notes\zmidstaff{$\cdots$}\sk\pdlu\sk|\en
+\endpiece%
+\end{music}
+\pagebreak
+This has been coded using the following commands:
+\begin{quote}
+\begin{tabular}{lll}
+\keyindex{pdld}& pedal down & \huge$\llcorner$\\
+\keyindex{pdlu}& pedal up & \huge$\lrcorner$\\
+\keyindex{pdlud} & pedal up and immediately down & \_\raisebox{2pt}{$\!\bigwedge\!$}\_
+\end{tabular}
+\end{quote}
+The elevation is determined by the value of \keyindex{raiseped}.
+Here is how the excerpt may be coded:
+\begin{quote}
+\begin{footnotesize}
+\begin{verbatim}
+\smallmusicsize\relativeaccid\nobarnumbers
+\generalmeter{\meterfrac64}
+\generalsignature{-4}
+\setstaffs12\setclef1{\bass}
+\def\raiseped{-11}
+\def\qpl{\raise-2\Interligne\qp}
+\def\qpu{\raise2\Interligne\qp}
+\def\hppl{\lifthpausep{-2}}
+\startpiece\addspace\afterruleskip%
+\NOtes\zqu L\qpl|\qp\en
+\bar%
+\Notes\loff{\pdld}\ql H\sk\qpl\sk\qpl|%
+ \zhl{.c}\ds\ibu1i0\qb1{ehjh}\tqu1e\en
+\Notes\zhu{.c}\hppl|%
+ \ds\ibu1i0\qb1{ehjh}\tqu1e\en
+\bar%
+\Notes\pdlud\ql G\sk\qpl\sk\qpl|%
+ \itied1c\zhl{.c}\ds\ibu1i0\qb1{^eiji}\tqu1e\en
+\Notes\hppl\sk\sk\sk\qu c|%
+ \tltie1\zhl{c}\ds\ibu1i0\qb1{eiji}\tqu1e\en
+\stoppiece%
+\def\raiseped{-15}
+\contpiece%
+\Notes\pdlud\ql F\sk\qpl\sk\zqu c\qpl|%
+ \zhl{.c}\ds\ibu1i0\qb1{=e^hjh}\tqu1e\en
+\Notes\hppl\sk\sk\sk\qu c|%
+ \zhl{d}\ds\ibu1i0\qb1{ehjh}\tqu1e\en
+\bar%
+\Notes\pdlud\ql B\sk\qpl\sk\qpl|%
+ \zhl{c}\ds\ibu1i0\qb1{^d^hjh}\tqu1d\en
+\Notes\zqu{M}\hppl\sk\qpu\sk\qu M|%
+ \ds\ibu1i0\qb1{dhjh}\tqu1d\en
+\bar%
+\Notes\zmidstaff{$\cdots$}\sk\pdlu\sk|\en
+\endpiece
+\end{verbatim}
+\end{footnotesize}
+\end{quote}
+
+\noindent
+The following ``mixed'' patterns are also supported:
+\begin{quote}
+\begin{verbatim}
+\PED ... [\pdlud].. ... \pdlu
+
+\sPED ... [\pdlud].. ... \pdlu
+\end{verbatim}
+\end{quote}
\section{Alphabetic dynamic marks}
Conventional dynamic symbols
diff --git a/Master/texmf-dist/doc/generic/musixtex/musixdoc/musixdoc.sty b/Master/texmf-dist/doc/generic/musixtex/musixdoc/musixdoc.sty
index 2f8a4666f73..5239ab9e08c 100644
--- a/Master/texmf-dist/doc/generic/musixtex/musixdoc/musixdoc.sty
+++ b/Master/texmf-dist/doc/generic/musixtex/musixdoc/musixdoc.sty
@@ -23,6 +23,9 @@
\usepackage{makeidx}
\usepackage{multicol}
\usepackage{etex}
+\usepackage{amssymb}
+
+\newcommand{\comment}[1]{}
%\usepackage{indentfirst}
diff --git a/Master/texmf-dist/doc/generic/musixtex/musixdoc/musixdoc.tex b/Master/texmf-dist/doc/generic/musixtex/musixdoc/musixdoc.tex
index ff989080738..c48e40b7739 100644
--- a/Master/texmf-dist/doc/generic/musixtex/musixdoc/musixdoc.tex
+++ b/Master/texmf-dist/doc/generic/musixtex/musixdoc/musixdoc.tex
@@ -24,7 +24,7 @@
\usepackage{musixdoc}
-%\includeonly{
+%\includeonly{%
%frontmatter,
%introduction,
%settingup,
diff --git a/Master/texmf-dist/doc/generic/musixtex/musixdoc/preparing.tex b/Master/texmf-dist/doc/generic/musixtex/musixdoc/preparing.tex
index 32fa770934e..3693223ac4c 100644
--- a/Master/texmf-dist/doc/generic/musixtex/musixdoc/preparing.tex
+++ b/Master/texmf-dist/doc/generic/musixtex/musixdoc/preparing.tex
@@ -241,11 +241,11 @@ generally, to switch to an arbitrary instrument $n$, use
of the current instrument, use \keyindex{selectstaff}\verb|{|$n$\verb|}|. In the
latter case if $n$ exceeds the number of staves defined for the instrument, you
will receive an error message. You can enter part of a successive voice on
-\ital{same} staff by using \verb|\selectstaff{|$n$\verb|}| with $n$ for
+the \ital{same} staff by using \verb|\selectstaff{|$n$\verb|}| with $n$ for
the \ital{current} staff.
-\section{Automatic Note Spacing}
+\section{Automatic note spacing}
\label{autosp}
A preprocessor called \texttt{autosp} automates the generation
@@ -264,6 +264,11 @@ For example, from the input
\begin{verbatim}
\Notes\qa J\sk\qa K\sk&\ca l\qa m\sk\ca n\en
\end{verbatim}
+As an option, \emph{all} note-spacing commands (except \verb|\znotes|
+and \verb|\vnotes|) will be processed similarly; this is useful for correcting
+the spacing in single-instrument parts extracted from a multi-instrument score;
+see Section~\ref{musixtnt}.
+
The \texttt{autosp} package can be found at
the \href{http://icking-music-archive.org/software/autosp/autosp.zip}
{\underline{Werner Icking Music Archive}}
diff --git a/Master/texmf-dist/doc/generic/musixtex/musixdoc/restsdoc.tex b/Master/texmf-dist/doc/generic/musixtex/musixdoc/restsdoc.tex
index 8f99ebd9cf5..1e3a33431c4 100644
--- a/Master/texmf-dist/doc/generic/musixtex/musixdoc/restsdoc.tex
+++ b/Master/texmf-dist/doc/generic/musixtex/musixdoc/restsdoc.tex
@@ -33,12 +33,24 @@ and \keyindex{PAUSe}, which yield:
\endextract
\end{music}
%\check
+\noindent
+The command \keyindex{Hpause} $p$ $n$ provides an arbitrary length pause at pitch
+$p$ and of length $n$ \keyindex{noteskip}. For example,
+\verb|\NOTes\Hpause4{0.83}\en|
+produces
+
+\begin{music}
+\nostartrule
+\startextract
+\NOTes\Hpause4{0.83}\en
+\endextract
+\end{music}
\section{Raising rests and non-spacing rests}\index{raising rests}
All the
-previous rests except \keyindex{pausep} and
-\keyindex{hpausep} are \ital{hboxes}, which means that
+previous rests (except \keyindex{pausep},
+\keyindex{hpausep} and \keyindex{Hpause}) are \ital{hboxes}, which means that
they can be vertically offset if needed using the
standard \TeX\ command \keyindex{raise}. For example:
@@ -65,8 +77,8 @@ for which the coding is
\notes\raise-4\Interligne\rlap\ds\qb0f\tqu0g\en
\end{verbatim}
-In addition, two macros are available to put a whole or
-half rest above or below the staff. The ordinary \verb|\pause| or
+In addition, four special macros are available to raise or lower a whole or
+half rest. The ordinary \verb|\pause| or
\verb|\hpause| cannot be used outside the staff because a short horizontal line
must be added to distinguish between the whole and the half rest. The commands,
which are non-spacing\footnote{Editor's note: The reason for having defined these
@@ -84,91 +96,136 @@ as non-spacing is not obvious}, are
\hbox to10pt{\lifthpausep{-1}\hss} raised the same way.
\end{itemize}
%\check
-
\section{Bar-centered rests}\label{barcentered}
Sometimes it is necessary to place a rest (or some other symbols) exactly in the middle
-of a bar. This can usually be done with combinations of the commands
+of the notes region of a bar
+(i.e., excluding any initial clef and key or time signatures).
+This can usually be done with combinations of the commands
\keyindex{atnextbar},
\keyindex{centerbar},
\keyindex{cPAUSe},
\keyindex{cPAuse},
\keyindex{cpause},
\keyindex{chpause},
+\keyindex{cHpause} $n$,
as demonstrated in the following example:
\begin{music}
\generalmeter\meterC
+\generalsignature{3}
\setclef1\bass
\setstaffs1{2}
\parindent0pt
\startextract
\NOtes|\qa{cegj}\en
-\def\atnextbar{\znotes\centerbar{\cpause}|\en}\bar
+\def\atnextbar{\znotes\centerbar{\cpause}|\en}%
+\generalsignature{-3}\changecontext
\NOTes\ha{Nc}|\en
-\def\atnextbar{\znotes|\centerbar{\cpause}\en}\bar
+\def\atnextbar{\znotes|\centerbar{\cpause}\en}%
+\setclef1\alto\changeclefs%
+\generalmeter{\meterfrac21}\changecontext%
+\NOTEs\wh d\pause|\en
+\def\atnextbar{\znotes|\centerbar{\cPAuse}\en}%
+\bar
\NOTEs|\en
-\def\atnextbar{\znotes\centerbar{\cPAuse}|\centerbar{\cPAuse}\en}%
+\def\atnextbar{\znotes\centerbar{\cHpause{12}}|\centerbar{\cHpause{12}}\en}%
\endextract
\end{music}
\noindent with the coding
\begin{verbatim}
\generalmeter\meterC
+\generalsignature{3}
\setclef1\bass
\setstaffs1{2}
\parindent0pt
\startextract
\NOtes|\qa{cegj}\en
-\def\atnextbar{\znotes\centerbar{\cpause}|\en}\bar
+\def\atnextbar{\znotes\centerbar{\cpause}|\en}%
+\generalsignature{-3}\changecontext
\NOTes\ha{Nc}|\en
-\def\atnextbar{\znotes|\centerbar{\cpause}\en}\bar
+\def\atnextbar{\znotes|\centerbar{\cpause}\en}%
+\setclef1\alto\changeclefs%
+\generalmeter{\meterfrac21}\changecontext%
+\NOTEs\wh d\pause|\en
+\def\atnextbar{\znotes|\centerbar{\cPAuse}\en}%
+\bar
\NOTEs|\en
-\def\atnextbar{\znotes\centerbar{\cPAuse}|\centerbar{\cPAuse}\en}%
+\def\atnextbar{\znotes\centerbar{\cHpause{12}}|\centerbar{\cHpause{12}}\en}%
\endextract
-\end{verbatim}
+\end{verbatim}\noindent
+
The following abbreviations are provided:
\begin{quote}
\begin{tabular}{lcl}
\keyindex{centerpause}& for & \verb|\centerbar{\cpause}|\\
\keyindex{centerhpause}& for & \verb|\centerbar{\chpause}|\\
\keyindex{centerPAuse}& for & \verb|\centerbar{\cPAuse}|\\
-\keyindex{centerPAUSe}& for & \verb|\centerbar{\cPAUSe}|
+\keyindex{centerPAUSe}& for & \verb|\centerbar{\cPAUSe}|\\
+\keyindex{centerHpause} $n$ & for & \verb|\centerbar{\cHpause| $n$\verb|}|
\end{tabular}
\end{quote}
Material other than these rests may be used as arguments to
\verb|\centerbar|, as in:\\
\begin{music}
+\nostartrule
\generalmeter\meterC
\parindent0pt
\startextract
+\NOTEs\sk\hqsk\en\def\atnextbar{\znotes\centerbar{\ccn{9}{\meterfont7}}%
+\centerbar{\cPAUSe\off{2\elemskip}\cPAuse\off{2\elemskip}\cpause}\en}\bar
\NOtes\ql{ghij}\en
\def\atnextbar{\znotes\centerbar{\liftpause2}\en}\bar
\NOTes\en
\def\atnextbar{\znotes\centerbar{\duevolte}\en}\bar
\NOTes\en
-\def\atnextbar{\znotes\loffset{0.6}{\centerbar{\Fermataup l\wh j}}\en}\bar
-\NOTEs\en\def\atnextbar{\znotes\centerbar{\ccn{9}{\meterfont7}}%
-\centerbar{\cPAUSe\off{2.5\elemskip}\cPAuse\off{2.5\elemskip}\cpause}\en}\bar
-\NOTEs\Hpause4{0.83}\en
-\def\atnextbar{\znotes\centerbar{\ccn{9}{\meterfont10}}\en}\endextract
+\def\atnextbar{\znotes\loffset{0.7}{\centerbar{\Fermataup l\wh j}}\en}
+\endextract
\end{music}
\noindent for which the coding is:
-\pagebreak%
\begin{verbatim}
\generalmeter\meterC
\parindent0pt
\startextract
+\NOTEs\en\def\atnextbar{\znotes\centerbar{\ccn{9}{\meterfont7}}%
+\centerbar{\cPAUSe\off{2\elemskip}\cPAuse\off{2\elemskip}\cpause}\en}\bar
\NOtes\ql{ghij}\en
\def\atnextbar{\znotes\centerbar{\liftpause2}\en}\bar
\NOTes\en
\def\atnextbar{\znotes\centerbar{\duevolte}\en}\bar
\NOTes\en
-\def\atnextbar{\znotes\loffset{0.6}{\centerbar{\Fermataup l\wh j}}\en}\bar
-\NOTEs\en\def\atnextbar{\znotes\centerbar{\ccn{9}{\meterfont7}}%
-\centerbar{\cPAUSe\off{2.5\elemskip}\cPAuse\off{2.5\elemskip}\cpause}\en}\bar
-\NOTEs\Hpause4{0.83}\en
-\def\atnextbar{\znotes\centerbar{\ccn{9}{\meterfont10}}\en}\endextract
+\def\atnextbar{\znotes\loffset{0.7}{\centerbar{\Fermataup l\wh j}}\en}
+\endextract
\end{verbatim}
-Note that, for the off-center command
-\verb|\wh|\ldots,
-it has been necessary to use \keyindex{loffset} to correct the centering.
+In the last measure,
+it has been necessary to use \keyindex{loffset} to correct the centering of
+the off-center command
+\verb|\wh|\ldots.
+%To get proper positioning of \keyindex{centerbar} material before
+%a clef change, you may use an invisible bar line as in
+%\begin{quote}
+%\begin{verbatim}
+%\setclef1\bass
+%\startextract%
+%\NOTEs\Hpause4{0.83}\en
+%\def\atnextbar{\znotes\centerbar{\ccn9{\meterfont{4}}}\en}%
+%\qspace\setemptybar\bar% invisible bar line
+%\setclef1\alto\zchangeclefs\bar%
+%\NOtes\qa{abcd}\en
+%\endextract
+%\end{verbatim}
+%\end{quote}
+%which produces
+%
+%\begin{music}
+%\nostartrule
+%\nobarnumbers
+%\setclef1\bass
+%\startextract%
+%\NOTEs\Hpause4{0.83}\en
+%\def\atnextbar{\znotes\centerbar{\ccn9{\meterfont{4}}}\en}%
+%%\qspace\setemptybar\bar% invisible bar line
+%\setclef1\alto\changeclefs\bar%
+%\NOtes\qa{abcd}\en
+%\endextract
+%\end{music}
diff --git a/Master/texmf-dist/doc/generic/musixtex/musixdoc/slurstiesTypeK.tex b/Master/texmf-dist/doc/generic/musixtex/musixdoc/slurstiesTypeK.tex
index bd44a61f63d..fa1300c5ffe 100644
--- a/Master/texmf-dist/doc/generic/musixtex/musixdoc/slurstiesTypeK.tex
+++ b/Master/texmf-dist/doc/generic/musixtex/musixdoc/slurstiesTypeK.tex
@@ -47,6 +47,13 @@ virtual note at pitch level {\tt i}.
Both types of commands are non-spacing and must precede the first or last
note under the slur.
+Termination macros are not restricted to being used
+with their initiation counterpart. For example, a slur
+beginning as a ``beam'' slur may be terminated as a
+normal slur, or \emph{vice versa}. These would be achieved by using macro pairs
+\verb|\ibslur...\tslur...| or \verb|\islur...\tbslur...|, respectively.
+Unlike font-based slurs, adjusting the vertical positioning of the slur termination should not be necessary.
+
You can shift the starting or ending point slightly to the left
or right by substituting one of the commands \keyindex{ilsluru},
\keyindex{ilslurd}, \keyindex{irsluru},
diff --git a/Master/texmf-dist/doc/generic/musixtex/musixdoc/slurstiesfont.tex b/Master/texmf-dist/doc/generic/musixtex/musixdoc/slurstiesfont.tex
index 233db6e0360..1a671d44a2b 100644
--- a/Master/texmf-dist/doc/generic/musixtex/musixdoc/slurstiesfont.tex
+++ b/Master/texmf-dist/doc/generic/musixtex/musixdoc/slurstiesfont.tex
@@ -103,7 +103,7 @@ stems or beams above or below.
\section{Font-based slur termination}
Font-based slurs that are not forced to be simple must be terminated by an explicit
command right before the last note under the slur. There are termination
-commands analogous to each of the initiation commands alread presented. They
+commands analogous to each of the initiation commands already presented. They
are summarized in the following table:
\begin{center}
\begin{tabular}{ll}
@@ -118,12 +118,29 @@ are summarized in the following table:
\noindent All of these command have two parameters, $n$ and $p$.
-These specific termination macros are not restricted to being used with their
-initiation counterpart. A slur
-started in one sense can be terminated in another. For example, a slur beginning
-as a ``beam'' slur may be terminated as a normal slur. This would be achieved
-using the macro pair \verb|\ibslur...\tslur|.
+These specific termination macros are not restricted to
+being used with their initiation counterpart. A slur started
+in one sense can be terminated in another. For example, a
+slur beginning as a ``beam'' slur may be terminated as a
+normal slur, or \emph{vice versa}. These would be achieved using macro pairs
+\verb|\ibslur...\tslur...| or \verb|\islur...\tbslur...|, respectively; however, it may be necessary
+to adjust the vertical position of the slur termination. For example,
+\begin{music}
+\startextract
+\Notes\ibsluru1g\qa g\ha l\sk\tslur1e\zq g\zq i\qu k\en
+\Notes\islurd1h\qu h\ha f\sk\tbslurd1c\zq h\zq j\ql l\en
+\endextract
+\end{music}\noindent
+has been coded as follows:
+\begin{quote}
+\begin{verbatim}
+\startextract
+\Notes\ibsluru1g\qa g\ha l\sk\tslur1e\zq g\zq i\qu k\en
+\Notes\islurd1h\qu h\ha f\sk\tbslurd1c\zq h\zq j\ql l\en
+\endextract
+\end{verbatim}
+\end{quote}
\section{Font-based ties} Font-based ties will have the same shapes as
ordinary font-based slurs of the same length between notes of equal pitch,
but there are two important distinctions:
diff --git a/Master/texmf-dist/doc/generic/musixtex/musixdoc/spacing.tex b/Master/texmf-dist/doc/generic/musixtex/musixdoc/spacing.tex
index 98c04a9b928..3e7fdfd9258 100644
--- a/Master/texmf-dist/doc/generic/musixtex/musixdoc/spacing.tex
+++ b/Master/texmf-dist/doc/generic/musixtex/musixdoc/spacing.tex
@@ -41,7 +41,7 @@ such a group. \keyindex{nspace} produces an
additional spacing of half a note head width;
\keyindex{qspace}, one note head width. These are ``hard'' spacings. To
insert an arbitrary amount of hard space outside a \verb|\notes...\en|
-group, use \keyindex{hardspace}\verb|{|$d$\verb|}{|\dots\verb|}| where
+group, use \keyindex{hardspace}\verb|{|$d$\verb|}| where
$d$ is any fixed dimension\label{hardspace}. The foregoing three commands are the only
space-generating commands that insert hard space; all the others insert
scalable spacing: \keyindex{elemskip},
diff --git a/Master/texmf-dist/doc/generic/musixtex/musixdoc/summary.tex b/Master/texmf-dist/doc/generic/musixtex/musixdoc/summary.tex
index 2b0dcabada5..d3f70a4bf95 100644
--- a/Master/texmf-dist/doc/generic/musixtex/musixdoc/summary.tex
+++ b/Master/texmf-dist/doc/generic/musixtex/musixdoc/summary.tex
@@ -246,7 +246,7 @@ number instead of the pitch}%
% again
%
\contpiece
-\NOtes\zchar9{\bs metron}\zchar{13}{\metron\qu{99}}\sk\en
+\NOtes\zchar9{\bs metron}\zchar{13}{\small\metron\qu{99}}\sk\en
\setvoltabox1\bar
\NOtes\loffset2{\zchar{17}{\bs setvoltabox}}\en
\setvolta2\setendvolta\rightrepeat
@@ -258,12 +258,14 @@ number instead of the pitch}%
\zchar{17}{\bs segno}\segno n\sk
\zchar{17}{\kern-2\afterruleskip\bs Segno}\Segno\hsk
\zchar{-4}{\bs caesura}\sk\caesura
- \zchar{-4}{\bs cbreath}\cbreath\sk
-\multnoteskip{.66}%
- \zchar{9}{\bs PED}\PED\sk
- \zchar{9}{\bs sPED}\sPED\sk
- \zchar{9}{\bs DEP}\DEP\sk
- \zchar{9}{\bs sDEP}\sDEP\sk\en
+ \zchar{-4}{\bs cbreath}\cbreath\qsk
+ \zchar{9}{\bs PED}\PED\hsk
+ \zchar{9}{\bs sPED}\sPED\hsk\qqsk
+ \zchar{9}{\bs pdld}\pdld\hsk\qsk
+ \zchar{9}{\bs pdlud}\pdlud\hsk\qsk
+ \zchar{9}{\bs pdlu}\pdlu\hsk\qqsk
+ \zchar{9}{\bs DEP}\DEP\hsk
+ \zchar{9}{\bs sDEP}\sDEP\hsk\en
\stoppiece
%
% and again ...
diff --git a/Master/texmf-dist/doc/generic/musixtex/musixtex-install.pdf b/Master/texmf-dist/doc/generic/musixtex/musixtex-install.pdf
index 716a4bf6b35..92362a1b78c 100644
--- a/Master/texmf-dist/doc/generic/musixtex/musixtex-install.pdf
+++ b/Master/texmf-dist/doc/generic/musixtex/musixtex-install.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/musixtex/reference/musixre1.pdf b/Master/texmf-dist/doc/generic/musixtex/reference/musixre1.pdf
index 0ba557279d9..551dda083c3 100644
--- a/Master/texmf-dist/doc/generic/musixtex/reference/musixre1.pdf
+++ b/Master/texmf-dist/doc/generic/musixtex/reference/musixre1.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/musixtex/scripts/musixtex.pdf b/Master/texmf-dist/doc/generic/musixtex/scripts/musixtex.pdf
index 5b7df7315df..9eb9c1da3f4 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 1d98e7b87aa..d40036d4e96 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 2015-12-12 "musixtex version 0.15" ""
+.TH MUSIXTEX 1 2016-02-20 "musixtex version 0.16" ""
.SH NAME
musixtex \- processes MusiXTeX files, using pre-processors prepmx, pmxab and autosp as necessary,
@@ -98,7 +98,7 @@ changes the dvi processor to
.B -F fmt
uses
.B fmt
-as the TeX processor
+as the TeX processor; e.g., -F "luatex --output-format=dvi"
.TP
.B -m
stops processing at the pmx file
@@ -130,6 +130,7 @@ restore default processing
.B -q
quiet mode (only musixtex's own messages); other messages are diverted to a temporary file.
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
@@ -142,7 +143,12 @@ Note that four TeX engines are available via the -l and -p options:
pdfetex -p
pdflatex -l -p
.TP 0
-The -F option allows any engine to be named. In that case, an attempt is made to deduce implied -l and -p settings from the presence or absence of the strings 'latex' and 'pdf' in the name of the engine. If this is not correct, the user should explicitly specify the appropriate option.
+If the -F option is used, options -l and -p need to be set if the engine name does not contain "latex" and "pdf" respectively. For example, the above four engines can be replaced by:
+ -F "luatex --output-format=dvi"
+ -F "lualatex --output-format=dvi"
+ -F "luatex" -p
+ -F "lualatex" -p
+
.SH SEE ALSO
.BR autosp (1),
.BR etex (1),
diff --git a/Master/texmf-dist/doc/man/man1/musixtex.man1.pdf b/Master/texmf-dist/doc/man/man1/musixtex.man1.pdf
index 937ce1d92ac..00efea0d591 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 f4de32954af..041eff342ba 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.15"
+VERSION = "0.16c"
--[[
musixtex.lua: processes MusiXTeX files using prepmx and/or pmxab and/or
autosp as pre-processors (and deletes intermediate files)
- (c) Copyright 2011-2015 Bob Tennent rdt@cs.queensu.ca
+ (c) Copyright 2011-2016 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,19 @@ VERSION = "0.15"
ChangeLog:
+ version 0.16c 2016-02-24 RDT
+ -interaction batchmode for -q
+ report_error reports only the first error
+
+ version 0.16b 2016-02-20 DL
+ Improved help message as suggested by Bob Tennent.
+
+ version 0.16a 2015-12-30 DL
+ Corrects bug in -g option reported by Christian Mondrup.
+
+ version 0.16 2015-12-24 DL
+ Versions read from tempfile and written to musixtex.log.
+
version 0.15 2015-12-03 DL
Option -q added, which redirects most screen output into
a temporary file. If an error occurs at the TeX stage, processing
@@ -109,7 +122,7 @@ Options: -v version
-s stop at dvi
-g stop at ps
-i retain intermediate and log files
- -q quiet mode (give only musixtex's own messages)
+ -q quiet mode (redirect screen logs, write summary on musixtex.log)
-1 one-pass [pdf][la]tex processing
-x run makeindex
-f restore default processing
@@ -118,10 +131,14 @@ Four TeX engines are available via the -l and -p options.
latex -l
pdfetex -p
pdflatex -l -p
-The -F option allows any engine to be named. In that case, an attempt is made
-to deduce implied -l and -p settings from the presence or absence of the
-strings `latex` and `pdf` in the name of the engine. If this is not correct,
-the user should explicitly specify the appropriate option.]]
+If the -F option is used, options -l and -p need to be set if the engine
+name does not contain "latex" and "pdf" respectively. For example, the
+above four engines can be replaced by:
+ -F "luatex --output-format=dvi"
+ -F "lualatex --output-format=dvi"
+ -F "luatex" -p
+ -F "lualatex" -p
+]]
end
function whoami ()
@@ -172,6 +189,7 @@ function defaults()
quiet = "" -- set by "-q"
end
+------------------------------------------------------------------------
if #arg == 0 then
whoami()
@@ -188,6 +206,8 @@ if not musixlog then
os.exit(1)
end
+------------------------------------------------------------------------
+
print = function(...)
orig_print(...)
musixlog:write(...,"\n") -- only the first argument gets written!
@@ -228,6 +248,10 @@ function report_error(filename)
end
local trigger = false
for line in log:lines() do
+ if trigger and line:match"^!" then
+ -- report just the first error
+ break
+ end
trigger = trigger or line:match"^!"
if trigger then
io.stderr:write("! "..line,"\n")
@@ -235,7 +259,7 @@ function report_error(filename)
end
end
- function process_option(this_arg)
+function process_option(this_arg)
if this_arg == "-v" then
os.exit(0)
elseif this_arg == "-h" then
@@ -256,9 +280,9 @@ end
tex = arg[narg]
force_engine = true
elseif this_arg == "-s" then
- dvi = false; ps2pdf = nil;
+ dvi = false; ps2pdf = nil; protect.dvi = true
elseif this_arg == "-g" then
- dvi = dvips; ps2pdf = nil
+ dvi = dvips; ps2pdf = nil; protect.ps = true
elseif this_arg == "-i" then
cleanup = false
elseif this_arg == "-x" then
@@ -269,8 +293,10 @@ end
defaults()
elseif this_arg == "-t" then
tex, dvi, ps2pdf = nil,nil,nil
+ protect.tex = true
elseif this_arg == "-m" then
- pmx, tex, dvi, ps2pdf = nil,nil,nil
+ pmx, tex, dvi, ps2pdf = nil,nil,nil,nil
+ protect.pmx = true
elseif this_arg == "-q" then
if not tempname then
tempname = tempname or os.tmpname()
@@ -381,7 +407,7 @@ function tex_process(tex,basename,extension)
latex = true
end
if quiet ~= "" then
- tex = tex .. " -halt-on-error"
+ tex = tex .. " -interaction batchmode"
end
local OK = (execute(tex .. " " .. filename) == 0)
if passes ~= 1 then
@@ -421,12 +447,70 @@ function tex_process(tex,basename,extension)
end
end
+-- Extracting version and path information from tempname.
+-- The targets below rely on the exact output format used by various
+-- programs and TeX files.
+targets = {
+mtxtex = "%(([^(]+mtx%.tex)%s*$",
+mtxlatex = "%(([^(]+mtxlatex%.sty)",
+mtxLaTeX = ".*mtxLaTeX.*",
+pmxtex = "%(([^(]+pmx%.tex)",
+musixtex = "%(([^(]+musixtex%.tex)",
+musixltx = "%(([^(]+musixltx%.tex)",
+musixlyr = "%(([^(]+musixlyr%.tex)",
+MTx = "This is (M%-Tx.->)",
+PMX = "This is (PMX[^\n]+)",
+pdftex = "This is (pdfTeX[^\n]+)",
+musixflx = "Musixflx%S+",
+autosp = "This is autosp.*$",
+index = "autosp,MTx,mtxtex,mtxlatex,mtxLaTeX,PMX,pmxtex,"..
+ "musixtex,musixltx,musixlyr,musixflx,pdftex"
+}
+
+extra_line = { mtxtex=true, musixtex=true, musixltx=true, pmxtex=true,
+ musixlyr=true }
+
+function report_versions(tempname)
+ if not tempname then return end -- only available with -q
+ local logs = io.open(tempname)
+ if not logs then
+ print ("No version information: could not open "..tempname)
+ return
+ end
+ local versions = {}
+ local extra
+ musixlog:write("--- Packages actually used according to "..
+ tempname.." ---\n")
+ for line in logs:lines() do
+ if extra then
+ versions[extra] = versions[extra] .. "\n " ..line
+ extra = false
+ else for target, pattern in pairs(targets) do
+ if not versions[target] then
+ local found = line:match(pattern)
+ if found then
+ extra = extra_line[target] and target
+ versions[target] = found
+ end
+ end
+ end end
+ end
+ logs:close()
+ for target in targets.index:gmatch"[^,]+" do if versions[target] then
+ if target=="mtxLaTeX" then musixlog:write" " end
+ musixlog:write(versions[target],"\n")
+ end end
+end
+
+------------------------------------------------------------------------
+
whoami()
defaults()
exit_code = 0
narg = 1
+protect = {} -- extensions not to be deleted, even if cleanup requested
repeat
this_arg = arg[narg]
@@ -438,12 +522,15 @@ repeat
if basename and cleanup then
remove("pmxaerr.dat")
for ext in ("mx1,mx2,dvi,ps,idx,log,ilg,pml"):gmatch"[^,]+" do
- remove(basename.."."..ext)
+ if not protect[ext] then remove(basename.."."..ext)
+ end
end
- end
+ end
+ protect = {}
end
narg = narg+1
until narg > #arg
+report_versions(tempname)
musixlog:close()
os.exit( exit_code )
diff --git a/Master/texmf-dist/tex/generic/musixtex/musixec.tex b/Master/texmf-dist/tex/generic/musixtex/musixec.tex
index 72252737185..5ec8d0936c4 100644
--- a/Master/texmf-dist/tex/generic/musixtex/musixec.tex
+++ b/Master/texmf-dist/tex/generic/musixtex/musixec.tex
@@ -21,14 +21,11 @@
% the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
% Boston, MA 02111-1307, USA.
%
-% Copyright 2015 Bob Tennent rdt@cs.queensu.ca
+% Copyright 2015-2016 Bob Tennent rdt@cs.queensu.ca
%
-\immediate\write16{MusiXec\space<2015/07/28>}
+\immediate\write16{MusiXec\space<2016/02/22>}
%
-\newif\iflongDCfontnames
-\newif\iflongECfontnames
-\longDCfontnamesfalse % obsolete
\longECfontnamestrue
\def\fontid{ec}
@@ -38,7 +35,6 @@
\font\sevenit=ecti0800 at 7pt
\font\sevenbi=ecbi0700
\font\sevensc=ecsc0700
-\font\sevensl=ecsl0700
%
% 8pt
\font\eightrm=ecrm0800
@@ -46,8 +42,6 @@
\font\eightit=ecti0800
\font\eightbi=ecbi0800
\font\eightsc=ecsc0800
-\font\eightsl=ecsl0800
-\font\eighttt=ectt0800
%
% 9pt
\font\ninerm=ecrm0900
@@ -55,8 +49,6 @@
\font\nineit=ecti0900
\font\ninebi=ecbi0900
\font\ninesc=ecsc0900
-\font\ninesl=ecsl0900
-\font\ninett=ectt0900
%
% 10pt
\font\tenrm=ecrm1000
@@ -64,8 +56,6 @@
\font\tenit=ecti1000
\font\tenbi=ecbi1000
\font\tensc=ecsc1000
-\font\tensl=ecsl1000
-\font\tentt=ectt1000
%
% 11pt
\font\elevenrm=ecrm1095
@@ -73,8 +63,6 @@
\font\elevenit=ecti1095
\font\elevenbi=ecbi1095
\font\elevensc=ecsc1095
-\font\elevensl=ecsl1095
-\font\eleventt=ectt1095
%
% 12pt
\font\twelverm=ecrm1200
@@ -82,8 +70,6 @@
\font\twelveit=ecti1200
\font\twelvebi=ecbi1200
\font\twelvesc=ecsc1200
-\font\twelvesl=ecsl1200
-\font\twelvett=ectt1200
%
% 14pt
\font\frtrm=ecrm1440
@@ -91,8 +77,6 @@
\font\frtit=ecti1440
\font\frtbi=ecbi1440
\font\frtsc=ecsc1440
-\font\frtsl=ecsl1440
-\font\frttt=ectt1440
%
% 17pt
\font\svtrm=ecrm1728
@@ -100,8 +84,6 @@
\font\svtit=ecti1728
\font\svtbi=ecbi1728
\font\svtsc=ecsc1728
-\font\svtsl=ecsl1728
-\font\svttt=ectt1728
%
% 20pt
\font\twtyrm=ecrm2074
@@ -109,8 +91,6 @@
\font\twtyit=ecti2074
\font\twtybi=ecbi2074
\font\twtysc=ecsc2074
-\font\twtysl=ecsl2074
-\font\twtytt=ectt2074
%
% 25pt
\font\twfvrm=ecrm2488
@@ -118,103 +98,43 @@
\font\twfvit=ecti2488
\font\twfvbi=ecbi2488
\font\twfvsc=ecsc2488
-\font\twfvsl=ecsl2488
-\font\twfvtt=ectt2488
%
-% Large fonts for titles
-\let\bigfont=\frtbf
-\let\Bigfont=\svtbf
-\let\BIgfont=\twtybf
-\let\BIGfont=\twfvbf
%
%
+\font\ppfftwelve=ecbi0800
\font\ppffsixteen=ecbi1000
\font\ppfftwenty=ecbi1200
\font\ppfftwentyfour=ecbi1440
\font\ppfftwentynine=ecbi1728
-\font\tinyppff=ecbi0800
-\font\smallppff=ecbi1000
-\font\normppff=ecbi1200
-\font\medppff=ecbi1440
-%
-\def\smalltype{%
- \let\rm\eightrm
- \let\bf\eightbf
- \let\it\eightit
- \let\bi\eightbi
- \let\sc\eightsc
- \let\sl\eightsl
- \rm}
-\def\Smalltype{%
- \let\rm\ninerm
- \let\bf\ninebf
- \let\it\nineit
- \let\bi\ninebi
- \let\sc\ninesc
- \let\sl\ninesl
- \rm}
-\def\normtype{%
- \let\rm\tenrm
- \let\bf\tenbf
- \let\it\tenit
- \let\bi\tenbi
- \let\sc\tensc
- \let\sl\tensl
- \rm}
-\def\medtype{%
- \let\rm\twelverm
- \let\bf\twelvebf
- \let\it\twelveit
- \let\bi\twelvebi
- \let\sc\twelvesc
- \let\sl\twelvesl
- \rm}
-\def\bigtype{%
- \let\rm\bigfont
- \let\bf\bigfont
- \let\it\bigfont
- \let\bi\bigfont
- \let\sc\bigfont
- \let\sl\bigfont
- \bf}
-\def\Bigtype{%
- \let\rm\Bigfont
- \let\bf\Bigfont
- \let\it\Bigfont
- \let\bi\Bigfont
- \let\sc\Bigfont
- \let\sl\Bigfont
- \bf}
-\def\BIgtype{%
- \let\rm\BIgfont
- \let\bf\BIgfont
- \let\it\BIgfont
- \let\bi\Bigfont
- \let\sc\Bigfont
- \let\sl\Bigfont
- \bf}
-\def\BIGtype{%
- \let\rm\BIGfont
- \let\bf\BIGfont
- \let\it\BIGfont
- \let\bi\BIGfont
- \let\sc\BIGfont
- \let\sl\BIGfont
- \bf}
-%
-\def\txtfont{\eightit}
-\def\txt{\txtfont3}
-\def\tuplettxt{\txtfont3}
-
-\edef\catcodeat{\the\catcode`\@}\catcode`\@=11
-\def\xtuplet#1#2{\n@iv#1\advance\n@iv\m@ne {\sign@skip=\n@iv\noteskip
- \sign@skip=0.5\sign@skip \xdef\half@sign@skip{\the\sign@skip}}%
- \zcharnote{#2}{\kern\h@lf\qn@width\kern \half@sign@skip\lrlap{\txtfont#1}}}
-\catcode`\@=\catcodeat
+%
+%
+% tt fonts needed by musixsty
+%
+\font\eighttt=ectt0800
+\font\ninett=ectt0900
+\font\tentt=ectt1000
+\font\twelvett=ectt1200
+\font\frttt=ectt1440
+\font\svttt=ectt1728
+\font\twtytt=ectt2074
+\font\twfvtt=ectt2488
+%
+% sl fonts needed by musixsty
+%
+\font\eightsl=ecsl0800
+\font\ninesl=ecsl0900
+\font\tensl=ecsl1000
+\font\twelvesl=ecsl1200
+\font\frtsl=ecsl1440
+\font\svtsl=ecsl1728
+\font\twtysl=ecsl2074
+\font\twfvsl=ecsl2488
%
-% Redefine accented characters for etex, suggested by David Carlisle:
+% Redefine accented characters for etex
%
+\edef\catcodeat{\the\catcode`\@}\catcode`\@=11
+
\ifx\documentclass\undefined
\def\ProvidesFile#1[#2]{}
\def\DeclareFontEncoding#1#2#3{}
@@ -235,7 +155,14 @@
\expandafter\def\csname T1\string#1-\string#3\endcsname{\char#4\relax}}
\input t1enc.def
+
+% \c requires special treatment
+\def\c#1{\leavevmode\ifx c#1\char231 \else\setbox\z@\hbox{#1}\ifdim\ht\z@=1ex\accent11 #1%
+ \else{\ooalign{\unhbox\z@\crcr
+ \hidewidth\char11\hidewidth}}\fi\fi}
\fi
+\catcode`\@=\catcodeat
+
\normtype
\endinput
diff --git a/Master/texmf-dist/tex/generic/musixtex/musixhv.tex b/Master/texmf-dist/tex/generic/musixtex/musixhv.tex
index df435b45a7a..651f57e7ba2 100644
--- a/Master/texmf-dist/tex/generic/musixtex/musixhv.tex
+++ b/Master/texmf-dist/tex/generic/musixtex/musixhv.tex
@@ -21,9 +21,9 @@
% the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
% Boston, MA 02111-1307, USA.
%
-% Copyright 2015 Bob Tennent rdt@cs.queensu.ca
+% Copyright 2015-2016 Bob Tennent rdt@cs.queensu.ca
%
-\immediate\write16{MusiXhv\space<2015/07/25>}
+\immediate\write16{MusiXhv\space<2016/02/22>}
%
% 7pt "Roman" (sans serif), bold, "italic" (oblique), "bold-italic" (bold-oblique), and small-cap
\font\sevenrm=phvr8t at 7pt
@@ -31,7 +31,6 @@
\font\sevenit=phvro8t at 7pt
\font\sevenbi=phvbo8t at 7pt
\font\sevensc=phvrc8t at 7pt
-\font\sevensl=phvro8t at 7pt
%
% 8pt
\font\eightrm=phvr8t at 8pt
@@ -39,7 +38,6 @@
\font\eightbi=phvbo8t at 8pt
\font\eightsc=phvrc8t at 8pt
\font\eightit=phvro8t at 8pt
-\font\eightsl=phvro8t at 8pt
%
% 9pt
\font\ninerm=phvr8t at 9pt
@@ -47,7 +45,6 @@
\font\nineit=phvro8t at 9pt
\font\ninebi=phvbo8t at 9pt
\font\ninesc=phvrc8t at 9pt
-\font\ninesl=phvro8t at 9pt
%
% 10pt
\font\tenrm=phvr8t at 10pt
@@ -55,7 +52,6 @@
\font\tenit=phvro8t at 10pt
\font\tenbi=phvbo8t at 10pt
\font\tensc=phvrc8t at 10pt
-\font\tensl=phvro8t at 10pt
%
% 11pt
\font\elevenrm=phvr8t at 11pt
@@ -63,54 +59,49 @@
\font\elevenit=phvro8t at 11pt
\font\elevenbi=phvbo8t at 11pt
\font\elevensc=phvrc8t at 11pt
-\font\elevensl=phvro8t at 11pt
%
% 12pt
-\font\twelverm=phvr8t at 12pt
-\font\twelvebf=phvb8t at 12pt
-\font\twelveit=phvro8t at 12pt
-\font\twelvebi=phvbo8t at 12pt
-\font\twelvesc=phvrc8t at 12pt
-\font\twelvesl=phvro8t at 12pt
+\font\twelverm=phvr8t scaled \magstep1
+\font\twelvebf=phvb8t scaled \magstep1
+\font\twelveit=phvro8t scaled \magstep1
+\font\twelvebi=phvbo8t scaled \magstep1
+\font\twelvesc=phvrc8t scaled \magstep1
%
% 14pt
-\font\frtrm=phvr8t at 14pt
-\font\frtbf=phvb8t at 14pt
-\font\frtit=phvro8t at 14pt
-\font\frtbi=phvbo8t at 14pt
-\font\frtsc=phvrc8t at 14pt
-\font\frtsl=phvro8t at 14pt
+\font\frtrm=phvr8t scaled \magstep2
+\font\frtbf=phvb8t scaled \magstep2
+\font\frtit=phvro8t scaled \magstep2
+\font\frtbi=phvbo8t scaled \magstep2
+\font\frtsc=phvrc8t scaled \magstep2
%
% 17pt
-\font\svtrm=phvr8t at 17pt
-\font\svtbf=phvb8t at 17pt
-\font\svtit=phvro8t at 17pt
-\font\svtbi=phvbo8t at 17pt
-\font\svtsc=phvrc8t at 17pt
-\font\svtsl=phvro8t at 17pt
+\font\svtrm=phvr8t scaled \magstep3
+\font\svtbf=phvb8t scaled \magstep3
+\font\svtit=phvro8t scaled \magstep3
+\font\svtbi=phvbo8t scaled \magstep3
+\font\svtsc=phvrc8t scaled \magstep3
%
% 20pt
-\font\twtyrm=phvr8t at 20pt
-\font\twtybf=phvb8t at 20pt
-\font\twtyit=phvro8t at 20pt
-\font\twtybi=phvbo8t at 20pt
-\font\twtysc=phvrc8t at 20pt
-\font\twtysl=phvro8t at 20pt
+\font\twtyrm=phvr8t scaled \magstep4
+\font\twtybf=phvb8t scaled \magstep4
+\font\twtyit=phvro8t scaled \magstep4
+\font\twtybi=phvbo8t scaled \magstep4
+\font\twtysc=phvrc8t scaled \magstep4
%
% 25pt
-\font\twfvrm=phvr8t at 25pt
-\font\twfvbf=phvb8t at 25pt
-\font\twfvit=phvro8t at 25pt
-\font\twfvbi=phvbo8t at 25pt
-\font\twfvsc=phvrc8t at 25pt
-\font\twfvsl=phvro8t at 25pt
+\font\twfvrm=phvr8t scaled \magstep5
+\font\twfvbf=phvb8t scaled \magstep5
+\font\twfvit=phvro8t scaled \magstep5
+\font\twfvbi=phvbo8t scaled \magstep5
+\font\twfvsc=phvrc8t scaled \magstep5
+%
+% large fonts for titles
+% (If you prefer bold, use \bf)
%
-% Large fonts for titles
-% (If you prefer bold, use ..bf instead of ..rm)
-\let\bigfont=\frtrm
-\let\Bigfont=\svtrm
-\let\BIgfont=\twtyrm
-\let\BIGfont=\twfvrm
+\def\bigtype{\bigfont\rm}
+\def\Bigtype{\Bigfont\rm}
+\def\BIgtype{\BIgfont\rm}
+\def\BIGtype{\BIGfont\rm}
%
%
\font\ppfftwelve=phvbo8t at 8pt
@@ -119,11 +110,6 @@
\font\ppfftwentyfour=phvbo8t at 14pt
\font\ppfftwentynine=phvbo8t at 17pt
%
-\def\tinydyn{\let\ppff\tinyppff}
-\def\smalldyn{let\ppff\smallppff}
-\def\normdyn{\let\ppff\normppff}
-\def\meddyn{\let\ppff\medppff}
-%
\def\f{{\ppff f}}
\def\ff{{\ppff ff}}
\def\fp{{\ppff fp}}
@@ -135,6 +121,18 @@
\def\ppp{{\ppff ppp}}
\def\pppp{{\ppff pppp}}
+% sl fonts needed by musixsty
+%
+\font\eightsl=phvro8t at 8pt
+\font\ninesl=phvro8t at 9pt
+\font\tensl=phvro8t at 10pt
+\font\twelvesl=phvro8t scaled \magstep1
+\font\frtsl=phvro8t scaled \magstep2
+\font\svtsl=phvro8t scaled \magstep3
+\font\twtysl=phvro8t scaled \magstep4
+\font\twfvsl=phvro8t scaled \magstep5
+%
+%
\edef\catcodeat{\the\catcode`\@}\catcode`\@=11
%
\def\sF{{\ppff s\p@kern f}}
@@ -145,64 +143,6 @@
\let\mezzopiano\mp@
\catcode`\@=\catcodeat
-\def\smalltype{%
- \let\rm\eightrm
- \let\bf\eightbf
- \let\it\eightit
- \let\bi\eightbi
- \let\sc\eightsc
- \rm}
-\def\Smalltype{%
- \let\rm\ninerm
- \let\bf\ninebf
- \let\it\nineit
- \let\bi\ninebi
- \let\sc\ninesc
- \rm}
-\def\normtype{%
- \let\rm\tenrm
- \let\bf\tenbf
- \let\it\tenit
- \let\bi\tenbi
- \let\sc\tensc
- \rm}
-\def\medtype{%
- \let\rm\twelverm
- \let\bf\twelvebf
- \let\it\twelveit
- \let\bi\twelvebi
- \let\sc\twelvesc
- \rm}
-\def\bigtype{%
- \let\rm\bigfont
- \let\bf\bigfont
- \let\it\bigfont
- \let\bi\bigfont
- \let\sc\bigfont
- \sc}
-\def\Bigtype{%
- \let\rm\Bigfont
- \let\bf\Bigfont
- \let\it\Bigfont
- \let\bi\Bigfont
- \let\sc\Bigfont
- \sc}
-\def\BIgtype{%
- \let\rm\BIgfont
- \let\bf\BIgfont
- \let\it\BIgfont
- \let\bi\Bigfont
- \let\sc\Bigfont
- \sc}
-\def\BIGtype{%
- \let\rm\BIGfont
- \let\bf\BIGfont
- \let\it\BIGfont
- \let\bi\BIGfont
- \let\sc\BIGfont
- \sc}
-%
-
%
% Redefine accented characters for etex, suggested by David Carlisle:
%
@@ -226,6 +166,12 @@
\expandafter\def\csname T1\string#1-\string#3\endcsname{\char#4\relax}}
\input t1enc.def
+
+\edef\catcodeat{\the\catcode`\@}\catcode`\@=11
+\def\c#1{\leavevmode\ifx c#1\char231 \else\setbox\z@\hbox{#1}\ifdim\ht\z@=1ex\accent11 #1%
+ \else{\ooalign{\unhbox\z@\crcr
+ \hidewidth\char11\hidewidth}}\fi\fi}
+\catcode`\@=\catcodeat
\fi
\normtype
diff --git a/Master/texmf-dist/tex/generic/musixtex/musixlit.tex b/Master/texmf-dist/tex/generic/musixtex/musixlit.tex
index bee5ab5edbc..410a0a28d63 100644
--- a/Master/texmf-dist/tex/generic/musixtex/musixlit.tex
+++ b/Master/texmf-dist/tex/generic/musixtex/musixlit.tex
@@ -17,7 +17,7 @@
% Boston, MA 02111-1307, USA.
%
-\immediate\write16{MusiXLITurgical 0.36\space<1 March 1995>}%
+\immediate\write16{MusiXLITurgical 0.37\space<23 Dec 2015>}%
\ifx\undefined\oldGclef \else \endinput \fi
@@ -35,11 +35,14 @@
\def\cnhu{\def\q@u{\musixchar101}\@nq}
\def\cnhl{\def\q@u{\musixchar102}\@nq}
-\def\Hpause#1#2{\zcharnote{#1}{\def\s@r{%
- \vrule\@width.6\p@\@height1\h@lf\internote\@depth1\h@lf\internote}%
- \s@r
- \vrule\@width#2\noteskip\@height\h@lf\internote\@depth\h@lf\internote
- \s@r}}
+
+% Moved to musixtex.tex. RDT 2015-12-23
+%\def\Hpause#1#2{\zcharnote{#1}{\def\s@r{%
+% \vrule\@width.6\p@\@height1\h@lf\internote\@depth1\h@lf\internote}%
+% \s@r
+% \vrule\@width#2\noteskip\@height\h@lf\internote\@depth\h@lf\internote
+% \s@r}}
+
\def\Hlonga#1#2{\zcharnote{#1}{\def\s@r{%
\vrule\@width.6\p@\@height1\h@lf\internote\@depth1\h@lf\internote}%
\s@r
diff --git a/Master/texmf-dist/tex/generic/musixtex/musixplt.tex b/Master/texmf-dist/tex/generic/musixtex/musixplt.tex
index cb2adba1ee5..27ff21bf849 100644
--- a/Master/texmf-dist/tex/generic/musixtex/musixplt.tex
+++ b/Master/texmf-dist/tex/generic/musixtex/musixplt.tex
@@ -21,98 +21,89 @@
% the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
% Boston, MA 02111-1307, USA.
%
-% Copyright 2015 Bob Tennent rdt@cs.queensu.ca
+% Copyright 2015-2016 Bob Tennent rdt@cs.queensu.ca
%
-\immediate\write16{MusiXplt\space<2015/07/25>}
+\immediate\write16{MusiXplt\space<2016/02/22>}
%
% 7pt roman, bold, italic, bold italic, slanted and small-cap
\font\sevenrm=pplr8t at 7pt
\font\sevenbf=pplb8t at 7pt
\font\sevenit=pplri8t at 7pt
\font\sevenbi=pplbi8t at 7pt
-\font\sevensc=pplrc8t at 7pt
-\font\sevensl=pplro8t at 7pt
+\font\sevensc=pplrc9d at 7pt
%
% 8pt roman, bold, italic, bold italic, slanted and small-cap
\font\eightrm=pplr8t at 8pt
\font\eightbf=pplb8t at 8pt
\font\eightit=pplri8t at 8pt
\font\eightbi=pplbi8t at 8pt
-\font\eightsc=pplrc8t at 8pt
-\font\eightsl=pplro8t at 8pt
+\font\eightsc=pplrc9d at 8pt
%
% 9pt
\font\ninerm=pplr8t at 9pt
\font\ninebf=pplb8t at 9pt
\font\nineit=pplri8t at 9pt
\font\ninebi=pplbi8t at 9pt
-\font\ninesc=pplrc8t at 9pt
-\font\ninesl=pplro8t at 9pt
+\font\ninesc=pplrc9d at 9pt
%
% 10pt
\font\tenrm=pplr8t at 10pt
\font\tenbf=pplb8t at 10pt
\font\tenit=pplri8t at 10pt
\font\tenbi=pplbi8t at 10pt
-\font\tensc=pplrc8t at 10pt
-\font\tensl=pplro8t at 10pt
+\font\tensc=pplrc9d at 10pt
%
% 11pt
-\font\elevenrm=pplr8t at 11pt
-\font\elevenbf=pplb8t at 11pt
-\font\elevenit=pplri8t at 11pt
-\font\elevenbi=pplbi8t at 11pt
-\font\elevensc=pplrc8t at 11pt
-\font\elevensl=pplro8t at 11pt
+\font\elevenrm=pplr8t scaled \magstephalf
+\font\elevenbf=pplb8t scaled \magstephalf
+\font\elevenit=pplri8t scaled \magstephalf
+\font\elevenbi=pplbi8t scaled \magstephalf
+\font\elevensc=pplrc9d scaled \magstephalf
%
% 12pt
-\font\twelverm=pplr8t at 12pt
-\font\twelvebf=pplb8t at 12pt
-\font\twelveit=pplri8t at 12pt
-\font\twelvebi=pplbi8t at 12pt
-\font\twelvesc=pplrc8t at 12pt
-\font\twelvesl=pplro8t at 12pt
+\font\twelverm=pplr8t scaled \magstep1
+\font\twelvebf=pplb8t scaled \magstep1
+\font\twelveit=pplri8t scaled \magstep1
+\font\twelvebi=pplbi8t scaled \magstep1
+\font\twelvesc=pplrc9d scaled \magstep1
%
% 14pt
-\font\frtrm=pplr8t at 14pt
-\font\frtbf=pplb8t at 14pt
-\font\frtit=pplri8t at 14pt
-\font\frtbi=pplbi8t at 14pt
-\font\frtsc=pplrc8t at 14pt
-\font\frtsl=pplro8t at 14pt
+\font\frtrm=pplr8t scaled \magstep2
+\font\frtbf=pplb8t scaled \magstep2
+\font\frtit=pplri8t scaled \magstep2
+\font\frtbi=pplbi8t scaled \magstep2
+\font\frtsc=pplrc9d scaled \magstep2
%
% 17pt
-\font\svtrm=pplr8t at 17pt
-\font\svtbf=pplb8t at 17pt
-\font\svtit=pplri8t at 17pt
-\font\svtbi=pplbi8t at 17pt
-\font\svtsc=pplrc8t at 17pt
-\font\svtsl=pplro8t at 17pt
+\font\svtrm=pplr8t scaled \magstep3
+\font\svtbf=pplb8t scaled \magstep3
+\font\svtit=pplri8t scaled \magstep3
+\font\svtbi=pplbi8t scaled \magstep3
+\font\svtsc=pplrc9d scaled \magstep3
%
% 20pt
-\font\twtyrm=pplr8t at 20pt
-\font\twtybf=pplb8t at 20pt
-\font\twtyit=pplri8t at 20pt
-\font\twtybi=pplbi8t at 20pt
-\font\twtysc=pplrc8t at 20pt
-\font\twtysl=pplro8t at 20pt
+\font\twtyrm=pplr8t scaled \magstep4
+\font\twtybf=pplb8t scaled \magstep4
+\font\twtyit=pplri8t scaled \magstep4
+\font\twtybi=pplbi8t scaled \magstep4
+\font\twtysc=pplrc9d scaled \magstep4
%
% 25pt
-\font\twfvrm=pplr8t at 25pt
-\font\twfvbf=pplb8t at 25pt
-\font\twfvit=pplri8t at 25pt
-\font\twfvbi=pplbi8t at 25pt
-\font\twfvsc=pplrc8t at 25pt
-\font\twfvsl=pplro8t at 25pt
-%
-% Large fonts for titles
-% (If you prefer bold, use ..bf instead of ..sc)
-% (If you prefer roman, use ..rm instead of ..sc)
-\let\bigfont=\frtsc
-\let\Bigfont=\svtsc
-\let\BIgfont=\twtysc
-\let\BIGfont=\twfvsc
+\font\twfvrm=pplr8t scaled \magstep5
+\font\twfvbf=pplb8t scaled \magstep5
+\font\twfvit=pplri8t scaled \magstep5
+\font\twfvbi=pplbi8t scaled \magstep5
+\font\twfvsc=pplrc9d scaled \magstep5
+%
+%
+% large fonts for titles
+% (If you prefer bold, use \bf)
+% (If you prefer roman, use \rm)
%
+\def\bigtype{\bigfont\sc}
+\def\Bigtype{\Bigfont\sc}
+\def\BIgtype{\BIgfont\sc}
+\def\BIGtype{\BIGfont\sc}
%
\font\ppfftwelve=pplbi8t at 8pt
\font\ppffsixteen=pplbi8t at 10pt
@@ -120,11 +111,6 @@
\font\ppfftwentyfour=pplbi8t at 14pt
\font\ppfftwentynine=pplbi8t at 17pt
%
-\def\tinydyn{\let\ppff\ppfftwelve} % version 1.18 RDT
-\def\smalldyn{\let\ppff\ppffsixteen}
-\def\normdyn{\let\ppff\ppfftwenty}
-\def\meddyn{\let\ppff\ppfftwentyfour}
-%
\def\f{{\ppff f}}
\def\ff{{\ppff ff}}
\def\fp{{\ppff fp}}
@@ -135,7 +121,20 @@
\def\pp{{\ppff pp}}
\def\ppp{{\ppff ppp}}
\def\pppp{{\ppff pppp}}
-
+%
+%
+% sl fonts needed by musixsty
+%
+\font\eightsl=pplro8t at 8pt
+\font\ninesl=pplro8t at 9pt
+\font\tensl=pplro8t at 10pt
+\font\twelvesl=pplro8t scaled \magstep1
+\font\frtsl=pplro8t scaled \magstep2
+\font\svtsl=pplro8t scaled \magstep3
+\font\twtysl=pplro8t scaled \magstep4
+\font\twfvsl=pplro8t scaled \magstep5
+%
+%
\edef\catcodeat{\the\catcode`\@}\catcode`\@=11
%
\def\sF{{\ppff s\p@kern f}}
@@ -144,72 +143,9 @@
\def\mp@{{\ppff mp}}
\let\mezzopiano\mp@
+
\catcode`\@=\catcodeat
-\def\smalltype{%
- \let\rm\eightrm
- \let\bf\eightbf
- \let\it\eightit
- \let\bi\eightbi
- \let\sc\eightsc
- \let\sl\eightsl
- \rm}
-\def\Smalltype{%
- \let\rm\ninerm
- \let\bf\ninebf
- \let\it\nineit
- \let\bi\ninebi
- \let\sc\ninesc
- \let\sl\ninesl
- \rm}
-\def\normtype{%
- \let\rm\tenrm
- \let\bf\tenbf
- \let\it\tenit
- \let\bi\tenbi
- \let\sc\tensc
- \let\sl\tensl
- \rm}
-\def\medtype{%
- \let\rm\twelverm
- \let\bf\twelvebf
- \let\it\twelveit
- \let\bi\twelvebi
- \let\sc\twelvesc
- \let\sl\twelvesl
- \rm}
-\def\bigtype{%
- \let\rm\bigfont
- \let\bf\bigfont
- \let\it\bigfont
- \let\bi\bigfont
- \let\sc\bigfont
- \let\sl\bigfont
- \sc}
-\def\Bigtype{%
- \let\rm\Bigfont
- \let\bf\Bigfont
- \let\it\Bigfont
- \let\bi\Bigfont
- \let\sc\Bigfont
- \let\sl\Bigfont
- \sc}
-\def\BIgtype{%
- \let\rm\BIgfont
- \let\bf\BIgfont
- \let\it\BIgfont
- \let\bi\Bigfont
- \let\sc\Bigfont
- \let\sl\Bigfont
- \sc}
-\def\BIGtype{%
- \let\rm\BIGfont
- \let\bf\BIGfont
- \let\it\BIGfont
- \let\bi\BIGfont
- \let\sc\BIGfont
- \let\sl\BIGfont
- \sc}
%
% Redefine accented characters for etex, suggested by David Carlisle:
%
@@ -233,6 +169,13 @@
\expandafter\def\csname T1\string#1-\string#3\endcsname{\char#4\relax}}
\input t1enc.def
+
+\edef\catcodeat{\the\catcode`\@}\catcode`\@=11
+% \c needs special treatment
+\def\c#1{\leavevmode\ifx c#1\char231 \else\setbox\z@\hbox{#1}\ifdim\ht\z@=1ex\accent11 #1%
+ \else{\ooalign{\unhbox\z@\crcr
+ \hidewidth\char11\hidewidth}}\fi\fi}
+\catcode`\@=\catcodeat
\fi
\normtype
diff --git a/Master/texmf-dist/tex/generic/musixtex/musixsty.tex b/Master/texmf-dist/tex/generic/musixtex/musixsty.tex
index bfd01023565..8683e39ed54 100644
--- a/Master/texmf-dist/tex/generic/musixtex/musixsty.tex
+++ b/Master/texmf-dist/tex/generic/musixtex/musixsty.tex
@@ -69,6 +69,7 @@
\font\twfvi=cmmi12 scaled \magstep4 \skewchar\twfvi='177
\font\twfvsy=cmsy10 scaled \magstep5 \skewchar\twfvsy='60
%
+%
% SEVERAL DIFFERENT POINT SIZES
%
\def\Twfvpoint{\normalbaselineskip=30pt
diff --git a/Master/texmf-dist/tex/generic/musixtex/musixtex.tex b/Master/texmf-dist/tex/generic/musixtex/musixtex.tex
index 44377fda165..20013df4b23 100644
--- a/Master/texmf-dist/tex/generic/musixtex/musixtex.tex
+++ b/Master/texmf-dist/tex/generic/musixtex/musixtex.tex
@@ -25,15 +25,34 @@
\def\mufl@x{0.83}%
\def\mxmajorvernumber{1}
-\def\mxminorvernumber{20}
+\def\mxminorvernumber{22}
\def\mxvernumber{\mxmajorvernumber\mxminorvernumber}% make it possible to compare with \ifnum
\def\mxversuffix{}%
\edef\mxversion{\mxmajorvernumber.\mxminorvernumber\mxversuffix}
-\def\mxdate{2015-12-13}
+\def\mxdate{2016-02-24}
\immediate\write16{MusiXTeX(c) \mxversion\space<\mxdate>}%
\everyjob{\immediate\write16{MusiXTeX(c) \mxversion\space<\mxdate>}}%
+% version 1.22
+
+% bi and sc font definitions added; sl and tt definitions for musixsty moved
+% explicit font choices for \txtfont replaced by generic commands \smalltype\it etc.
+% \pdlud \halfwidthbigwedge and \raise-height font-dependent
+% \cbreath and \zbreath use \BIGtype rather than \BIGfont
+
+
+% version 1.21
+
+% RDT adjusted the offsets and/or vertical positions for some tremolos
+% RDT moved \lastbarpos\lin@pos after calls to \Writ@meters
+% to correct \centerbar positioning
+% RDT copied the definition of \Hpause from musixlit.tex
+% RDT introduced \Changeclefs, \cHpause and \centerHpause
+% RDT replaced \smalltype\it by \txtfont in octave clef commands
+% RDT moved definitions of \txtfont into \comput@fonts
+% RDT added support for piano-pedal bracket notation
+
% version 1.20
% RDT re-defined tremolo commands to allow for numerical pitches;
@@ -41,8 +60,10 @@
% version 1.19:
-% RDT corrected typos in the definition of \comput@fonts affecting ppff fonts for \Largemusicsize
+% RDT corrected typos in the definition of \comput@fonts
+% affecting ppff fonts for \Largemusicsize
% RDT introduced definitions for tremolo commands \trml, \trmu, etc.
+% RDT turned off lyrics for \metron and \metronequiv notes
% version 1.18:
@@ -560,168 +581,173 @@
\def\fontid{cm} % deprecated but used in pmx.tex
%%
-% Seven point fonts: roman, bold, and italic.
+% Seven point fonts
%%
-%\ifx\undefined\sevenrm % version 1.17 RDT unconditional font definitions
- \font\sevenrm=cmr7
- \font\sevenbf=cmbx7
- \font\sevenit=cmti7
-%\fi
+\font\sevenrm=cmr7
+\font\sevenbf=cmbx7
+\font\sevenit=cmti7
+\font\sevenbi=cmbxti10 at 7pt % version 1.22 RDT
+\font\sevensc=cmcsc10 at 7pt
%%
-% Eight point fonts: roman, bold, and italic; tt and sl needed for musixsty
+% Eight point fonts
%%
-%\ifx\undefined\eightrm
- \font\eightrm=cmr8
- \font\eightbf=cmbx8
- \font\eightit=cmti8
- \font\eighttt=cmtt8
- \font\eightsl=cmsl8
-%\fi
+\font\eightrm=cmr8
+\font\eightbf=cmbx8
+\font\eightit=cmti8
+\font\eightbi=cmbxti10 at 8pt % version 1.22 RDT
+\font\eightsc=cmcsc10 at 8pt
%%
% Nine point fonts
%%
-%\ifx\undefined\ninerm
- \font\ninerm=cmr9
- \font\ninebf=cmbx9
- \font\nineit=cmti9
- \font\ninett=cmtt9
- \font\ninesl=cmsl9
-%\fi
+\font\ninerm=cmr9
+\font\ninebf=cmbx9
+\font\nineit=cmti9
+\font\ninebi=cmbxti10 at 9pt % version 1.22 RDT
+\font\ninesc=cmcsc10 at 9pt
%%
% Ten point fonts
%%
-%\ifx\undefined\tenrm
- \font\tenrm=cmr10
- \font\tenbf=cmbx10
- \font\tenit=cmti10
- \font\tentt=cmtt10
- \font\tensl=cmsl10
-%\fi
-
+\font\tenrm=cmr10
+\font\tenbf=cmbx10
+\font\tenit=cmti10
+\font\tenbi=cmbxti10 % version 1.22 RDT
+\font\tensc=cmcsc10
%%
% Eleven point fonts
%%
-%\ifx\undefined\elevenrm
- \font\elevenrm=cmr9 scaled \magstephalf
- \font\elevenbf=cmbx9 scaled \magstephalf
- \font\elevenit=cmti9 scaled \magstephalf
- \font\eleventt=cmtt9 scaled \magstephalf
- \font\elevensl=cmsl9 scaled \magstephalf
-%\fi
+\font\elevenrm=cmr9 scaled \magstephalf
+\font\elevenbf=cmbx9 scaled \magstephalf
+\font\elevenit=cmti9 scaled \magstephalf
+\font\elevenbi=cmbxti10 at 11pt % version 1.22 RDT
+\font\elevensc=cmcsc10 at 11pt
%%
% Twelve point fonts
%%
-%\ifx\undefined\twelverm
- \font\twelverm=cmr12
- \font\twelvebf=cmbx12
- \font\twelveit=cmti12
- \font\twelvett=cmtt12
- \font\twelvesl=cmsl12
-%\fi
-
-% 14pt: roman, bold, italic and small caps; tt and sl needed for musixsty
-%\ifx\undefined\frtrm
- \font\frtrm=cmr12 scaled \magstep1
- \font\frtbf=cmbx12 scaled \magstep1
- \font\frtit=cmti12 scaled \magstep1
- \font\frtsc=cmcsc10 scaled \magstep2
- \font\frttt=cmtt12 scaled \magstep1
- \font\frtsl=cmsl12 scaled \magstep1
-%\fi
+\font\twelverm=cmr12
+\font\twelvebf=cmbx12
+\font\twelveit=cmti12
+\font\twelvebi=cmbxti10 scaled \magstep1 % version 1.22 RDT
+\font\twelvesc=cmcsc10 scaled \magstep1
+
+% 14pt fonts
+\font\frtrm=cmr12 scaled \magstep1
+\font\frtbf=cmbx12 scaled \magstep1
+\font\frtit=cmti12 scaled \magstep1
+\font\frtsc=cmcsc10 scaled \magstep2
+\font\frtbi=cmbxti10 scaled \magstep2 % version 1.22 RDT
%
% 17pt
-%\ifx\undefined\svtrm
- \font\svtrm=cmr12 scaled \magstep2
- \font\svtbf=cmbx12 scaled \magstep2
- \font\svtit=cmti12 scaled \magstep2
- \font\svtsc=cmcsc10 scaled \magstep3
- \font\svttt=cmtt12 scaled \magstep2
-%\fi
+\font\svtrm=cmr12 scaled \magstep2
+\font\svtbf=cmbx12 scaled \magstep2
+\font\svtit=cmti12 scaled \magstep2
+\font\svtsc=cmcsc10 scaled \magstep3
+\font\svtbi=cmbxti10 scaled \magstep3
%
% 20pt
-%\ifx\undefined\twtyrm
- \font\twtyrm=cmr12 scaled \magstep3
- \font\twtybf=cmbx12 scaled \magstep3
- \font\twtyit=cmti12 scaled \magstep3
- \font\twtysc=cmcsc10 scaled \magstep4
- \font\twtytt=cmtt12 scaled \magstep3
- \font\twtysl=cmsl12 scaled \magstep3
-%\fi
+\font\twtyrm=cmr12 scaled \magstep3
+\font\twtybf=cmbx12 scaled \magstep3
+\font\twtyit=cmti12 scaled \magstep3
+\font\twtysc=cmcsc10 scaled \magstep4
+\font\twtybi=cmbxti10 scaled \magstep4 % version 1.22 RDT
%
% 25pt
-%\ifx\undefined\twfvrm
- \font\twfvrm=cmr12 scaled \magstep4
- \font\twfvbf=cmbx12 scaled \magstep4
- \font\twfvit=cmti12 scaled \magstep4
- \font\twfvsc=cmcsc10 scaled \magstep5
- \font\twfvtt=cmtt12 scaled \magstep4
- \font\twfvsl=cmsl12 scaled \magstep4
-%\fi
-%
-% Large fonts for titles
-% (If you prefer Roman, use ..rm instead of ..bf)
-% (If you prefer small-caps, use ..sc instead of ..bf)
-\let\bigfont=\frtbf
-\let\Bigfont=\svtbf
-\let\BIgfont=\twtybf
-\let\BIGfont=\twfvbf
+\font\twfvrm=cmr12 scaled \magstep4
+\font\twfvbf=cmbx12 scaled \magstep4
+\font\twfvit=cmti12 scaled \magstep4
+\font\twfvsc=cmcsc10 scaled \magstep5
+\font\twfvbi=cmbxti10 scaled \magstep5 % version 1.22 RDT
%
%%
%%
-% Define six font families.
+% Define five font families
%%
-
+\def\tinytype{%
+ \let\rm\sevenrm
+ \let\bf\sevenbf
+ \let\it\sevenit
+ \let\bi\sevenbi
+ \let\sc\sevensc
+ \rm}
\def\smalltype{%
\let\rm\eightrm
\let\bf\eightbf
\let\it\eightit
+ \let\bi\eightbi
+ \let\sc\eightsc
\rm}
\def\Smalltype{%
\let\rm\ninerm
\let\bf\ninebf
\let\it\nineit
+ \let\bi\ninebi
+ \let\sc\ninesc
\rm}
\def\normtype{%
\let\rm\tenrm
\let\bf\tenbf
\let\it\tenit
+ \let\bi\tenbi
+ \let\sc\tensc
\rm}
\def\medtype{%
\let\rm\twelverm
\let\bf\twelvebf
\let\it\twelveit
+ \let\bi\twelvebi
+ \let\sc\twelvesc
\rm}
-\def\bigtype{%
- \let\rm\bigfont
- \let\bf\bigfont
- \let\it\bigfont
+%
+% four font families at big/Big/BIg/BIG sizes
+% default is \bf here and in musixec, but \sc in musixplt, \rm in musixtmr
+%
+\def\bigfont{%
+ \let\rm\frtrm
+ \let\bf\frtbf
+ \let\it\frtit
+ \let\sc\frtsc
+ \let\bi\frtbi
\bf}
-\def\Bigtype{%
- \let\rm\Bigfont
- \let\bf\Bigfont
- \let\it\Bigfont
+\def\Bigfont{%
+ \let\rm\svtrm
+ \let\bf\svtbf
+ \let\it\svtit
+ \let\sc\svtsc
+ \let\bi\svtbi
\bf}
-\def\BIgtype{%
- \let\rm\BIgfont
- \let\bf\BIgfont
- \let\it\BIgfont
+\def\BIgfont{%
+ \let\rm\twtyrm
+ \let\bf\twtybf
+ \let\it\twtyit
+ \let\sc\twtysc
+ \let\bi\twtybi
\bf}
-\def\BIGtype{%
- \let\rm\BIGfont
- \let\bf\BIGfont
- \let\it\BIGfont
+\def\BIGfont{%
+ \let\rm\twfvrm
+ \let\bf\twfvbf
+ \let\it\twfvit
+ \let\sc\twfvsc
+ \let\bi\twfvbi
\bf}
-%
%%
+% large fonts for titles
+% (If you prefer Roman, use \rm)
+% (If you prefer small-caps, use \sc)
+%
+\def\bigtype{\bigfont\bf} % default for "big" fonts is \bf
+\def\Bigtype{\Bigfont\bf}
+\def\BIgtype{\BIgfont\bf}
+\def\BIGtype{\BIGfont\bf}
+%
+%
% Bold italic fonts for dynamic markings.
%%
@@ -736,10 +762,11 @@
\else\ifdim\internote<1.19\Internote\normppff%
\else\medppff\fi\fi\fi}%
-\def\tinydyn{\let\ppff\tinyppff} % version 1.17 RDT
-\def\smalldyn{\let\ppff\smallppff}
-\def\normdyn{\let\ppff\normppff}
-\def\meddyn{\let\ppff\medppff}
+
+\def\tinydyn{\let\ppff\ppfftwelve} % version 1.18 RDT
+\def\smalldyn{\let\ppff\ppffsixteen}
+\def\normdyn{\let\ppff\ppfftwenty}
+\def\meddyn{\let\ppff\ppfftwentyfour}
\font\musiceleven=musix11
@@ -749,6 +776,31 @@
\font\musictwentyfour=musix24
\font\musictwentynine=musix29
+
+%
+% tt fonts needed by musixsty % version 1.22 RDT
+%
+\font\eighttt=cmtt8
+\font\ninett=cmtt9
+\font\tentt=cmtt10
+\font\twelvett=cmtt12
+\font\frttt=cmtt12 scaled \magstep1
+\font\svttt=cmtt12 scaled \magstep2
+\font\twtytt=cmtt12 scaled \magstep3
+\font\twfvtt=cmtt12 scaled \magstep4
+%
+%
+% sl fonts needed by musixsty % version 1.22 RDT
+%
+\font\eightsl=cmsl8
+\font\ninesl=cmsl9
+\font\tensl=cmsl10
+\font\twelvesl=cmsl12
+\font\frtsl=cmsl12 scaled \magstep1
+\font\svtsl=cmsl12 scaled \magstep2
+\font\twtysl=cmsl12 scaled \magstep3
+\font\twfvsl=cmsl12 scaled \magstep4
+
% piano brackets, slides, guitar chords, lines, (de)crescendi, circles
\font\mxsps=musixspx
@@ -1355,6 +1407,9 @@
% terminate slur #1 reference number #2 end note
% the various types only influence the horizontal offset, if you want to
% terminate a \ibslur with a \tslur it becomes a little bit tricky
+%%
+%% RDT: the "trick", whatever it is, doesn't seem to be working !!!!!
+%% e.g. \Notes\ibsluru1g\qa g\ha l\sk\zq g\zq i\tslur1k\qu k\en
\def\tslur{\t@slur\h@lf}
\def\tsslur{\t@slur{-\p@ne}}
@@ -1582,6 +1637,10 @@
\let\smallppff\ppfftwelve
\let\normppff\ppffsixteen
\let\medppff\ppfftwenty
+ \def\txtfont{\ifdim\internote<.95\Internote \tinytype\it % version 1.22 RDT
+ \else\ifdim\internote<1.19\Internote \smalltype\it
+ \else\ifdim\internote<1.43\Internote \Smalltype\it
+ \else\normtype\it\fi\fi\fi}%
\else\ifnum\musicsize=\@xxiv
\let\musicLargefont\musictwentynine
\let\musiclargefont\musictwentynine
@@ -1602,6 +1661,10 @@
\let\smallppff\ppfftwenty
\let\normppff\ppfftwentyfour
\let\medppff\ppfftwentynine
+ \def\txtfont{\ifdim\internote<.95\Internote \smalltype\it % version 1.22 RDT
+ \else\ifdim\internote<1.19\Internote \Smalltype\it
+ \else\ifdim\internote<1.43\Internote \normtype\it
+ \else\medtype\it\fi\fi\fi}%
\else\ifnum\musicsize=\@xxix
\let\musicLargefont\musictwentynine
\let\musiclargefont\musictwentynine
@@ -1624,6 +1687,10 @@
\let\smallppff\ppfftwentyfour
\let\normppff\ppfftwentynine
\let\medppff\ppfftwentynine
+ \def\txtfont{\ifdim\internote<.95\Internote \normtype\it % version 1.22 RDT
+ \else\ifdim\internote<1.19\Internote \medtype\it
+ \else\ifdim\internote<1.43\Internote \bigfont\it
+ \else\Bigfont\it\fi\fi\fi}%
\else
\ifnum\musicsize=\tw@nty
\else\ifnum\musicsize=\z@
@@ -1650,6 +1717,10 @@
\let\smallppff\ppffsixteen
\let\normppff\ppfftwenty
\let\medppff\ppfftwentyfour
+ \def\txtfont{\ifdim\internote<.95\Internote \smalltype\it
+ \else\ifdim\internote<1.19\Internote \Smalltype\it
+ \else\ifdim\internote<1.43\Internote \normtype\it
+ \else\medtype\it\fi\fi\fi}%
\fi\fi\fi}%
\def\comput@specifics{\comput@fonts\comput@sizes}
@@ -1976,11 +2047,12 @@
\noexpand\startpiece }%
\fi
\barsinpi@c@\z@ \piece@begina \leavevmode \piece@beginb
- \piece@beginc \fil@begin \Writ@meters
+ \piece@beginc \fil@begin \Writ@meters\lastbarpos\lin@pos %%% 1.21: added \lastbarno setting
\let\volta@set\empty % tells the kind of volta setting at next bar
\let\volta@cut\empty % flag to tell that a volta has been cut at line end
\let\volta@type\empty % the current volta setting (same defs as \volta@set)
\let\endvolta@set\empty % tells the kind of volta closing at next bar
+ \let\pdl@cut\empty % flag to signal a pedal rule has been cut at the end of a line % 1.21 RDT
}
\let\everystaff\empty
@@ -1994,7 +2066,7 @@
\comp@internote \leavevmode \barsinlin@\z@ }
\def\contpiece{\noindent \piece@conta \writ@staffs \piece@beginc
- \Writ@meters \wbarno@x \addspace\afterruleskip
+ \Writ@meters \wbarno@x\lastbarpos\lin@pos\addspace\afterruleskip %%% 1.21: added \lastbarno setting
}
% like contpiece but with indentation (parindent) and instrument names
@@ -2002,7 +2074,8 @@
\let\fil@indent\empty
\def\Contpiece{\piece@conta \piece@beginb \fil@indent \piece@beginc
- \Writ@meters}
+ \Writ@meters\lastbarpos\lin@pos} %%% 1.21: added \lastbarno setting
+
%%% end score
@@ -2011,6 +2084,12 @@
\def\z@suspend{%
\z@suspend@autoflag % used in musixcpt only
+% cut pedal rule 1.21 RDT
+ \ifdim\pdl@pos=\z@\else%
+ \noport@@\z@
+ \znotes\selectinstrument{\pdl@instr}\selectstaff{\pdl@staff}\pdlc@\en%
+ \global\def\pdl@cut{\@one}%
+ \fi
% cutvolta
\write@volta@hrule
\ifx\volta@type\tw@\let\volta@set\tw@ \let\volta@type\empty
@@ -2073,7 +2152,8 @@
\let\T@bil\iftrue \let\everyst@ff\everystaff \let\fil@spc\empty
\let\fil@termskip\empty \let\fil@signs\empty \let\fil@barno\empty
\let\leftrepeat\leftrepeat@II \let\leftrightrepeat\leftrightrepeat@II
- \piece@beginc\Writ@meters\addspace\afterruleskip}
+ \piece@beginc\Writ@meters\lastbarpos\lin@pos\let\pdl@cut\empty\addspace\afterruleskip}
+ %%% 1.21: added \lastbarno and \pdl@cut settings
% enable left and right extracts (e.g. for footnotes)
@@ -2126,7 +2206,7 @@
\def\writethebarno{\fontbarno\the\barno\kernm\qn@width}
\def\fontbarno{\it}
-\def\wbarno@x{\lastbarpos\lin@pos
+\def\wbarno@x{%%%% version 1.21: RDT moved \lastbarpos\lin@pos after calls to \Writ@meters
\ifx\volta@set\empty
\n@iii\barno \divide\n@iii\freqbarno\relax
\ifnum\n@iii=\lastbarno
@@ -2142,6 +2222,10 @@
\fi
\write@volta
\fi
+ \ifx\pdl@cut\empty % 1.21 RDT
+ \else% pedal rule was cut at the end of the previous line
+ \global\pdl@pos\lin@pos\let\pdl@cut\empty % reset \ped@pos
+ \fi
\b@rrul@ %+simick
\n@iii\barno \divide\n@iii\freqbarno\relax \lastbarno\n@iii }
@@ -2303,7 +2387,8 @@
\let\Writ@newsigns\empty
\def\updat@context{\writ@newclefs
- \T@bil \wbarno@x\Writ@newsigns\Writ@meters\addspace\afterruleskip
+ \T@bil \wbarno@x\Writ@newsigns\Writ@meters\lastbarpos\lin@pos\addspace\afterruleskip
+%%% 1.21: added \lastbarno setting
\else\Writ@newsigns\z@suspend\contpiece \fi}
\def\changecontext{\showallbarrules\n@wbar\updat@context}
@@ -2345,7 +2430,7 @@
% \write@volta@hrule %-simick
}%
-\def\@bar{\n@wbar\wbarno@x\addspace\afterruleskip}
+\def\@bar{\n@wbar\wbarno@x\lastbarpos\lin@pos\addspace\afterruleskip}
\def\zn@wbar{\t@rmskip\advance\barsinpi@c@\@ne \let\z@sw\@ne}
@@ -2673,25 +2758,31 @@
\def\smallbassclef{\keychar74}
\def\smallaltoclef{\keychar76}
-\def\trebleoct{\trebleclef\raise 9\internote\hbox\@to\z@{\smalltype\it\kern -1.8\Interligne 8\hss}}
-\def\bassoct{\bassclef\raise 2\internote\hbox\@to\z@{\smalltype\it\kern -2.3\Interligne 8\hss}}
-\def\treblelowoct{\trebleclef\raise -7\internote\hbox\@to\z@{\smalltype\it\kern -2.3\Interligne 8\hss}}
-\def\basslowoct{\bassclef\raise -6\internote\hbox\@to\z@{\smalltype\it\kern -2.5\Interligne 8\hss}}
+%% version 1.21: replaced \smalltype\it by \txtfont (size-dependent)
+%% and adjusted the kerns RDT
+%%
+
+\def\trebleoct{\trebleclef\raise 9\internote\hbox\@to\z@{\txtfont\kern -3.6\internote 8\hss}}
+\def\bassoct{\bassclef\raise 2\internote\hbox\@to\z@{\txtfont\kern -4.6\internote 8\hss}}
+\def\treblelowoct{\trebleclef\raise -7.5\internote\hbox\@to\z@{\txtfont\kern -4.6\internote 8\hss}}
+\def\basslowoct{\bassclef\raise -6\internote\hbox\@to\z@{\txtfont\kern -5.0\internote 8\hss}}
% [version 1.15] reqest from Hermann Hinsch
-\def\smalltrebleoct{\smalltrebleclef\raise 7.2\internote\hbox\@to\z@{\smalltype\it\kern -1.8\Interligne 8\hss}}
-\def\smalltreblelowoct{\smalltrebleclef\raise-6.8\internote\hbox\@to\z@{\smalltype\it\kern -2.1\Interligne 8\hss}}
-\def\smallbassoct{\smallbassclef\raise 2\internote\hbox\@to\z@{\smalltype\it\kern -2.0\Interligne 8\hss}}
-\def\smallbasslowoct{\smallbassclef\raise-6.2\internote\hbox\@to\z@{\smalltype\it\kern -2.2\Interligne 8\hss}}
+\def\smalltrebleoct{\smalltrebleclef\raise 7.2\internote\hbox\@to\z@{\txtfont\kern -3.6\internote 8\hss}}
+\def\smalltreblelowoct{\smalltrebleclef\raise-6.8\internote\hbox\@to\z@{\txtfont\kern -4.2\internote 8\hss}}
+\def\smallbassoct{\smallbassclef\raise 2\internote\hbox\@to\z@{\txtfont\kern -4.0\internote 8\hss}}
+\def\smallbasslowoct{\smallbassclef\raise-6.5\internote\hbox\@to\z@{\txtfont\kern -4.4\internote 8\hss}}
% [version 1.15] reqest from Hermann Hinsch: end
\newskip\clef@skip
\def\changeclefs{\t@rmskip\writ@newclefs}
-
\def\zchangeclefs{\t@rmskip\zwrit@newclefs}
+%%% version 1.21: new command to call and reset \atnextbar before outputting new clefs RDT
+\def\Changeclefs{\t@rmskip\atnextbar\let\atnextbar\empty\writ@newclefs}
+
% since the characters are shifted by default(Metafont) they looked
% a little bit strange when you mix several staffstaffsizes (flushleft)
% I've introduced a hack(kern kernm), that they are (nearly) centered
@@ -3787,10 +3878,17 @@
\def\cPAuse{\hbox{\ccn{0}{\musixchar58}}}
\def\cPAUSe{\hbox{\ccn{0}{\musixchar59}}}
+\def\cHpause#1{% 1.21 RDT
+\y@ii\lin@pos \advance\y@ii-\lastbarpos%
+\def\v@rtpart{\hbox{\vrule width.6pt height1.5\internote depth1.5\internote}}%
+\def\h@rizpart{\hbox{\vrule width0.35\y@ii height.5\internote depth.5\internote}}%
+\raise4\internote\hbox{\v@rtpart\h@rizpart\ccn5{\meterfont{#1}}\h@rizpart\v@rtpart}}%
+
\def\centerpause{\centerbar{\cpause}}
\def\centerhpause{\centerbar{\chpause}}
\def\centerPAuse{\centerbar{\cPAuse}}
\def\centerPAUSe{\centerbar{\cPAUSe}}
+\def\centerHpause#1{\centerbar{\cHpause{#1}}}
\def\C@ps#1#2#3{\n@viii#3\multiply\n@viii\tw@
\advance\n@viii#2\raise\n@viii\internote \hbox{\musixchar#1}}
@@ -3849,6 +3947,11 @@
\def\hspp{\adv@restbox{\check@staff\ppt5\musixchar65\fi}}
\def\qqspp{\adv@restbox{\check@staff\ppt5\musixchar66\fi}}
+% copied from musixlit.tex: version 1.21 RDT
+
+\def\Hpause#1#2{\zcharnote{#1}{\def\s@r{%
+\vrule\@width.6\p@\@height1\h@lf\internote\@depth1\h@lf\internote}\s@r%
+\vrule\@width#2\noteskip\@height\h@lf\internote\@depth\h@lf\internote\s@r}}
%%% accidentals
@@ -4095,13 +4198,76 @@
\def\raiseped{-5}
\def\sPed{\musixchar34}
-\def\sPED{\zchar\raiseped\sPed}
+\def\sPED{%
+\zchar\raiseped\sPed%
+\getcurpos\advance\y@v1.6ex\global\pdl@pos\y@v%
+\xdef\pdl@instr{\the\noinstrum@nt}\xdef\pdl@staff{\the\noport@@}% save current instrument and staff
+}
+
\def\Ped{\musixchar35}
-\def\PED{\zchar\raiseped\Ped}
+\def\PED{%
+\zchar\raiseped\Ped%
+\getcurpos\advance\y@v2.8ex\global\pdl@pos\y@v%
+\xdef\pdl@instr{\the\noinstrum@nt}\xdef\pdl@staff{\the\noport@@}% save current instrument and staff
+}
\def\Dep{\musixchar33}
-\def\DEP{\zchar\raiseped\Dep}
+\def\DEP{%
+\zchar\raiseped\Dep%
+\global\pdl@pos\z@%
+}
\def\sDep{\musixchar104}
-\def\sDEP{\zchar\raiseped\sDep}
+\def\sDEP{%
+\zchar\raiseped\sDep%
+\global\pdl@pos\z@%
+}
+
+%%% pedal brackets version 1.21 RDT
+%%
+%% \pdld pedal down
+%% \pdlu pedal up
+%% \pdlud pedal up and immediately down
+
+\newdimen\pdl@pos % cursor position for pedal down
+\global\pdl@pos\z@
+
+\def\pdld{\hbox{\hroff{%
+\raise\raiseped\internote\hbox{\vrule height2ex depth0.5pt width0.5pt}%
+\getcurpos\global\pdl@pos\y@v%
+% save current instrument and staff
+\xdef\pdl@instr{\the\noinstrum@nt}\xdef\pdl@staff{\the\noport@@}%
+}}}%
+
+\def\pdlu{\hbox{\hroff{\getcurpos\advance\y@v-\pdl@pos%% compute length of horizontal rule
+\kern-\y@v%
+\raise\raiseped\internote\hbox{%
+\vrule height-0.5pt depth1pt width\y@v%
+\vrule height2ex depth0.5pt width0.5pt %% pedal up
+}}}%
+\global\pdl@pos\z@}%
+
+\newbox\bigwedgebox % 1.22 RDT
+\def\pdlud{\hbox{\hroff{\getcurpos\advance\y@v-\pdl@pos%% compute length of horizontal rule
+\kern-\y@v%
+\thinmuskip=2mu%
+\setbox\bigwedgebox=\hbox{$\!\bigwedge\!$}%
+\def\halfwidthbigwedge{0.5\wd\bigwedgebox}%
+\advance\y@v-\halfwidthbigwedge%
+\raise\raiseped\internote%
+\hbox{%
+\vrule height-0.5pt depth1pt width\y@v% draw horizontal rule
+\kern\halfwidthbigwedge%
+\raise0.33ex\lrlap{$\bigwedge$}% pedal up and down
+}%
+\getcurpos\advance\y@v\halfwidthbigwedge\global\pdl@pos\y@v%
+}}}%
+
+%% cut pedal rule at line end
+%%
+% compute length of horizontal rule
+\def\pdlc@{\getcurpos\advance\y@v-\pdl@pos%
+\kern-\y@v\raise\raiseped\internote\hbox{%
+\vrule height-0.5pt depth1pt width\y@v %% draw horizontal rule
+}}%
%%% fermata
@@ -4219,21 +4385,26 @@
%%% tremolos version 1.19 RDT
%%% based on code by Werner Icking and Andre van Ryckeghem
%%% version 1.20 RDT re-defined using \raise, suggested by JPC
+%%% version 1.21
+%%% RDT changed beam numbers to 5, suggested by JPC
+%%% RDT adjusted the vertical positions for 16th and 32nd tremolos
-\def\trml#1{\raise2\internote\hbox{\loffset{0.5}{\ibl0{#1}9}\roffset{0.5}{\tbl0}}}%
-\def\trmu#1{\raise-3\internote\hbox{\loffset{0.5}{\ibu0{#1}9}\roffset{0.5}{\tbu0}}}%
-\def\trrml#1{\raise2\internote\hbox{\loffset{0.5}{\ibbl0{#1}9}\roffset{0.5}{\tbl0}}}%
-\def\trrmu#1{\raise-3\internote\hbox{\loffset{0.5}{\ibbu0{#1}9}\roffset{0.5}{\tbu0}}}%
-\def\trrrml#1{\raise2\internote\hbox{\loffset{0.5}{\ibbbl0{#1}9}\roffset{0.5}{\tbl0}}}%
-\def\trrrmu#1{\raise-3\internote\hbox{\loffset{0.5}{\ibbbu0{#1}9}\roffset{0.5}{\tbu0}}}%
+\def\trml#1{\raise2\internote\hbox{\loffset{0.5}{\ibl5{#1}9}\roffset{0.5}{\tbl5}}}%
+\def\trmu#1{\raise-3\internote\hbox{\loffset{0.5}{\ibu5{#1}9}\roffset{0.5}{\tbu5}}}%
+\def\trrml#1{\raise3\internote\hbox{\loffset{0.5}{\ibbl5{#1}9}\roffset{0.5}{\tbl5}}}%
+\def\trrmu#1{\raise-4\internote\hbox{\loffset{0.5}{\ibbu5{#1}9}\roffset{0.5}{\tbu5}}}%
+\def\trrrml#1{\raise3\internote\hbox{\loffset{0.5}{\ibbbl5{#1}9}\roffset{0.5}{\tbl5}}}%
+\def\trrrmu#1{\raise-4\internote\hbox{\loffset{0.5}{\ibbbu5{#1}9}\roffset{0.5}{\tbu5}}}%
% whole notes are wider than quarter/half notes:
-\def\Trml#1{\raise2\internote\hbox{\loffset0{\ibl0{#1}9}\roffset{1.125}{\tbl0}}}%
-\def\Trmu#1{\raise-3\internote\hbox{\loffset{1.125}{\ibu0{#1}9}\roffset0{\tbu0}}}%
-\def\Trrml#1{\raise2\internote\hbox{\loffset0{\ibbl0{#1}9}\roffset{1.125}{\tbl0}}}%
-\def\Trrmu#1{\raise-3\internote\hbox{\loffset{1.125}{\ibbu0{#1}9}\roffset0{\tbu0}}}%
-\def\Trrrml#1{\raise2\internote\hbox{\loffset0{\ibbbl0{#1}9}\roffset{1.125}{\tbl0}}}%
-\def\Trrrmu#1{\raise-3\internote\hbox{\loffset{1.125}{\ibbbu0{#1}9}\roffset0{\tbu0}}}%
+% version 1.21 RDT adjusted the offsets and vertical positions
+
+\def\Trml#1{\raise3\internote\hbox{\ibl5{#1}9\roffset{1.25}{\tbl5}}}%
+\def\Trmu#1{\raise-4\internote\hbox{\loffset{1.1}{\ibu5{#1}9}\roffset{0.15}{\tbu5}}}%
+\def\Trrml#1{\raise3\internote\hbox{\ibbl5{#1}9\roffset{1.25}{\tbl5}}}%
+\def\Trrmu#1{\raise-4\internote\hbox{\loffset{1.1}{\ibbu5{#1}9}\roffset{0.15}{\tbu5}}}%
+\def\Trrrml#1{\raise3\internote\hbox{\ibbbl5{#1}9\roffset{1.25}{\tbl5}}}%
+\def\Trrrmu#1{\raise-4\internote\hbox{\loffset{1.1}{\ibbbu5{#1}9}\roffset{0.15}{\tbu5}}}%
%%% octave lines
@@ -4341,14 +4512,8 @@
\let\lyricson\relax
\let\lyricsoff\relax
\def\metron#1#2{{\lyricsoff\stemlength\f@ur\noteskip\t@n\p@ #1 1\ = #2\lyricson}}
-\def\metronequiv#1#2{{\stemlength\f@ur\noteskip\t@n\p@ #1 1\ = #2 1}}
-
+\def\metronequiv#1#2{{\lyricsoff\stemlength\f@ur\noteskip\t@n\p@ #1 1\ = #2 1\lyricson}}
-\def\txtfont{% % version 1.17 RDT
-\ifdim\internote<.95\Internote \sevenit
-\else\ifdim\internote<1.19\Internote \eightit
-\else\ifdim\internote<1.43\Internote \tenit
-\else\twelveit\fi\fi\fi}
\def\txt{3}
\def\xtuplet#1#2{\n@iv#1\advance\n@iv\m@ne {\sign@skip=\n@iv\noteskip
@@ -4492,9 +4657,9 @@
%\check
-\def\zbreath{\check@staff\raise\si@\internote\rlap{\BIGfont'}\fi}
+\def\zbreath{\check@staff\raise\si@\internote\rlap{\BIGtype'}\fi}
\def\cbreath{\check@staff\adv@box{\raise\si@\internote
- \hbox\@to\noteskip{\hss\BIGfont'\hss}}\fi}
+ \hbox\@to\noteskip{\hss\BIGtype'\hss}}\fi}
% The following macros can be used to surround a note by parentheses
% \l[r]par p produces a left[right] parenthesis at pitch p (Ian Collier)
diff --git a/Master/texmf-dist/tex/generic/musixtex/musixtmr.tex b/Master/texmf-dist/tex/generic/musixtex/musixtmr.tex
index dbf8552c5e0..59a49cb9214 100644
--- a/Master/texmf-dist/tex/generic/musixtex/musixtmr.tex
+++ b/Master/texmf-dist/tex/generic/musixtex/musixtmr.tex
@@ -13,14 +13,21 @@
%% Tokyo, Japan
%% URL(en): http://homepage1.nifty.com/kuuku/pub/musixtex/index-e.html
%% (jp): http://homepage1.nifty.com/kuuku/pub/musixtex/index.html
-%% Extensions: Bob Tennent (rdt@cs.queensu.ca) 2015-02-06
+%% Extensions: Bob Tennent (rdt@cs.queensu.ca) 2016-02-22
%%
%% reference: musixtex.tex (0.99) 268-508
%% MusiXTeX: (c) Daniel Taupin, et al.
%%
%% History: see trailer.
%
-\immediate\write16{MusiXTimesFonts\space<2015/07/25>}
+\immediate\write16{MusiXTimesFonts\space<2016/02/22>}
+%
+% 7pt roman, bold, italic, bold italic, slanted and small-cap
+\font\sevenrm=ptmr8t at 7pt
+\font\sevenbf=ptmb8t at 7pt
+\font\sevenit=ptmri8t at 7pt
+\font\sevenbi=ptmbi8t at 7pt
+\font\sevensc=ptmrc8t at 7pt % artificial small-caps
%
% 8pt roman, bold, italic, bold italic, slanted and small-cap
\font\eightrm=ptmr8t at 8pt
@@ -28,7 +35,6 @@
\font\eightit=ptmri8t at 8pt
\font\eightbi=ptmbi8t at 8pt
\font\eightsc=ptmrc8t at 8pt % artificial small-caps
-\font\eightsl=ptmro8t at 8pt
%
% 9pt
\font\ninerm=ptmr8t at 9pt
@@ -36,7 +42,6 @@
\font\nineit=ptmri8t at 9pt
\font\ninebi=ptmbi8t at 9pt
\font\ninesc=ptmrc8t at 9pt
-\font\ninesl=ptmro8t at 9pt
%
% 10pt
\font\tenrm=ptmr8t at 10pt
@@ -44,16 +49,14 @@
\font\tenit=ptmri8t at 10pt
\font\tenbi=ptmbi8t at 10pt
\font\tensc=ptmrc8t at 10pt
-\font\tensl=ptmro8t at 10pt
%
%
% 11pt
-\font\elevenrm=ptmr8t at 11pt
-\font\elevenbf=ptmb8t at 11pt
-\font\elevenit=ptmri8t at 11pt
-\font\elevenbi=ptmbi8t at 11pt
-\font\elevensc=ptmrc8t at 11pt
-\font\elevensl=ptmro8t at 11pt
+\font\elevenrm=ptmr8t scaled \magstephalf
+\font\elevenbf=ptmb8t scaled \magstephalf
+\font\elevenit=ptmri8t scaled \magstephalf
+\font\elevenbi=ptmbi8t scaled \magstephalf
+\font\elevensc=ptmrc8t scaled \magstephalf
%
% 12pt
\font\twelverm=ptmr8t scaled \magstep 1
@@ -61,7 +64,6 @@
\font\twelveit=ptmri8t scaled \magstep 1
\font\twelvebi=ptmbi8t scaled \magstep 1
\font\twelvesc=ptmrc8t scaled \magstep 1
-\font\twelvesl=ptmro8t scaled \magstep 1
%
% 14pt
\font\frtrm=ptmr8t scaled \magstep2
@@ -69,7 +71,6 @@
\font\frtit=ptmri8t scaled \magstep2
\font\frtbi=ptmbi8t scaled \magstep2
\font\frtsc=ptmrc8t scaled \magstep2
-\font\frtsl=ptmro8t scaled \magstep2
%
% 17pt
\font\svtrm=ptmr8t scaled \magstep3
@@ -77,7 +78,6 @@
\font\svtit=ptmri8t scaled \magstep3
\font\svtbi=ptmbi8t scaled \magstep3
\font\svtsc=ptmrc8t scaled \magstep3
-\font\svtsl=ptmro8t scaled \magstep3
%
% 20pt
\font\twtyrm=ptmr8t scaled \magstep4
@@ -85,7 +85,6 @@
\font\twtyit=ptmri8t scaled \magstep4
\font\twtybi=ptmbi8t scaled \magstep4
\font\twtysc=ptmrc8t scaled \magstep4
-\font\twtysl=ptmro8t scaled \magstep4
%
% 25pt
\font\twfvrm=ptmr8t scaled \magstep5
@@ -93,15 +92,15 @@
\font\twfvit=ptmri8t scaled \magstep5
\font\twfvbi=ptmbi8t scaled \magstep5
\font\twfvsc=ptmrc8t scaled \magstep5
-\font\twfvsl=ptmro8t scaled \magstep5
%
-% Large fonts for titles
-% (If you prefer Times-bold, use ..bf instead of ..rm)
-% (If you prefer small-caps, use ..sc instead of ..rm)
-\let\bigfont=\frtrm
-\let\Bigfont=\svtrm
-\let\BIgfont=\twtyrm
-\let\BIGfont=\twfvrm
+% large fonts for titles
+% (If you prefer Times-bold, use \bf)
+% (If you prefer small-caps, use \sc)
+%
+\def\bigtype{\bigfont\rm}
+\def\Bigtype{\Bigfont\rm}
+\def\BIgtype{\BIgfont\rm}
+\def\BIGtype{\BIGfont\rm}
%
%
\font\ppfftwelve=ptmbi8t at 8pt
@@ -110,10 +109,6 @@
\font\ppfftwentyfour=ptmbi8t scaled \magstep2
\font\ppfftwentynine=ptmbi8t scaled \magstep3
%
-\def\tinydyn{\let\ppff\ppfftwelve} % version 1.18 RDT
-\def\smalldyn{\let\ppff\ppffsixteen}
-\def\normdyn{\let\ppff\ppfftwenty}
-\def\meddyn{\let\ppff\ppfftwentyfour}
%
\def\f{{\ppff f}}
\def\ff{{\ppff ff}}
@@ -126,6 +121,21 @@
\def\ppp{{\ppff ppp}}
\def\pppp{{\ppff pppp}}
+
+%
+% sl fonts needed by musixsty
+%
+\font\eightsl=ptmro8t at 8pt
+\font\ninesl=ptmro8t at 9pt
+\font\tensl=ptmro8t at 10pt
+\font\twelvesl=ptmro8t scaled \magstep1
+\font\frtsl=ptmro8t scaled \magstep2
+\font\svtsl=ptmro8t scaled \magstep3
+\font\twtysl=ptmro8t scaled \magstep4
+\font\twfvsl=ptmro8t scaled \magstep5
+%
+%
+
\edef\catcodeat{\the\catcode`\@}\catcode`\@=11
%
\def\sF{{\ppff s\p@kern f}}
@@ -134,82 +144,6 @@
\def\mp@{{\ppff mp}}
\let\mezzopiano\mp@
-\catcode`\@=\catcodeat
-
-\def\smalltype{%
- \let\rm\eightrm
- \let\bf\eightbf
- \let\it\eightit
- \let\bi\eightbi
- \let\sc\eightsc
- \let\sl\eightsl
- \rm}
-\def\Smalltype{%
- \let\rm\ninerm
- \let\bf\ninebf
- \let\it\nineit
- \let\bi\ninebi
- \let\sc\ninesc
- \let\sl\ninesl
- \rm}
-\def\normtype{%
- \let\rm\tenrm
- \let\bf\tenbf
- \let\it\tenit
- \let\bi\tenbi
- \let\sc\tensc
- \let\sl\tensl
- \rm}
-\def\medtype{%
- \let\rm\twelverm
- \let\bf\twelvebf
- \let\it\twelveit
- \let\bi\twelvebi
- \let\sc\twelvesc
- \let\sl\twelvesl
- \rm}
-\def\bigtype{%
- \let\rm\bigfont
- \let\bf\bigfont
- \let\it\bigfont
- \let\bi\bigfont
- \let\sc\bigfont
- \let\sl\bigfont
- \rm}
-\def\Bigtype{%
- \let\rm\Bigfont
- \let\bf\Bigfont
- \let\it\Bigfont
- \let\bi\Bigfont
- \let\sc\Bigfont
- \let\sl\Bigfont
- \rm}
-\def\BIgtype{%
- \let\rm\BIgfont
- \let\bf\BIgfont
- \let\it\BIgfont
- \let\bi\Bigfont
- \let\sc\Bigfont
- \let\sl\Bigfont
- \rm}
-\def\BIGtype{%
- \let\rm\BIGfont
- \let\bf\BIGfont
- \let\it\BIGfont
- \let\bi\BIGfont
- \let\sc\BIGfont
- \let\sl\BIGfont
- \rm}
-%
-%
-% PMX changes font assignment in pmx.tex
-% \BIGfont=\fontid bx10 scaled\magstep4
-% \Bigfont=\fontid bx10 scaled\magstep2
-%\ifx\pmxversion\undefined\relax\else
-% \font\Bigfont=ptmr7t scaled \magstep2
-% \font\BIGfont=ptmr7t scaled \magstep4
-%\fi
-%
%
% Redefine accented characters for etex, suggested by David Carlisle:
@@ -234,6 +168,13 @@
\expandafter\def\csname T1\string#1-\string#3\endcsname{\char#4\relax}}
\input t1enc.def
+
+\edef\catcodeat{\the\catcode`\@}\catcode`\@=11
+% \c needs special treatment
+\def\c#1{\leavevmode\ifx c#1\char231 \else\setbox\z@\hbox{#1}\ifdim\ht\z@=1ex\accent11 #1%
+ \else{\ooalign{\unhbox\z@\crcr
+ \hidewidth\char11\hidewidth}}\fi\fi}
+\catcode`\@=\catcodeat
\fi
\normtype
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 7e519a982c4..37979d67711 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -727,7 +727,6 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
'multido', "&MAKEpst",
'multirow', "&MAKEflatten",
'musictex', "die 'skipping, superseded by musixtex",
- 'musixtex', "die 'skipping, for TL16 per rdt'",
'musixtnt', "die 'skipping, for TL16 per rdt'",
# 'musixtnt', "&MAKEflatten",
'mwrite', "die 'skipping, nonfree license",