m-tx (24jan19)

git-svn-id: svn://tug.org/texlive/trunk@49818 c570f23f-e606-0410-a88d-b1316a301751

11 files changed, 157 insertions, 87 deletions

diff --git a/Master/texmf-dist/doc/generic/m-tx/Makefile b/Master/texmf-dist/doc/generic/m-tx/Makefile
index 90b2080f029..8eaf4d74f73 100644
--- a/Master/texmf-dist/doc/generic/m-tx/Makefile
+++ b/Master/texmf-dist/doc/generic/m-tx/Makefile
@@ -6,7 +6,7 @@ halleluja:
 	texlua buildmtxdoc.lua halleluja
 kanons:
 	texlua buildmtxdoc.lua kanons
-PHONY: default hallelua kanons
+PHONY: default halleluja kanons
 
 support = Makefile make-dvi make-pdf make-target pdfcat \
   buildmtxdoc.lua buildzip.lua
diff --git a/Master/texmf-dist/doc/generic/m-tx/README b/Master/texmf-dist/doc/generic/m-tx/README
index dc26070d44a..c537b9eed94 100644
--- a/Master/texmf-dist/doc/generic/m-tx/README
+++ b/Master/texmf-dist/doc/generic/m-tx/README
@@ -1,4 +1,4 @@
-This is M-Tx (Music-from-TeXt), version 0.63a (2018-04-14).
+This is M-Tx (Music-from-TeXt), version 0.63c (2019-01-15).
 
 M-Tx is a preprocessor for PMX that facilitates inputting
 lyrics. It builds the PMX input file based on a language
diff --git a/Master/texmf-dist/doc/generic/m-tx/borup.pdf b/Master/texmf-dist/doc/generic/m-tx/borup.pdf
new file mode 100644
index 00000000000..521b6b06dc9
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/m-tx/borup.pdf
diff --git a/Master/texmf-dist/doc/generic/m-tx/buildmtxdoc.lua b/Master/texmf-dist/doc/generic/m-tx/buildmtxdoc.lua
index 6d4cb2b6e35..c69dad23f91 100755
--- a/Master/texmf-dist/doc/generic/m-tx/buildmtxdoc.lua
+++ b/Master/texmf-dist/doc/generic/m-tx/buildmtxdoc.lua
@@ -40,7 +40,7 @@ local build_project = function(target)
    if target == "mtxdoc" then 
       make_examples() 
    end
-   sys("musixtex -q "..project[target])
+   sys("musixtex  -q "..project[target])
 end   
 
 -- Main program
diff --git a/Master/texmf-dist/doc/generic/m-tx/halleluja.pdf b/Master/texmf-dist/doc/generic/m-tx/halleluja.pdf
new file mode 100644
index 00000000000..c67ef907bbf
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/m-tx/halleluja.pdf
diff --git a/Master/texmf-dist/doc/generic/m-tx/kanons.pdf b/Master/texmf-dist/doc/generic/m-tx/kanons.pdf
new file mode 100644
index 00000000000..9b0a4da0f39
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/m-tx/kanons.pdf
diff --git a/Master/texmf-dist/doc/generic/m-tx/mtxdoc.ltx b/Master/texmf-dist/doc/generic/m-tx/mtxdoc.ltx
index cbf7f82927f..c2082c1f6ad 100644
--- a/Master/texmf-dist/doc/generic/m-tx/mtxdoc.ltx
+++ b/Master/texmf-dist/doc/generic/m-tx/mtxdoc.ltx
@@ -22,10 +22,10 @@
 \texttt{https://github.com/dlaurie/M-Tx}
 }
 
-\def\versionname{0.62}
-\def\version{0.62}
+\def\versionname{0.63c}
+\def\version{0.63c}
 \def\newfrom{0.61}
-\date{20 October 2016}
+\date{15 January 2019}
 \title{\Huge \textbf{\MTx: Music from Text \\ \LARGE Version\current} \\
   User's Guide \vfill}
 \author{\LARGE Dirk Laurie\\ \texttt{dirk.laurie@gmail.com} }
@@ -1943,15 +1943,16 @@ Some points to note:
   \item The file \texttt{mtxlatex.sty} is supplied with the \MTx\
 documentation source. You may need to copy it to some other place
 for \TeX\ to find it.
-  \item The package \texttt{times} comes with standard distributions.
-You could use any \LaTeXe\ font package here.  The \texttt{times}
+  \item The package \texttt{mathptmx} comes with standard distributions
+and loads \texttt{Times} fonts, including fonts for mathematics.
+You could use any suitable \LaTeXe\ font package here.  The \texttt{Times}
 font is quite narrow and therefore useful when the lyrics are crowded. 
 If you do use a font package, load it \emph{after} \texttt{mtxlatex}. 
   \item \verb"\pagestyle{headings}" puts page
 numbers and running headings at the top of the page.
-  \item To change fonts, use pure \LaTeXe\
-\ixem{font change} commands, as above.  Don't try to use \verb"\it", \verb"\bf"
-etc.  Briefly, subject to what fonts you have installed,
+  \item To change fonts, you can use pure \LaTeXe\
+\ixem{font change} commands, as above. 
+Briefly, subject to what fonts you have installed,
 you can independently change:
   \begin{description}
    \item[size]  \verb"\tiny",
@@ -1961,9 +1962,31 @@ you can independently change:
    \item[shape] \verb"\upshape", \verb"\itshape", \verb"\slshape", 
      \verb"\scshape"; 
     \item[family] \verb"\rmfamily", \verb"\sffamily", \verb"\ttfamily";
-    \item[series] \verb"\mdseries", \verb"\bfseries". 
+    \item[series] \verb"\mdseries", \verb"\bfseries",
   \end{description}
+or corresponding \verb|\text..{...}| macros.
 For a full description, see any good \LaTeXe\ manual.
+
+Header
+font commands (see Section~\ref{ChangingFonts}) are redefined in \verb|mtxlatex.sty| as follows:
+\begin{verbatim}
+  \renewcommand{\BIGtype}{\Huge\bfseries}
+  \renewcommand{\BIgtype}{\huge\bfseries}
+  \renewcommand{\Bigtype}{\LARGE\bfseries} 
+  \renewcommand{\bigtype}{\Large\bfseries} 
+\end{verbatim}
+If \TeX-like commands such as \verb"\it", \verb"\bf"
+etc.\  are used in a particular score, they can be redefined to work as in MusiX\TeX\ in
+that environment as follows:  
+\begin{verbatim}
+  \renewcommand{\rm}{\upshape\mdseries}
+  \renewcommand{\it}{\itshape\mdseries}
+  \renewcommand{\bf}{\upshape\bfseries}
+  \renewcommand{\bi}{\itshape\bfseries}
+  \renewcommand{\sc}{\scshape\mdseries}
+\end{verbatim}
+
+
   \item  The blank line after \verb"\pagebreak" is essential.
   \item  The environment \ttxem{Score} is used to include each piece.
 It takes two arguments: the first will appear in the list of
@@ -2074,39 +2097,38 @@ for so doing is that the user can modify their effect by redefining
 them in the source file.  These macros, together with a few others
 that make life easier, are collected in the file \ttxem{mtx.tex}.
 
-Documentation of these commands can be found at the end of the file
-\texttt{mtx.tex}. 
-
 \subsection{Changing fonts}
-
-The font used for lyrics is the default text font of the moment,
-which usually is eleven-point roman.
-It can be changed globally, e.g. 
-\verb"TeX: \twelverm" in the preamble will change the font to
-twelve-point.  When using \LaTeX, you can use font-changing commands
-inside the environment to change the lyrics font only for that
-particular piece.
-
-The fonts used for titles and other items in headers are respectively 
-called \keyindex{BIGfont} and \keyindex{Bigfont}.  In \verb"mtxlatex.sty"
-they are redefined as follows:
+\label{ChangingFonts}
+
+The font used for lyrics is 
+by default eleven-point roman.
+It can be changed globally; for example, \verb"TeX: \twelverm" in the preamble will change the font to
+twelve-point.  
+The font families used by default for titles and other items in headers are respectively 
+called \keyindex{BIgtype} and \keyindex{bigtype}.  
+If you want larger or smaller fonts, you may use \verb|\BIGtype| or \verb|\Bigtype|
+to prefix
+the header text,
+as in
 \begin{verbatim}
-\renewcommand{\BIGfont}{\Huge\bfseries}
-\renewcommand{\Bigfont}{\Large} 
+  Title: \Bigtype Sanctus
 \end{verbatim}
-If you are not using \LaTeX, they can be redefined in two ways:
-\begin{itemize}
-  \item You can simply assign an existing font, e.g.\ to get
- somewhat smaller fonts,\\
-\verb"  \let\Bigfont\bigfont\let\BIGfont\BIgfont"
-  \item You can define the font explicitly, e.g.\ \\
-\verb"  \font\BIGfont=cmss9 scaled \magstep4"
-\end{itemize}
-
-The macros \keyindex{mtxPalatino} and \keyindex{mtxHelvetica} defined in
-\texttt{mtx.tex}, based on work by Andr\'e van Ryckeghem, replace 
-Computer Modern in all the font definitions by Palatino and Helvetica
-respectively.
+You may also use commands \verb|\rm|, \verb|\it|,
+\verb|\bi|, and \verb|\sc| to get Roman, italic, bold-italic, or small-capital text
+in header strings.
+The macros \keyindex{mtxPalatino} and \keyindex{mtxTimes}, defined in
+\texttt{mtx.tex}, replace 
+Computer Modern in all the font definitions by Palatino or Times, respectively.
+
+A command like \verb|\mtxelevensf| may be used in
+a \verb|TeX:| header to get sans-serif lyrics.  
+The macro \keyindex{mtxAllsf} sets \verb|\mtxelevensf| as the default
+for lyrics and also redefines the \verb|\bigtype|,
+\verb|\Bigtype|, \verb|\BIgtype| and \verb|\BIGtype| families
+to use sans-serif fonts. 
+Only \verb|\rm| and \verb|\it| styles are available in sans-serif header strings.
+The macro \keyindex{mtxHelvetica} replaces the
+Computer Modern Sans font definitions by Helvetica.
 
 \pagebreak
 
diff --git a/Master/texmf-dist/doc/generic/m-tx/mtxdoc.pdf b/Master/texmf-dist/doc/generic/m-tx/mtxdoc.pdf
index 7fc7c3f9434..1971b5a0cfb 100644
--- a/Master/texmf-dist/doc/generic/m-tx/mtxdoc.pdf
+++ b/Master/texmf-dist/doc/generic/m-tx/mtxdoc.pdf
diff --git a/Master/texmf-dist/tex/generic/m-tx/mtx.tex b/Master/texmf-dist/tex/generic/m-tx/mtx.tex
index 82ca95d111d..398ef5948f4 100644
--- a/Master/texmf-dist/tex/generic/m-tx/mtx.tex
+++ b/Master/texmf-dist/tex/generic/m-tx/mtx.tex
@@ -1,6 +1,6 @@
 % mtx.tex      © 2001–2016 Dirk Laurie     License: MIT (see file LICENSE)
 %    Some code © 2001 André van Ryckeghem  License: GPL
-% Corrections: see mtxtexdate, below.
+%    Revised font-handling copyright 2019 Bob Tennent License:  GPL
 
 % All TeX commands put directly into PMX files by M-Tx are defined below,
 %   except the following:
@@ -18,8 +18,8 @@
 
 \ifx\mtxtexversion\undefined\else\endinput\fi 
 
-\def\mtxtexversion{0.62}
-\def\mtxtexdate{20 October 2016}
+\def\mtxtexversion{0.63c}
+\def\mtxtexdate{15 January 2019}
 \let\:=\relax
 \immediate\write10{%
 mtxTeX \mtxtexversion\space<\mtxtexdate>} 
@@ -36,62 +36,105 @@ mtxTeX \mtxtexversion\space<\mtxtexdate>}
 % M-Tx font definitions
 % \mtxeightsf etc: defines \eightsf etc by analogy to \eightrm. 
 % \mtxEightsf etc: same, but also immediately does \eightsf.
+
 % \mtxPalatino: replaces Computer Modern font definitions of
 %    \eightrm, \eightit, \eightbf etc by Palatino
+% \mtxTimes: replaces Computer Modern font definitions of
+%    \eightrm, \eightit, \eightbf etc by Times
 % \mtxHelvetica: replaces Computer Modern font definitions of
 %    \eightsf etc by Helvetica
 
-\def\mtxeightsf{\font\eightsf=cmss8}
-\def\mtxEightsf{\mtxeightsf\eightsf}
+\font\mtxeightsf=cmss8
+\def\mtxEightsf{\mtxeightsf}
+
+\font\mtxtensf=cmss10
+\def\mtxTensf{\mtxtensf}
+
+\font\mtxelevensf=cmss10 scaled \magstephalf
+\def\mtxElevensf{\mtxelevensf}
+
+\font\mtxtwelvesf=cmss12
+\def\mtxTwelvesf{\mtxtwelvesf}
 
-\def\mtxtensf{\font\tensf=cmss10}
-\def\mtxTensf{\mtxtensf\tensf}
+% define "big" Sans fonts for "italic" as well as "Roman"
 
-\def\mtxelevensf{\font\elevensf=cmss10 scaled \magstephalf}
-\def\mtxElevensf{\mtxelevensf\elevensf}
+\font\mtxfrtsf=cmss12 scaled \magstep1
+\font\mtxfrtsi=cmssi12 scaled \magstep1
 
-\def\mtxtwelvesf{\font\twelvesf=cmss12}
-\def\mtxTwelvesf{\mtxtwelvesf\twelvesf}
+\font\mtxsvtsf=cmss12 scaled \magstep2
+\font\mtxsvtsi=cmssi12 scaled \magstep2
 
-\def\mtxbigsf{\font\Bigtype=cmss9 scaled \magstep1}
-\def\mtxBIgsf{\font\Bigtype=cmss9 scaled \magstep2}
-\def\mtxBIGsf{\font\BIGtype=cmss9 scaled \magstep3}
-\def\mtxBIGsf{\font\BIGtype=cmss9 scaled \magstep4}
+\font\mtxtwtysf=cmss12 scaled \magstep3
+\font\mtxtwtysi=cmssi12 scaled \magstep3
+
+\font\mtxtwfvsf=cmss12 scaled \magstep4
+\font\mtxtwfvsi=cmssi12 scaled \magstep4
 
 \def\mtxPalatino{
-\font\eightrm=pplr at 8truept
-\font\eightbf=pplb at 8truept
-\font\eightit=pplri at 8truept
-
-\font\tenrm=pplr at 10truept
-\font\tenbf=pplb at 10truept
-\font\tenit=pplri at 10truept
-
-\font\elevenrm=pplr at 11truept
-\font\elevenbf=pplb at 11truept
-\font\elevenit=pplri at 11truept
-
-\font\twelverm=pplr at 12truept
-\font\twelvebf=pplb at 12truept
-\font\twelveit=pplri at 12truept
-
-\font\bigtype=pplb at 14truept
-\font\Bigtype=pplb at 17truept
-\font\BIgtype=pplb at 20truept
-\font\BIGtype=pplb at 25truept
+  \input musixplt
+  \def\bigtype{\bigfont\bf}
+  \def\Bigtype{\Bigfont\bf}
+  \def\BIgtype{\BIgfont\bf}
+  \def\BIGtype{\BIGfont\bf}
+  \elevenrm
+}
+
+\def\mtxTimes{
+  \input musixtmr
+  \def\bigtype{\bigfont\bf}
+  \def\Bigtype{\Bigfont\bf}
+  \def\BIgtype{\BIgfont\bf}
+  \def\BIGtype{\BIGfont\bf}
+  \elevenrm
 }
 
 \def\mtxHelvetica{
-  \def\mtxeightsf{\font\eightsf=\phvr at 8truept}
-  \def\mtxtensf{\font\tensf=\phvr at 10truept}
-  \def\mtxelevensf{\font\elevensf=\phvr at 11truept}
-  \def\mtxtwelvesf{\font\twelvesf=\phvr at 12truept}
+  \font\mtxeightsf=phvr8t at 8pt
+  \font\mtxtensf=phvr8t at 10pt
+  \font\mtxelevensf=phvr8t at 11pt
+  \font\mtxtwelvesf=phvr8t at 12pt
+
+  \font\mtxfrtsf=phvr8t scaled \magstep2
+  \font\mtxfrtsi=phvro8t scaled \magstep2 
+
+  \font\mtxsvtsf=phvr8t scaled \magstep3
+  \font\mtxsvtsi=phvro8t scaled \magstep3
+
+  \font\mtxtwtysf=phvr8t scaled \magstep4
+  \font\mtxtwtysi=phvro8t scaled \magstep4
+
+  \font\mtxtwfvsf=phvr8t scaled \magstep5
+  \font\mtxtwfvsi=phvro8t scaled \magstep5
 }
 
+\def\mtxAllsf{
+  \def\bigtype{
+     \let\rm\mtxfrtsf
+     \let\it\mtxfrtsi
+     \rm
+   }
+  \def\Bigtype{
+     \let\rm\mtxsvtsf
+     \let\it\mtxsvtsi
+     \rm
+   }
+  \def\BIgtype{
+     \let\rm\mtxtwtysf
+     \let\it\mtxtwtysi
+     \rm
+   }
+  \def\BIGtype{
+     \let\rm\mtxtwfvsf
+     \let\it\mtxtwfvsi
+     \rm
+   }
+  \mtxelevensf
+}
+
+
 \def\mtxInstrfont{\twelvebf}
-\def\mtxAllsf{\mtxeightsf\mtxtensf\mtxElevensf\mtxtwelvesf\mtxBigsf\mtxBIGsf}
 
-\def\sit\eightit \def\srm\eightrm \def\sbf\eightbf \def\ssf\eightsf
+% \def\sit\eightit \def\srm\eightrm \def\sbf\eightbf \def\ssf\eightsf
 % \def\elevenpt{\def\rm\elevenrm \def\it\elevenit \def\bf\elevenbf}
 
 % M-Tx music sizes
diff --git a/Master/texmf-dist/doc/generic/m-tx/mtxlatex.sty b/Master/texmf-dist/tex/latex/m-tx/mtxlatex.sty
index 33898e0ac79..dfd2d509c7c 100644
--- a/Master/texmf-dist/doc/generic/m-tx/mtxlatex.sty
+++ b/Master/texmf-dist/tex/latex/m-tx/mtxlatex.sty
@@ -22,8 +22,10 @@ mtxLaTeX\space<\mtxlatexdate>}
 
 \def\mtxlatex{
 \input mtx
-\renewcommand{\BIGfont}{\Huge\bfseries}
-\renewcommand{\Bigfont}{\Large\bfseries} 
+\renewcommand{\BIGtype}{\Huge\bfseries}
+\renewcommand{\BIgtype}{\huge\bfseries}
+\renewcommand{\Bigtype}{\LARGE\bfseries} 
+\renewcommand{\bigtype}{\Large\bfseries} 
 % Kill the PMX definition of \parskip.
 \parskip=0pt plus 1pt
 }
@@ -57,8 +59,10 @@ mtxLaTeX\space<\mtxlatexdate>}
 \let\startmuflex\relax\let\endmuflex\relax
 \let\nopagenumbers\relax \let\bye\relax \let\vfill\relax \let\eject\relax
 \musicparskip
-\renewcommand{\BIGfont}{\Large\bfseries}
-\renewcommand{\Bigfont}{\large\bfseries}
+\renewcommand{\BIGtype}{\huge\bfseries}
+\renewcommand{\BIgtype}{\LARGE\bfseries}
+\renewcommand{\Bigtype}{\Large\bfseries}
+\renewcommand{\bigtype}{\large\bfseries}
 }{\global\setlength\oddsidemargin\keepOSM\global\setlength\topmargin\keepTM}
 
 \newenvironment{mus}%
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 9e4a441355a..c9c8498acfc 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -6361,6 +6361,7 @@ sub POSTmptopdf {
 
 sub POSTmtx {
   print "POST$package - man pages, preserve prepmx binary\n";
+  &SYSTEM ("$RM $DEST/doc/generic/$package/musixtex.log");
   &POST_do_man ();
   &POST_preserve_bin ("prepmx");
 }