m-tx (16dec15)

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

64 files changed, 503 insertions, 1316 deletions

diff --git a/Master/texmf-dist/doc/generic/m-tx/README b/Master/texmf-dist/doc/generic/m-tx/README
deleted file mode 100644
index 661754100f6..00000000000
--- a/Master/texmf-dist/doc/generic/m-tx/README
+++ /dev/null
@@ -1,51 +0,0 @@
-This is M-Tx (Music-from-TeXt), version 0.60d (2013-12-24).
-
-M-Tx is a preprocessor for PMX that facilitates inputting lyrics. It
-builds the PMX input file based on a language very similar to PMX. M-Tx
-includes most of PMX's functionality, but it also permits in-line PMX
-commands to give access to virtually all of PMX.
-
-The author of M-Tx is Dirk Laurie (dpl@sun.ac.za).
-
-To install (on TDS-compliant TeX systems):
-
- +  unzip tex-archive/install/m-tx.tds.zip at the root of a texmf tree and, 
-    if necessary, update the filename database; e.g., texhash texmf. 
-    Documentation for M-Tx is installed under doc/generic/tmx. You must use 
-    an unzipping program that converts text files to the text-file format of 
-    your platform, such as "unzip -a ... " on Linux.
-
- +  *either* copy the executables appropriate for your
-    platform (Windows, OSX) to a folder on the executable PATH 
-    and ensure it has execute permission 
-
- +  *or* on any Unix-like system with gcc and standard development tools
-    installed: unpack mtx-0.60d.tar.gz (anywhere), move to the resulting
-    mtx-0.60d directory, and do
-
-       ./configure [--prefix=$HOME]
-       make       (or make -f Makefile.orig if you have fpc installed)
-       make install  (as root, if necessary)
-
-    Then install a symbolic link m-tx in any directory on the executable
-    PATH to scripts/m-tx/m-tx.lua
-
-Documentation for M-Tx and the wrapper script is installed under 
-
-doc/generic/m-tx
-
-Many examples of M-Tx and MusiXTeX typesetting may be found at the Werner
-Icking Music Archive at
-
-http://icking-music-archive.org/
-
-Support for users of MusiXTeX and related software may be obtained via
-the MusiXTeX mail list at
-
-http://tug.org/mailman/listinfo/tex-music
-
-M-Tx may be freely copied, duplicated and used in conformance to the
-GNU General Public License (Version 2, 1991, see included file gpl.txt).
-
-This CTAN distribution is maintained by Bob Tennent (rdt@cs.queensu.ca).
-Dec. 12th, 2013
diff --git a/Master/texmf-dist/doc/generic/m-tx/mtx060/borup.mtx b/Master/texmf-dist/doc/generic/m-tx/borup.mtx
index 0f00f9712a5..d67cbf24fb6 100644
--- a/Master/texmf-dist/doc/generic/m-tx/mtx060/borup.mtx
+++ b/Master/texmf-dist/doc/generic/m-tx/borup.mtx
@@ -4,9 +4,9 @@ Flats: 1
 Style: Singer
 Systems: 2
 Space: 10
+TeX: \let\endpiecesav\endpiece
+TeX: \def\endpiece{\endpiecesav\input lyrics \input notes}
 
-%% \\let\endpiecesav\endpiece\
-%% \\def\endpiece{\endpiecesav\input lyrics \input notes}\ 
 ( d4 e ) g | ( d e ) g | ( f e ) f | d2 r4 |
 L: In ver-na-lis tem-po-ris
 L: Dum re-ces-sum fri-go-ris
diff --git a/Master/texmf-dist/doc/generic/m-tx/buildmtxdoc.lua b/Master/texmf-dist/doc/generic/m-tx/buildmtxdoc.lua
new file mode 100755
index 00000000000..6d4cb2b6e35
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/m-tx/buildmtxdoc.lua
@@ -0,0 +1,59 @@
+#! /usr/bin/texlua
+-- buildmtxdoc.lua   © Dirk Laurie 2015  MIT license
+-- Build M-Tx documentation from scratch.
+
+local project = {halleluja = "-t kroonhom loofnou -f -q -p halleluja";
+kanons = "-t viva dona sanctus -f -q -p kanons";
+mtxdoc = "-t borup chord dertod dwoman macro"..
+" melisma1 melisma2 melisma3 melisma4 melisma5 melisma6"..
+" meter mozart mozart0 netfirst netsoos1 netsoos2 psalm42 title title1 volta"..
+" -f -x -q -p mtxdoc"}
+
+local sys = function(...)
+   print(...)
+   return(os.execute(...))
+end
+
+local cat = function(target,...)
+   local result = io.open(target,'w')
+   for k=1,select('#',...) do
+      for line in io.open((select(k,...))):lines() do
+         result:write(line,"\n")
+      end
+   end
+   result:close()
+end
+
+local make_examples = function()
+   cat("dwoman.mtx","dwoman.mta","dwoman.mtb")
+   for k=1,2 do
+      mtxname = ("netsoos%d.mtx"):format(k)
+      cat(mtxname,"netsoos.mta",("netsoos%d.mtb"):format(k))
+   end
+   for k=1,6 do
+      mtxname = ("melisma%d.mtx"):format(k)
+      cat(mtxname,"melisma.mta",("melisma%d.mtb"):format(k))
+   end
+end
+
+local build_project = function(target)
+   if target == "mtxdoc" then 
+      make_examples() 
+   end
+   sys("musixtex -q "..project[target])
+end   
+
+-- Main program
+
+if type(arg)~='table' or not arg[1] then build_project"mtxdoc"
+elseif project[arg[1]] then build_project(arg[1])
+else print[[
+This is buildmtxdoc version 0.1.
+Usage:  [texlua] buildmtx.lua [project] 
+Projects:
+   mtxdoc
+   halleluja
+   kanons
+
+If no project is specified, "mtxdoc" is built.]]
+end
diff --git a/Master/texmf-dist/doc/generic/m-tx/mtx060/chord.mtx b/Master/texmf-dist/doc/generic/m-tx/chord.mtx
index a5b0ca6a798..a5b0ca6a798 100644
--- a/Master/texmf-dist/doc/generic/m-tx/mtx060/chord.mtx
+++ b/Master/texmf-dist/doc/generic/m-tx/chord.mtx
diff --git a/Master/texmf-dist/doc/generic/m-tx/mtx060/dertod.mtx b/Master/texmf-dist/doc/generic/m-tx/dertod.mtx
index 26cbd7b43e8..26cbd7b43e8 100644
--- a/Master/texmf-dist/doc/generic/m-tx/mtx060/dertod.mtx
+++ b/Master/texmf-dist/doc/generic/m-tx/dertod.mtx
diff --git a/Master/texmf-dist/doc/generic/m-tx/docversion b/Master/texmf-dist/doc/generic/m-tx/docversion
new file mode 100755
index 00000000000..62807fd0a93
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/m-tx/docversion
@@ -0,0 +1 @@
+grep 'def\\versionname' mtxdoc.ltx | sed -e "s/.*{\(.*\)\.\(.*\)}.*/\1\2/"
diff --git a/Master/texmf-dist/doc/generic/m-tx/mtx060/dona.mtx b/Master/texmf-dist/doc/generic/m-tx/dona.mtx
index 2921ad5a387..2921ad5a387 100644
--- a/Master/texmf-dist/doc/generic/m-tx/mtx060/dona.mtx
+++ b/Master/texmf-dist/doc/generic/m-tx/dona.mtx
diff --git a/Master/texmf-dist/doc/generic/m-tx/mtx060/dwoman.mta b/Master/texmf-dist/doc/generic/m-tx/dwoman.mta
index 77f00c576b4..77f00c576b4 100644
--- a/Master/texmf-dist/doc/generic/m-tx/mtx060/dwoman.mta
+++ b/Master/texmf-dist/doc/generic/m-tx/dwoman.mta
diff --git a/Master/texmf-dist/doc/generic/m-tx/mtx060/dwoman.mtb b/Master/texmf-dist/doc/generic/m-tx/dwoman.mtb
index c9003cbf5bf..c9003cbf5bf 100644
--- a/Master/texmf-dist/doc/generic/m-tx/mtx060/dwoman.mtb
+++ b/Master/texmf-dist/doc/generic/m-tx/dwoman.mtb
diff --git a/Master/texmf-dist/doc/generic/m-tx/mtx060/halleluja.ltx b/Master/texmf-dist/doc/generic/m-tx/halleluja.ltx
index 4b09e89f67b..86a8538e3e6 100644
--- a/Master/texmf-dist/doc/generic/m-tx/mtx060/halleluja.ltx
+++ b/Master/texmf-dist/doc/generic/m-tx/halleluja.ltx
@@ -1,5 +1,4 @@
 \documentclass[a4paper]{article}
-\usepackage{etex}
 \usepackage{mtxlatex,times}
 \mtxlatex
 \pagestyle{headings}
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..df6c1c28990
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/m-tx/halleluja.pdf
diff --git a/Master/texmf-dist/doc/generic/m-tx/hallelujashort.ltx b/Master/texmf-dist/doc/generic/m-tx/hallelujashort.ltx
new file mode 100644
index 00000000000..344df1490ae
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/m-tx/hallelujashort.ltx
@@ -0,0 +1,22 @@
+\documentclass[a4paper]{article}
+\usepackage{mtxlatex,times}
+\mtxlatex
+\pagestyle{headings}
+\title{    {\Huge Halleluja!\\ [2ex]}
+  {\Large\textit{Anthems for unaccompanied church choir (SATB)}\\ [5ex]}}
+\author{\Large Edited by Dirk Laurie} 
+\date{} 
+\let\Writebarno\writebarno
+\begin{document}
+  \maketitle
+  \thispagestyle{empty}
+  \tableofcontents
+\pagebreak
+
+\def\writebarno{\vbox to 24pt{}{\Writebarno}}
+\begin{Score} {Kroon Hom!} {kroonhom} \end{Score}
+\def\writebarno{\vbox to 16pt{}{\Writebarno}}
+\begin{Score} {Loof nou die Heer} {loofnou} \end{Score}
+
+\end{document}
+
diff --git a/Master/texmf-dist/doc/generic/m-tx/mtx060/kanons.ltx b/Master/texmf-dist/doc/generic/m-tx/kanons.ltx
index 973ce3f982e..2ea3440009c 100644
--- a/Master/texmf-dist/doc/generic/m-tx/mtx060/kanons.ltx
+++ b/Master/texmf-dist/doc/generic/m-tx/kanons.ltx
@@ -1,5 +1,4 @@
 \documentclass{article}
-\usepackage{etex}
 \usepackage{mtxlatex,charter}
 \mtxlatex
 \pagestyle{empty}
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..ae063fba427
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/m-tx/kanons.pdf
diff --git a/Master/texmf-dist/doc/generic/m-tx/mtx060/kroonhom.mtx b/Master/texmf-dist/doc/generic/m-tx/kroonhom.mtx
index 3908d39d43c..cca8c4e84e0 100644
--- a/Master/texmf-dist/doc/generic/m-tx/mtx060/kroonhom.mtx
+++ b/Master/texmf-dist/doc/generic/m-tx/kroonhom.mtx
@@ -4,9 +4,9 @@ Style: SATB
 Pages: 3
 Systems: 14
 Space: 0 4
-% %\font\tensf=cmss10 \tensf
-
-%% h280m w193m 
+Height: 280mm
+Width: 193mm
+ 
 % 0
 f | b2 r4 b | d2 r4 d | { f0 | f2 } r4 || f- | fd f8 [ g a ] [ b c ] | 
 L: Kroon Hom, kroon Hom, kroon Hom! Rond-om die troon van 
diff --git a/Master/texmf-dist/doc/generic/m-tx/mtx060/loofnou.mtx b/Master/texmf-dist/doc/generic/m-tx/loofnou.mtx
index be0289f32c1..18fb5ca410d 100644
--- a/Master/texmf-dist/doc/generic/m-tx/mtx060/loofnou.mtx
+++ b/Master/texmf-dist/doc/generic/m-tx/loofnou.mtx
@@ -4,8 +4,9 @@ Style: SATB
 Pages: 2
 Systems: 10
 Space: 2
+Height: 280mm
+Width: 193mm
 
-%% h280m w193m 
 g e8.g c2 | c4 b8.a g2 | 
 e c8.e e2 | a4 g8.f e2 | 
 L: Loof nou die Heer, loof nou die Heer,
diff --git a/Master/texmf-dist/doc/generic/m-tx/mtx060/lyrics.tex b/Master/texmf-dist/doc/generic/m-tx/lyrics.tex
index d9ee84a1ee5..d9ee84a1ee5 100644
--- a/Master/texmf-dist/doc/generic/m-tx/mtx060/lyrics.tex
+++ b/Master/texmf-dist/doc/generic/m-tx/lyrics.tex
diff --git a/Master/texmf-dist/doc/generic/m-tx/m-tx.html b/Master/texmf-dist/doc/generic/m-tx/m-tx.html
deleted file mode 100644
index ec976065e2e..00000000000
--- a/Master/texmf-dist/doc/generic/m-tx/m-tx.html
+++ /dev/null
@@ -1,191 +0,0 @@
-Content-type: text/html
-
-<HTML><HEAD><TITLE>Manpage of m-tx</TITLE>
-</HEAD><BODY>
-<H1>m-tx</H1>
-Section:  (1)<BR>Updated: 2013-12-11<BR><A HREF="#index">Index</A>
-<A HREF="http://localhost/cgi-bin/man/man2html">Return to Main Contents</A><HR>
-
-<P>
-<A NAME="lbAB">&nbsp;</A>
-<H2>NAME</H2>
-
-m-tx - This script processes mtx files then deletes intermediate files
-<P>
-<A NAME="lbAC">&nbsp;</A>
-<H2>SYNOPSIS</H2>
-
-[ texlua ]
-<B>m-tx[.lua]</B>
-
-{
-<I>option</I>
-
-|
-<I>jobname</I>
-
-[ .mtx ] 
-} ...
-<DL COMPACT>
-<DT>The default effect is to process each file using <DD>
-<DT><B><A HREF="http://localhost/cgi-bin/man/man2html?1+prepmx">prepmx</A></B>(1)
-
-<DD>
-(pre-pre-processing pass)
-<DT><B><A HREF="http://localhost/cgi-bin/man/man2html?1+pmxab">pmxab</A></B>(1)
-
-<DD>
-(pre-processing pass)
-<DT><B><A HREF="http://localhost/cgi-bin/man/man2html?1+etex">etex</A></B>(1)
-
-<DD>
-(first pass)
-<DT><B><A HREF="http://localhost/cgi-bin/man/man2html?1+musixflx">musixflx</A></B>(1)
-
-<DD>
-(second pass)
-<DT><B><A HREF="http://localhost/cgi-bin/man/man2html?1+etex">etex</A></B>(1)
-
-<DD>
-(third pass)
-<DT><B><A HREF="http://localhost/cgi-bin/man/man2html?1+dvips">dvips</A></B>(1)
-
-<DD>
-(dvi to Postscript)
-<DT><B><A HREF="http://localhost/cgi-bin/man/man2html?1+ps2pdf">ps2pdf</A></B>(1)
-
-<DD>
-(Postscript to Portable Document Format)
-<DT>followed by removal of intermediate files.<DD>
-<P>
-</DL>
-<A NAME="lbAD">&nbsp;</A>
-<H2>OPTIONS</H2>
-
-<DL COMPACT>
-<DT><B>-v </B>
-
-<DD>
-output program name and version number, and quit
-<DT><B>-h</B>
-
-<DD>
-output usage summary and quit
-<DT><B>-l </B>
-
-<DD>
-changes the TeX processor to
-<B><A HREF="http://localhost/cgi-bin/man/man2html?1+latex">latex</A></B>(1)
-
-or
-<B><A HREF="http://localhost/cgi-bin/man/man2html?1+pdflatex">pdflatex</A></B>(1)
-
-<DT><B>-p </B>
-
-<DD>
-changes the TeX processor to 
-<B><A HREF="http://localhost/cgi-bin/man/man2html?1+pdfetex">pdfetex</A></B>(1)
-
-or
-<B><A HREF="http://localhost/cgi-bin/man/man2html?1+pdflatex">pdflatex</A></B>(1)
-
-(and doesn't run 
-<B><A HREF="http://localhost/cgi-bin/man/man2html?1+dvips">dvips</A></B>(1)
-
-and 
-<B><A HREF="http://localhost/cgi-bin/man/man2html?1+ps2pdf">ps2pdf</A></B>(1)
-
-or
-<B><A HREF="http://localhost/cgi-bin/man/man2html?1+dvipdfm">dvipdfm</A></B>(1)
-
-)
-<DT><B>-d </B>
-
-<DD>
-changes the dvi processor to
-<B><A HREF="http://localhost/cgi-bin/man/man2html?1+dvipdfm">dvipdfm</A></B>(1)
-
-<DT><B>-c</B>
-
-<DD>
-use pmxchords before pmx
-<DT><B>-F fmt</B>
-
-<DD>
-uses fmt as the TeX processor
-<DT><B>-s </B>
-
-<DD>
-stops processing at the dvi file
-<DT><B>-t</B>
-
-<DD>
-stops processing at the tex (and midi) files
-<DT><B>-m</B>
-
-<DD>
-stops processing at the pmx file
-<DT><B>-i</B>
-
-<DD>
-retain intermediate files
-<DT><B>-f</B>
-
-<DD>
-default processing 
-<DT>Options affect processing of all succeeding mtx files unless changed by another option.<DD>
-<P>
-</DL>
-<A NAME="lbAE">&nbsp;</A>
-<H2>SEE ALSO</H2>
-
-<B><A HREF="http://localhost/cgi-bin/man/man2html?1+prepmx">prepmx</A></B>(1)
-
-<B><A HREF="http://localhost/cgi-bin/man/man2html?1+pmxab">pmxab</A></B>(1)
-
-<B><A HREF="http://localhost/cgi-bin/man/man2html?1+scor2prt">scor2prt</A></B>(1)
-
-<B><A HREF="http://localhost/cgi-bin/man/man2html?1+etex">etex</A></B>(1),
-
-<B><A HREF="http://localhost/cgi-bin/man/man2html?1+latex">latex</A></B>(1),
-
-<B><A HREF="http://localhost/cgi-bin/man/man2html?1+pdfetex">pdfetex</A></B>(1),
-
-<B><A HREF="http://localhost/cgi-bin/man/man2html?1+pdflatex">pdflatex</A></B>(1),
-
-<B><A HREF="http://localhost/cgi-bin/man/man2html?1+musixflx">musixflx</A></B>(1),
-
-<B><A HREF="http://localhost/cgi-bin/man/man2html?1+dvipdfm">dvipdfm</A></B>(1),
-
-<B><A HREF="http://localhost/cgi-bin/man/man2html?1+pmxchords">pmxchords</A></B>(1),
-
-<B><A HREF="http://localhost/cgi-bin/man/man2html?1+dvips">dvips</A></B>(1),
-
-<B><A HREF="http://localhost/cgi-bin/man/man2html?1+ps2pdf">ps2pdf</A></B>(1).
-
-<BR>
-
-mtx260.pdf
-<P>
-<A NAME="lbAF">&nbsp;</A>
-<H2>AUTHOR </H2>
-
-This manual page was written by Bob Tennent &lt;<A HREF="mailto:rdt@cs.queensu.ca">rdt@cs.queensu.ca</A>&gt;.
-<P>
-
-<HR>
-<A NAME="index">&nbsp;</A><H2>Index</H2>
-<DL>
-<DT><A HREF="#lbAB">NAME</A><DD>
-<DT><A HREF="#lbAC">SYNOPSIS</A><DD>
-<DT><A HREF="#lbAD">OPTIONS</A><DD>
-<DT><A HREF="#lbAE">SEE ALSO</A><DD>
-<DT><A HREF="#lbAF">AUTHOR </A><DD>
-</DL>
-<HR>
-This document was created by
-<A HREF="http://localhost/cgi-bin/man/man2html">man2html</A>,
-using the manual pages.<BR>
-Time: 22:12:01 GMT, December 11, 2013
-</BODY>
-</HTML>
diff --git a/Master/texmf-dist/doc/generic/m-tx/mtx060/macro.mtx b/Master/texmf-dist/doc/generic/m-tx/macro.mtx
index f75ac802447..f75ac802447 100644
--- a/Master/texmf-dist/doc/generic/m-tx/mtx060/macro.mtx
+++ b/Master/texmf-dist/doc/generic/m-tx/macro.mtx
diff --git a/Master/texmf-dist/doc/generic/m-tx/mtx060/melisma.mta b/Master/texmf-dist/doc/generic/m-tx/melisma.mta
index 273f446bcc8..755806431ce 100644
--- a/Master/texmf-dist/doc/generic/m-tx/mtx060/melisma.mta
+++ b/Master/texmf-dist/doc/generic/m-tx/melisma.mta
@@ -1,5 +1,5 @@
 Style: Singer
 Meter: C
 Start: @+2
- 
-%% w2i
+Width: 2in
+
diff --git a/Master/texmf-dist/doc/generic/m-tx/mtx060/melisma1.mtb b/Master/texmf-dist/doc/generic/m-tx/melisma1.mtb
index 3f36f53124b..3f36f53124b 100644
--- a/Master/texmf-dist/doc/generic/m-tx/mtx060/melisma1.mtb
+++ b/Master/texmf-dist/doc/generic/m-tx/melisma1.mtb
diff --git a/Master/texmf-dist/doc/generic/m-tx/mtx060/melisma2.mtb b/Master/texmf-dist/doc/generic/m-tx/melisma2.mtb
index d35cbcc5288..d35cbcc5288 100644
--- a/Master/texmf-dist/doc/generic/m-tx/mtx060/melisma2.mtb
+++ b/Master/texmf-dist/doc/generic/m-tx/melisma2.mtb
diff --git a/Master/texmf-dist/doc/generic/m-tx/mtx060/melisma3.mtb b/Master/texmf-dist/doc/generic/m-tx/melisma3.mtb
index 70973365b6c..70973365b6c 100644
--- a/Master/texmf-dist/doc/generic/m-tx/mtx060/melisma3.mtb
+++ b/Master/texmf-dist/doc/generic/m-tx/melisma3.mtb
diff --git a/Master/texmf-dist/doc/generic/m-tx/mtx060/melisma4.mtb b/Master/texmf-dist/doc/generic/m-tx/melisma4.mtb
index 73a6efb78ee..73a6efb78ee 100644
--- a/Master/texmf-dist/doc/generic/m-tx/mtx060/melisma4.mtb
+++ b/Master/texmf-dist/doc/generic/m-tx/melisma4.mtb
diff --git a/Master/texmf-dist/doc/generic/m-tx/mtx060/melisma5.mtb b/Master/texmf-dist/doc/generic/m-tx/melisma5.mtb
index 4d6dafa134c..4d6dafa134c 100644
--- a/Master/texmf-dist/doc/generic/m-tx/mtx060/melisma5.mtb
+++ b/Master/texmf-dist/doc/generic/m-tx/melisma5.mtb
diff --git a/Master/texmf-dist/doc/generic/m-tx/mtx060/melisma6.mtb b/Master/texmf-dist/doc/generic/m-tx/melisma6.mtb
index 85a0e3a162f..85a0e3a162f 100644
--- a/Master/texmf-dist/doc/generic/m-tx/mtx060/melisma6.mtb
+++ b/Master/texmf-dist/doc/generic/m-tx/melisma6.mtb
diff --git a/Master/texmf-dist/doc/generic/m-tx/meter.mtx b/Master/texmf-dist/doc/generic/m-tx/meter.mtx
new file mode 100644
index 00000000000..5a9c887bc1c
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/m-tx/meter.mtx
@@ -0,0 +1,10 @@
+Style: Piano
+Meter: m3406
+Width: 100m
+TeX: \def\upiii#1{\raise3\internote\hbox{{#1}}}
+TeX: \def\chacarera{\meterfrac34\upiii{\Big(}\meterfrac68\upiii{\Big)}}
+TeX: \let\oldmeterC=\meterC  \let\meterC=\chacarera
+
+a-2d o> a8 r r a r r a2d o> |
+C: dfsa cea cea dfsa 
+d-2d o>-15 a4 a { [h d8 {1 d+ ] d2d }1 zd- } |
diff --git a/Master/texmf-dist/doc/generic/m-tx/mtx060/mozart.mtx b/Master/texmf-dist/doc/generic/m-tx/mozart.mtx
index 88a4123c24d..f16b5eb4b36 100644
--- a/Master/texmf-dist/doc/generic/m-tx/mtx060/mozart.mtx
+++ b/Master/texmf-dist/doc/generic/m-tx/mozart.mtx
@@ -1,7 +1,7 @@
 Title:  Riff in C
 Composer: W. A. Mozart (1756--1791)
 Style: piano
+Width: 120mm
 
-%% w120m
 c2+       e4    g   | b4d-  c1 d c2        |
 c8 g+ e g c- g+ e g | d g f g    c- g+ e g |
diff --git a/Master/texmf-dist/doc/generic/m-tx/mtx060/mozart0.mtx b/Master/texmf-dist/doc/generic/m-tx/mozart0.mtx
index b6538192716..b6538192716 100644
--- a/Master/texmf-dist/doc/generic/m-tx/mtx060/mozart0.mtx
+++ b/Master/texmf-dist/doc/generic/m-tx/mozart0.mtx
diff --git a/Master/texmf-dist/doc/generic/m-tx/mtx-install.pdf b/Master/texmf-dist/doc/generic/m-tx/mtx-install.pdf
index 92b9d756b99..05310c3e74e 100644
--- a/Master/texmf-dist/doc/generic/m-tx/mtx-install.pdf
+++ b/Master/texmf-dist/doc/generic/m-tx/mtx-install.pdf
diff --git a/Master/texmf-dist/doc/generic/m-tx/mtx-install.tex b/Master/texmf-dist/doc/generic/m-tx/mtx-install.tex
index 08649ab19b3..5e391dee3da 100644
--- a/Master/texmf-dist/doc/generic/m-tx/mtx-install.tex
+++ b/Master/texmf-dist/doc/generic/m-tx/mtx-install.tex
@@ -5,7 +5,7 @@
 \RequirePackage{hyperref}
 \usepackage{xcolor}
 \newcommand{\myurl}[1]{\textcolor{blue}{\underline{\textcolor{black}{\url{#1}}}}}
-\newcommand{\mtxVersion}{0.60d}
+\newcommand{\mtxVersion}{0.61}
 \begin{document}
 \title{Installation of the CTAN M-Tx Distribution}
 \author{Bob Tennent\\
@@ -35,8 +35,8 @@ and installing files\footnote{%
 \section{Installing \texttt{m-tx.tds.zip}}
 
 In this distribution of M-Tx, many of the files to be installed 
-(including macros, documentation, and a wrapper script \verb\m-tx.lua\) are in 
-\texttt{tex-archive/install/m-tx.tds.zip} at CTAN. The file
+(including macros and documentation are in 
+\myurl{http://mirror.ctan.org/install/m-tx.tds.zip}. The file
 \verb|mt-x.tds.zip| is a zipped TEXMF
 hierarchy; simply download it and unzip in the root folder/directory of whichever TEXMF tree
 you decide is most appropriate, likely a ``local'' or ``personal'' one.
@@ -65,8 +65,8 @@ the one essential file that can't be installed in a TEXMF tree: the \texttt{prep
 
 On Windows
 systems, one can install \texttt{prepmx.exe} 
-in the \texttt{Windows} sub-directory; this is a pre-compiled
-executable and should be copied to any
+in the \texttt{Windows/32bit} or \texttt{Windows/64bit} sub-directory; these are pre-compiled
+executables and should be copied to any
 folder on the PATH of executables. 
 This might entail creating a suitable folder and adding that folder
 to the PATH as follows: 
@@ -126,38 +126,15 @@ This step should be executed as root if you need super-user privileges.
 You should now have an executable \verb\prepmx\ 
 in your PATH.
 
-\section{The Processing Script}
-
-The Lua script \verb\.../scripts/m-tx/m-tx.lua\ 
-is simply a convenient wrapper that
-by default runs the following processes in order (and then deletes intermediate files):
-\begin{itemize}\topsep=0pt\itemsep=0pt
-\item \verb\prepmx\ (pre-pre-processing pass)
-\item \verb\pmxab\ (pre-processing pass)
-\item \verb\etex\  (1st pass)
-\item \verb\musixflx\ (2nd pass)
-\item \verb\etex\ (3rd pass)
-\item \verb\dvips\ (to convert \verb\dvi\ output to Postscript)
-\item \verb\ps2pdf\ (to convert \verb\ps\ output to Portable Document Format)
-\end{itemize}%
-There are many options to vary the default behaviour.
-
-On a Unix-like system (with \texttt{luatex} installed), you can put a
-symbolic link to \texttt{m-tx.lua} in any directory on the executable PATH as follows:
-\begin{list}{}{}
-\item \verb\ln -s <path to m-tx.lua> m-tx\
-\end{list}
-On Windows, install
-the batch script
-\begin{list}{}{}
-\item \verb|Windows\m-tx.bat| 
-\end{list}
-to a folder
-on the executable PATH.
-
-Documentation for the \verb\m-tx\ script is in the
-\verb\doc/generic/m-tx/scripts\ directory.
+\section{Usage}
 
+To process an M-Tx source file, use the \verb|musixtex| script
+which is included in the \verb|musixtex| package.
+If applied to a file with \verb|.mtx| extension, it will by default execute \verb|prepmx| followed by
+\verb|pmxab|, followed 
+by \verb|etex|, \verb|musixflx|, and \verb|etex| again, followed by
+conversion to PDF using \verb|dvips| and \verb|ps2pdf|.
+There are many options to vary the default behaviour.
 
 \section{Discussion}
 
diff --git a/Master/texmf-dist/doc/generic/m-tx/mtx060.pdf b/Master/texmf-dist/doc/generic/m-tx/mtx060.pdf
deleted file mode 100644
index 317c1daddd9..00000000000
--- a/Master/texmf-dist/doc/generic/m-tx/mtx060.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/generic/m-tx/mtx060/Makefile b/Master/texmf-dist/doc/generic/m-tx/mtx060/Makefile
deleted file mode 100644
index c99862d03d0..00000000000
--- a/Master/texmf-dist/doc/generic/m-tx/mtx060/Makefile
+++ /dev/null
@@ -1,113 +0,0 @@
-PREPMX = ./prepmx
-include make-target
-
-sources = mtxdoc.tex mtxdoc.sty mtxlatex.sty mozart0.mtx mozart.mtx\
- netfirst.mtx meter.mtx notes.tex lyrics.tex mtxindex.tex\
- dertod.mtx volta.mtx title.mtx title1.mtx psalm42.mtx netsoos1.mtb \
- netsoos2.mtb borup.mtx melisma1.mtb dwoman.mtb \
- melisma2.mtb melisma3.mtb melisma4.mtb melisma5.mtb melisma6.mtb \
- dwoman.mta melisma.mta netsoos.mta kroonhom.mtx loofnou.mtx \
- viva.mtx dona.mtx sanctus.mtx halleluja.ltx kanons.ltx chord.mtx \
- macro.mtx
-
-examples = mozart0.tex mozart.tex netfirst.tex meter.tex \
- dertod.tex volta.tex title.tex title1.tex psalm42.tex netsoos1.tex \
- netsoos2.tex borup.tex melisma1.tex dwoman.tex \
- melisma2.tex melisma3.tex melisma4.tex melisma5.tex melisma6.tex \
- chord.tex macro.tex
-
-halleluja_pieces = kroonhom.tex loofnou.tex
-
-kanons_pieces = viva.tex dona.tex sanctus.tex
-
-%.tex: %.mtx
-	$(PREPMX) $* 
-	pmxab $*
-	rm $*.pml $*.pmx pmxaerr.dat
-
-DOC: mtx.$(target)
-
-mtxdoc.$(target): mtxdoc.tex mtxdoc.sty $(examples)
-	touch mtxdoc.mx1
-	rm *.mx?
-	- $(latex) mtxdoc
-	musixflx mtxdoc
-	makeindex mtxdoc
-	- $(latex) mtxdoc
-	- $(latex) mtxindex
-	rm mtxdoc.log mtxdoc.idx mtxdoc.ilg mtxindex.log mtxindex.aux
-
-%.mtx: %.mta %.mtb
-	cat $*.mta $*.mtb > $*.mtx
-
-melisma%.mtx: melisma.mta melisma%.mtb
-	cat melisma.mta melisma$*.mtb > melisma$*.mtx
-
-netsoos%.mtx: netsoos.mta netsoos%.mtb
-	cat netsoos.mta netsoos$*.mtb > netsoos$*.mtx
-
-once: mtxdoc.tex mtxdoc.sty $(examples)
-	- $(latex) mtxdoc
-
-index: mtxdoc.idx mtxindex.tex
-	makeindex mtxdoc
-	$(latex) mtxindex
-
-%.$(target): %.ltx
-	- rm $*.mx?; $(latex) $*.ltx; musixflx $*; $(latex) $*.ltx
-
-kanons.$(target): kanons.ltx $(kanons_pieces)
-
-halleluja.$(target): halleluja.ltx $(halleluja_pieces)
-
-all: mtxdoc.$(target) kanons.$(target) halleluja.$(target) mtxindex.$(target)
-
-config:
-	@echo "Configuring mtxdoc Version `./docversion`"
-	@echo "Looking for prepmx ... `which prepmx`"
-	ln -sf `which prepmx` .
-	@echo "Looking for pmxab ... `which pmxab`"
-	@echo "Looking for musixflx ... `which musixflx`"
-	@echo "Looking for musixtex ... `kpsewhich musixtex.tex`"
-	@echo "Looking for musixlyr ... `kpsewhich musixlyr.tex`"
-	@echo "Looking for $(latex) ... `which $(latex)`"
-	@echo "Looking for $(concat) ... `which $(concat)`"
-
-pdftarget: 
-	ln -sf make-pdf make-target
-
-
-dvitarget: 
-	ln -sf make-dvi make-target
-
-paperus:
-	echo \\def\\paperUS{} > mypaper.tex
-
-papera4:
-	echo \\def\\paperA4{} > mypaper.tex
-
-mtxdocus.$(target): paperus mtxdoc.$(target)
-	mv mtxdoc.$(target) mtxdocus.$(target)	
-
-mtxdoca4.$(target): papera4 mtxdoc.$(target)
-	mv mtxdoc.$(target) mtxdoca4.$(target)
-
-ps: mtxdoc.ps halleluja.ps kanons.ps mtxindex.ps
-
-pdf: mtxdoc.pdf halleluja.pdf kanons.pdf mtxindex.pdf
-
-mtx.pdf: mtxdoc.pdf mtxindex.pdf
-	./pdfcat -a -o mtx.pdf -i "mtxdoc.pdf mtxindex.pdf"
-
-mtx.dvi: mtxdoc.dvi mtxindex.dvi
-	dviconcat -o mtx.dvi mtxdoc.dvi mtxindex.dvi
-
-support = docversion Makefile make-dvi make-pdf make-target pdfcat
-
-Dzip: 
-	- @zip -ju mtxD`./docversion` $(sources) $(support) README
-
-bare:
-	rm $(examples) $(halleluja_pieces) $(kanons_pieces) *.dvi *.lj *.ps *.pdf\
-     netsoos?.mtx melisma?.mtx *.mx? *.ind *.ilg *.toc *.aux *.log 
-
diff --git a/Master/texmf-dist/doc/generic/m-tx/mtx060/README.M-Txdoc b/Master/texmf-dist/doc/generic/m-tx/mtx060/README.M-Txdoc
deleted file mode 100644
index f8d3d306fe5..00000000000
--- a/Master/texmf-dist/doc/generic/m-tx/mtx060/README.M-Txdoc
+++ /dev/null
@@ -1,73 +0,0 @@
-                   M-Tx Documentation Package
-
-This is the development version of the M-Tx documentation.  It contains
-all the sources for generating the Users's Manual (mtxdoc.?), its index
-(mtxindex.?), and two sample music documents (halleluja.?, kanons.?), where
-'?' might be 'dvi', 'ps', 'pdf' or 'lj'.  
-
-On a GNU system (e.g. Linux; or Cygwin running under Windows) you need
-to change to some empty directory and unzip a file with a name of the
-form mtxD????.zip (use GNU unzip with the -a option, or some other
-unzipper that can convert text files to your operating system format).
-You need to have MusiXTEX, PMX, musixlyr and M-Tx already installed.
-
-Now decide whether you will need:
- .ps, .pdf, .dvi or .lj files (go to 1); 
- only .ps or .pdf files (goto 2).
-
-
-                1. If you want .dvi or .lj files
-
-This option allows you to make any of the four file formats.  Type
-
-  make dvitarget && make config
-
-to configure the option.  Make sure that everything looked for was found.
-You can then choose between:
-
-  make	      Makes mtx.dvi (and mtxdoc.dvi, mtxindex.dvi on the way there)
-  make all    Make .dvi files.  
-  make ps     Make .dvi and .ps files
-  make pdf    Make .dvi, .ps and .pdf files
-  make ?.lj   Make the specified .lj file
-
-
-                2. If you want only .ps or .pdf files
-
-You need to have pdflatex installed (any good TeX distribution has it). Type
-
-  make pdftarget && make config
-
-to configure the option.  Make sure that everything looked for was found.
-You can then choose between:
-
-  make	      Makes mtx.pdf (and mtxdoc.pdf, mtxindex.pdf on the way there)
-  make all    Make .pdf files.  
-  make ps     Make .pdf and .ps files
- 
-You don't have the option of making .dvi or .lj files.
-
-
-Dirk Laurie  <dlaurie@na-net.ornl.gov> 
-
-
-FAQ - Frequently Asked Questions 
-
-1. I get "make: ./prepmx: Command not found".
-
-   A: You have omitted the "make config" step.
-
-2. I have configured, but the make still fails.
-
-   A: Look at the screen output from "make config".  Make sure that
-      there is a file name after each "...".
-
-3. Is there any difference between the .pdf and .ps files made by the
-   two options?
-
-   A: Yes.  If you go by the second route, slurs tend to look smoother
-      and certain additional slur shapes are possible; see the PMX manual.
-      Also, the two versions look a little different on a low-resolution 
-      monitor, but apart from slurs, should be virtually indistinguishable
-      when printed.
-
diff --git a/Master/texmf-dist/doc/generic/m-tx/mtx060/docversion b/Master/texmf-dist/doc/generic/m-tx/mtx060/docversion
deleted file mode 100755
index 22dbcf815ec..00000000000
--- a/Master/texmf-dist/doc/generic/m-tx/mtx060/docversion
+++ /dev/null
@@ -1 +0,0 @@
-grep 'def\\versionname' mtxdoc.tex | sed -e "s/.*{\(.*\)\.\(.*\)}.*/\1\2/"
diff --git a/Master/texmf-dist/doc/generic/m-tx/mtx060/make-dvi b/Master/texmf-dist/doc/generic/m-tx/mtx060/make-dvi
deleted file mode 100644
index ea88e471c27..00000000000
--- a/Master/texmf-dist/doc/generic/m-tx/mtx060/make-dvi
+++ /dev/null
@@ -1,16 +0,0 @@
-target = dvi
-latex = latex
-concat = dviconcat
-
-%.lj: %.dvi
-	dvicopy $* xxx
-	dvilj -e$*.lj xxx
-	rm xxx.dvi
-
-%.pdf: %.ps
-	ps2pdf $*.ps
-
-%.ps: %.dvi
-	dvips -D 600 $* -o $*.ps 
-	
-
diff --git a/Master/texmf-dist/doc/generic/m-tx/mtx060/make-pdf b/Master/texmf-dist/doc/generic/m-tx/mtx060/make-pdf
deleted file mode 100644
index 355b8e48682..00000000000
--- a/Master/texmf-dist/doc/generic/m-tx/mtx060/make-pdf
+++ /dev/null
@@ -1,6 +0,0 @@
-target = pdf
-latex = pdflatex
-concat = gs
-
-%.ps: %.pdf
-	pdf2ps $*.pdf $*.ps 
diff --git a/Master/texmf-dist/doc/generic/m-tx/mtx060/make-target b/Master/texmf-dist/doc/generic/m-tx/mtx060/make-target
deleted file mode 100644
index 355b8e48682..00000000000
--- a/Master/texmf-dist/doc/generic/m-tx/mtx060/make-target
+++ /dev/null
@@ -1,6 +0,0 @@
-target = pdf
-latex = pdflatex
-concat = gs
-
-%.ps: %.pdf
-	pdf2ps $*.pdf $*.ps 
diff --git a/Master/texmf-dist/doc/generic/m-tx/mtx060/meter.mtx b/Master/texmf-dist/doc/generic/m-tx/mtx060/meter.mtx
deleted file mode 100644
index 7223d511c32..00000000000
--- a/Master/texmf-dist/doc/generic/m-tx/mtx060/meter.mtx
+++ /dev/null
@@ -1,10 +0,0 @@
-Style: Piano
-Meter: m3406
-%% \def\upiii#1{\raise3\internote\hbox{{#1}}}
-%% \def\chacarera{\meterfrac34\upiii{\Big(}\meterfrac68\upiii{\Big)}}
-%% \let\oldmeterC=\meterC  \let\meterC=\chacarera
-
-%% w100m
-a-2d o> a8 r r a r r a2d o> |
-C: dfsa cea cea dfsa 
-d-2d o>-15 a4 a { [h d8 {u d+ ] d2d } zd- } |
diff --git a/Master/texmf-dist/doc/generic/m-tx/mtx060/pdfcat b/Master/texmf-dist/doc/generic/m-tx/mtx060/pdfcat
deleted file mode 100755
index fd773f76903..00000000000
--- a/Master/texmf-dist/doc/generic/m-tx/mtx060/pdfcat
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-
-# pdfcat.sh
-# Thanks to Christian Mondrup for this script
-
-FILENAME=`basename $0`
-
-USAGE="Usage: $FILENAME [-a (A4 paper)] -o outputfile -i \"inputfile1 inputfile12 ...\""
-
-if [ $# -le 3 ]
-then
-    echo $USAGE
-    exit 2
-fi 
-
-GSARGS="-q -dNOPAUSE -dBATCH -dSAFER -sDEVICE=pdfwrite"
-
-while getopts "i:o:a" ARG_STRING
-do
-    case $ARG_STRING in
-    a)	GSARGS="-sPAPERSIZE=a4 $GSARGS"
-        ;;
-    i)  INPUTFILES=$OPTARG
-	;;
-    o)	OUTPUTNAME=$OPTARG
-	;;
-    *)	echo $USAGE
-	exit 2;;
-    esac
-done
-
-gs $GSARGS -sOutputFile=$OUTPUTNAME $INPUTFILES
diff --git a/Master/texmf-dist/doc/generic/m-tx/mtx060/mtxdoc.tex b/Master/texmf-dist/doc/generic/m-tx/mtxdoc.ltx
index ff9ce04d016..d84e3bd15ff 100644
--- a/Master/texmf-dist/doc/generic/m-tx/mtx060/mtxdoc.tex
+++ b/Master/texmf-dist/doc/generic/m-tx/mtxdoc.ltx
@@ -1,6 +1,8 @@
 \documentclass[11pt]{article}
-\usepackage{etex}
-\usepackage{a4wide,color,mtxlatex,mtxdoc} 
+% mtxlatex and mtxdoc must be loaded before any font-defining packages
+% like charter, bookman etc
+\usepackage{color,mtxlatex,mtxdoc,multicol} 
+\paperAfour
 % You might like to put \paperUS here
 \usepackage{verbatim,charter}
 % \renewcommand{\ttdefault}{cmtt}  
@@ -9,23 +11,30 @@
 \mtxlatex
 \newcommand{\delete}[1]{\relax}
 \newcommand{\archiveSite}{
- \texttt{http://icking-music-archive.sunsite.dk/mailinglist/archive}
+ \texttt{http://icking-music-archive.org}
+}
+\newcommand{\scoreSite}{
+ \texttt{http://imslp.org}
 }
 \newcommand{\mailingList}{
-\texttt{tex-music@sunsite.dk}
+\texttt{tex-music@tug.org}
+}
+\newcommand{\repository}{
+\texttt{https://github.com/dlaurie/M-Tx}
 }
 
-\def\versionname{0.60}
-\def\version{0.60}
-\def\newfrom{0.60}
-\date{16 March 2005}
+\def\versionname{0.61}
+\def\version{0.61}
+\def\newfrom{0.61}
+\date{11 December 2015}
 \title{\Huge \textbf{\MTx: Music from Text \\ \LARGE Version\current} \\
   User's Guide \vfill}
-\author{\LARGE Dirk Laurie\\ \texttt{dlaurie@na-net.ornl.gov} }
+\author{\LARGE Dirk Laurie\\ \texttt{dirk.laurie@gmail.com} }
 
 \makeindex
 \begin{document}
 
+
 \vfill
 \maketitle
 \vfill
@@ -45,9 +54,7 @@
 \section{Music from Text}
   Written music has a distinctive appearance, very unlike written text.
 But if we want to enlist the aid of the computer to print our scores, we 
-either need a sophisticated graphical interface\footnote{One such is
-\texttt{noteedit} by J\"org Anders obtainable from the Archive --- 
-see Section \ref{Archive}.}, or we must describe 
+either need a sophisticated graphical interface, or we must describe 
 music in terms of what we are able to type.   Text input is not going to 
 look much like printed music, but we would like it to resemble printed 
 music closely enough that we can see the correspondence. 
@@ -126,17 +133,8 @@ printed music will not necessarily be broken at the same places as
 the paragraphs. 
 
 Only in the simplest cases (every music line in the paragraph starts with
-what might be a note) are you allowed to omit the preamble.  
-
-The preamble lines in this example are self-explanatory. The one 
-mysterious line is the one starting with \ttxem{\%\%}at the top of 
-the music paragraph.  The present 
-implementation of \MTx~acts as a front end to the \PMX\ program.  
-Things that 
-can be done easily in \PMX\ are not re-invented, but instead the \ttxem{\%\%} 
-facility is  provided to pass information directly to \PMX. The \PMX\ command 
-\texttt{w120m}  means `width 120 millimetres'.  A short tutorial on \PMX\ 
-appears in Appendix \ref{pmx}. 
+what might be a note) are you allowed to omit the preamble.  The preamble 
+lines in this example are self-explanatory, I hope. 
 
 A few words on technical terms, to make sure that we know what we are 
 talking about:
@@ -162,8 +160,7 @@ voices that are heard at the same time.
 \subsection{Lyrics}
 
 I wrote the \MTx\ converter because \ixem{lyrics} are not part of the \PMX\ 
-design.   It used to be\footnote{Rainer Dunker's \texttt{musixlyr} package,
-on which \MTx\ depends, can now be used directly with \PMX.}
+design.   It used to be\footnote{I.e.. before Rainer Dunker's \texttt{musixlyr} package, on which \MTx\ depends, became \PMX-aware.}
 a major effort to obtain pretty output like the 
 following:
 \vskip 12pt \hskip -20mm
@@ -278,8 +275,7 @@ formatted meter change word. \NEW{0.30}
 E.g.~\ttxem{m3/4/0/0} gives a blind meter change 
 --- one that takes effect but is not printed.  See the \PMX\ manual.
 This is also legal in the preamble \ttxem{Meter:} command. 
-You may not introduce a meter change directly to \PMX\ via a \verb"%%"
-command --- \MTx\ must know about it too.    
+   
   \end{itemize}
 
 \subsection{Beams and \ixem{slurs}}  \label{beamslur}
@@ -304,7 +300,7 @@ Look at the second system of the same song:
 \small
 \input netsoos1.tex
 \end{mus}
-Omitting the preamble and \PMX\ lines, this is coded 
+Omitting the preamble, this is coded 
 as:\footnote{The coding is for this 
 morsel only, not an extract out of the coding for the whole piece.  The 
 octave of the first note here is the default, not deduced from a 
@@ -337,7 +333,7 @@ before any adjustments.  Of course, any labelled slur of either kind
 that you open must be closed again by its exact partner.  If you really
 must have interlocking slurs,  \verb"(1 c8 d e (2 g g )1 f d b )2 c2"
 is the way to get them.  \delete{Labelling slurs in this way is also the only way
-of getting more than two leves of slurs.}
+of getting more than two levels of slurs.}
 
 It may happen that you do not wish \MTx\ to put more than one note to a 
 syllable even though the notes are under a beam or slur.  
@@ -435,7 +431,7 @@ style names are translated to uppercase internally.
 \verb"Flats: 3" & Key signature has three flats. \\
 \verb"Sharps: 2" & Key signature has two sharps. \\
 \verb"Space: 6 0 3" & Extra interlines of space below staves. \\
-\verb"PMX: h10i" & \PMX\ command in preamble. Rather like \verb"%%" feature.\\
+\verb"PMX: Ar" & \PMX\ command in preamble.\\
 \verb"Options: x" & Forces the \texttt x option to be in effect, despite the command line. \\
 \verb"Enable: pedanticWarnings" & Enables the \texttt{pedanticWarnings} feature. \\
 \verb"Disable: unbeamVocal" & Disables the \texttt{unbeamVocal} feature. \\
@@ -443,12 +439,15 @@ style names are translated to uppercase internally.
 \verb"Systems: 11" & Use a total of eleven systems. \\
 \verb"Bars/line: 4" & Try to use on the average four bars to a line. \\
 \verb"Size: 16" & Size of music in points: default is 20. \\
+\verb"Width: 190mm" & Width of line in \texttt{mm} (or \texttt{in} or 
+\texttt{pt}). Default is \texttt{190mm}.\\
 \verb"Style: Singer Piano" & 
   The piece is for a singer with piano accompaniment. \\
 \verb"Name: Dietrich Gerald" & Names of instruments, performers etc. \\
 \verb"Indent: 0.10" & Indent first system by 10\% of the music width. \\
 \verb"Start: @+1;@-3" & Put specified items at the start of voice lines\\
-\verb"Octave: 4 4 3 3" & Specify \indexed{initial octaves} for each stave
+\verb"Octave: 4 4 3 3" & Specify \indexed{initial octaves} for each stave \\
+\verb"TeX: \elevensf" & Type 2 TeX code (see Appendix \ref{expert})\\
 \end{tabular}  \NEW{0.54}
 \vskip 1ex
 The \ttxem{Bars/line} command should only be used when you do not yet 
@@ -518,6 +517,10 @@ You don't normally need to specify \NEW{0.54} \ttxem{Octave},
 \index{octave@octave!defining initial}
 since most of the time the octave implied by the clef is correct.
 
+\ttxem{TeX} \NEW{0.61} should be used for last-minute overrides
+of commands that come from system \TeX\ files like \verb`mtx.tex`
+and \verb`pmx.tex`.
+
 \subsection{Customizing \MTx} \NEW{0.55} \label{customize}
 
 You have a lot of control over how \MTx\ does its translation.  The old way
@@ -547,6 +550,8 @@ enabled by default:
     slurs.
   \ttxi{uptextOnRests} Synchronize uptext with notes and rests, not only with
     notes.
+  \ttxi{checkAssertions} Interpret certain comments as assertions (see Section 
+   \ref{debugging-aids}.
 \end{description}
 
 Here is a list of switchable \MTx\ features that are 
@@ -586,7 +591,7 @@ also have as many \texttt{Enable:} and \texttt{Disable:} lines as you want.
 For example, to imitate the way \MTx\ 0.54c did things, put
 \begin{verbatim}
 Enable: interpretSlurs
-Disable: newWordShortcut multiFile
+Disable: newWordShortcut multiFile checkAssertions
 \end{verbatim}
 
 \section{Fine-tuning the printed output}
@@ -1005,7 +1010,10 @@ describe precisely what happens and you are advised to experiment.
 \subsection{Skipping and including portions of a score}   \label{multiscore} 
 
 To read in another file at the start of a paragraph, \NEW{0.55}
-use the \ttxem"Include:" directive, e.g.\ \verb"Include: mylayout.mti".
+use the \ttxem"Include:" directive, e.g.\ 
+
+   \verb"Include: mylayout.mti"
+
 The effect is exactly the same as if those lines had been part of the original
 input file.  The file thus included may also contain "Include:"
 directives; there is no restriction on the number of levels.  You may
@@ -1029,8 +1037,8 @@ the corresponding lines from all non-lyrics paragraphs after the paragraph
 containing the \texttt{Only} are processed until another \texttt{Only} is 
 found.  Any paragraph containing an \texttt{Only} is always fully taken into 
 account: it is not subjected to the masking action of any \texttt{Only}. 
-\emph{WARNING: this feature is deprecated and may behave
-differently in future versions.}
+\emph{WARNING: this feature is deprecated and may behave differently in 
+or even be omitted from future versions.}
 
 You can also conditionally ignore portions of the score depending on a 
 compiler variable.  \NEW{0.42} The compiler options \texttt{0} to \texttt{9} 
@@ -1123,11 +1131,80 @@ by actually inserting the strings into \MTx\ input lines, which
 may not be longer than 255 characters.  Too many macro expansions,
 and you hit your head against the ceiling.
 
+\section{Debugging aids} \NEW{0.61} \label{debugging-aids}
+
+The very compactness of \PMX\ music notation works against you
+when debugging. One music paragraph looks very much like another.
+Notes inherit pitch and duration from context, and when there is 
+a mistake, it is not easy to see where in a long music line that 
+context comes from. 
+
+Octave mistakes have a way of accumulating, but only show up when 
+you see a typeset score full of leger lines way above or below the 
+stave.
+
+Left to itself, \MTx\ can and does check that all music lines end 
+at a bar ending, and that lines from the same paragraph have the 
+same length. But it cannot tell that which of two lines is wrong, 
+only that they are different.
+
+Many programmers use commenta lines \verb`% -- Bar 40 --` to help 
+them keep track of where they are in a score. This practice has
+now been formalized as a debugging aid.
+
+Certain comments can be recognized by \MTx\ as assertions, allowing
+additional correctness checks can be made. Apart from the comment
+sign, they look like preamble commands, but are normally placed in
+the music paragraph to which they apply.
+
+\begin{tabular}{ll}
+
+\verb"% Range: S=4d-5d, A=3b-4g" & Requests range checking for the specified voices. \\
+\verb"% Bar: 30-31" & If only one bar, give just one number.
+
+\end{tabular}
+
+The format used here for \ttxem{Range} checking puts the octave
+ before the note, e.g. \verb`4f`, to avoid confusion with \verb`f4`
+in which the digit indicates duration. The error messages
+use the same notation.
+
+Either of these comments may also appear in a preamble paragraph,
+in which case they apply to the entire score. 
+% {-- Maybe later --} The first number in such a global \verb`Bar` 
+% is used to initialize the printed bar count.
+
+\subsection{Error messages}
+
+Most error messages will give a line number and say approximately
+where the error was found. In that case, the original line is printed
+with a marker at that point. Also printed is what has happened to that
+line in the meantime, mostly explicit duration indications on every
+note.
 
-\section{Acknowledgments} I still have the 
-\texttt{.tex} and \texttt{.dvi} files of my first attempt at setting music 
-(Bach, no less) with the \mutex\ package of Andrea Steinbach and Angelika 
-Schofer.  The first phrase goes: \begin{verbatim} 
+If there is no line number (this mostly happens in the preamble)
+the message in most cases deals with something that you should have
+supplied.
+
+Sometimes the actual error may be on another line, e.g.\ when it is 
+found that music lines have a different duration, the first line 
+processed may be the one that is wrong, but the discrepancy is only 
+found later.
+
+Error messages generated by assertions can be a lot more informative
+than others, and you are urged to exploit these. To find out what life
+would have been like without them, you can always issue 
+`Disable: checkAssertions` in the preamble.
+
+\section{Acknowledgments} 
+
+% In DPL-DOS/huis.tgz
+
+I still have the 
+\texttt{.tex} and \texttt{.dvi} files of my first attempt (in October 1992)
+at setting music (Bach, no less) with the \mutex\ package of Andrea Steinbach 
+and Angelika Schofer.  The first phrase goes: 
+\begin{verbatim} 
 \4\,\F\~\B\.\c\|\2\A\.\|\4\B\,\E\E\| \2\group{\\\E\\\d}{\\0\\{-1}}\lslur12\go\| 
 \end{verbatim} 
 In \MTx\ that would be                        
@@ -1158,19 +1235,20 @@ horizontal tuning.
 Chris Walshaw's \ABC\ provided the repeat notation.  
 
 The layout of \MTx\ bears some resemblance to a language developed by 
-Miguel Filgueras, not yet publicly available in software, although I did 
-not consciously borrow his ideas. 
+Miguel Filgueiras, published in 1998 in \textit{Software Practice and
+Experience}, although I did not consciously borrow his ideas. I have
+been unable to find an implementation on the Internet.
 
 I had some enlightening e-mail correspondence with the developers of 
 MPP, Jan Nieuwenhuizen and Han-Wen Nienhuys. 
-This package (no longer being maintained, unfortunately: the authors are 
-working on something altogether grander called LilyPond) was the first 
+This package (no longer maintained, unfortunately) was the first 
 music package which made me believe that one could write good-looking 
 scores in a reasonable amount of time. 
 
 Eric Petersen, Reenen Laurie, Kestell Laurie and Joel Hunsberger found
 several bugs in earlier versions of \MTx.  Christian Mondrup did this for 
 \MTx\ 0.50 and later.  
+
 The subscribers to the discussion list \mailingList\ --- 
 too many to name --- found many more and contributed to the development by 
 requesting new features.  Details of these contribution are given in the
@@ -1183,18 +1261,18 @@ standards for music typesetting, tested software packages, gave
 genuinely expert advice to would-be experts, and encouraged newbies
 with patience and understanding.  When he died unexpectedly at a
 comparatively young age, each of the small but globewide community of users
-of MusiX\TeX\ lost a personal friend and mentor.  His music archive
-as it was at the time of his death can still be accessed at 
-\texttt{ftp://ftp.gmd.de/music} or \texttt{http://www.gmd.de/Music}.
-
-Werner's work is still being carried on, but it requires three people
-to fill his shoes.  Maurizio Codogno is the mailing list administrator,
-Christian Mondrup the maintainer of the software archive, and Don Simons
-the maintainer of the sheet music archive.
-
-My wife, Trienke, has had to suffer many effectively husbandless evenings
-and weekends while I hammered the program and documentation into good enough 
-shape to be able to offer it around.
+of MusiX\TeX\ lost a personal friend and mentor.  
+% His music archive as it was at the time of his death can still 
+% be accessed at \texttt{ftp://ftp.gmd.de/music} or 
+% \texttt{http://www.gmd.de/Music}.
+
+Werner's work is still being carried on: the software archive
+and mailing list URLs are listed in Appendix A, while
+the scores have been merged into the Petrucci Music Library (\scoreSite).
+ 
+My wife, Trienke, had to suffer many effectively husbandless evenings
+and weekends while I hammered the program and documentation into good 
+enough shape to be able to offer it around.
 
 \appendix
 \setcounter{page}{1}
@@ -1213,18 +1291,18 @@ Fortunately, here are many ways to get information and help.
   \item  The packages on which \MTx\ relies all have their own reference
          manuals.  Look for the following files:
     \begin{description}
-      \item{\PMX:~} \texttt{pmx230.pdf}, \texttt{ref230.pdf} 
+      \item{\PMX:~} \texttt{pmx270.pdf}, \texttt{ref270.pdf} 
            (these names will obviously be different
-           if your \PMX\ is not Version 2.30); 
+           if your \PMX\ is not Version 2.70); 
       \item{\musixlyr:~} \texttt{musixlyr.pdf};
       \item{MusiX\TeX:~} \texttt{musixdoc.dvi}. 
     \end{description}
-  \item  Consult the mailing list archive at 
- \begin{quote}\archiveSite \end{quote}
-  \item  Join the \ixem{mailing list} by sending an e-mail message to 
-     \begin{quote}\mailingList\end{quote}
-with the word \texttt{subscribe}
-as subject --- no message body needed.
+  \item  The archive site at \begin{quote}\archiveSite \end{quote} 
+  hosts not only the mailing list archive but also several tutorials 
+  in various languages on MusiX\TeX\ and \PMX.
+  \item  Join the \ixem{mailing list} by filling in the form
+at \\
+\texttt{http://tug.org/mailman/listinfo/tex-music}.
 \end{itemize} 
 
 \section{A short \PMX\ tutorial}  \label{pmx}
@@ -1362,6 +1440,15 @@ if not in the bottom voice.
 \subsection{Useful things to put on \ttxem{\%\%} lines}
 \label{usefulPMX}
 
+You have three ways of passing information directly to PMX.
+
+\begin{enumerate}
+   \item The \ttxem{PMX} preamble command.
+   \item A line starting with \ttxem{\%\%}. The rest of the line is
+treated as \PMX.
+   \item Inside music lines. Anything not recognized is passed through.
+\end{enumerate}
+
 Most of the following commands should appear in the first music paragraph
 or on a \ttxem{PMX} preamble command line.
 Some of them are actually raw \ixem{MusiX\TeX} ---
@@ -1378,7 +1465,8 @@ Put \verb'L10M+10i0.1' to make a new movement start at the 6th system,
 with 10 internotes of extra space between movements and an indentation
 of $0.1=10\%$ of the width.
  \item{\verb"h260m"} Height is 260 millimetres.
- \item{\verb"w8i"} Width is 8 inches.
+ \item{\verb"w8i"} Width is 8 inches. Note that \PMX's height and width
+have one-letter units, not two-letter like \TeX\ itself and \MTx.
  \item{\verb"\\vsize 270mm\"} Height given to MusiX\TeX\ is 270 millimetres. 
  \item{\verb"Ar"}  Use relative \ixem{accidentals}.  This requires a different 
   way of coding flats and sharps ---think of \verb's' as meaning 
@@ -1400,141 +1488,73 @@ reason to do so.  You can also force all big accidentals by \verb"Ab."
   cutting through lyrics in the process. 
   \item{Midi commands}  \PMX\ can make MIDI files.  For example, if you put
 \begin{verbatim}
-PMX: Ii55:55:55:55t96b56:72:48:80v127:100:73:46
+PMX: Ii55:55t96b56:72v127:100
 \end{verbatim}
-in your preamble, a MIDI file will be generated in which all four
-instruments
-are played on MIDI instrument number 54 (if you use the default
-instruments together with \texttt{Timidity++}, this means `voices')
-at a tempo of 96 quarter-notes to a minute, with MIDI balances
-of 56, 72, 48 and 80 (centre is 64) and MIDI velocities
-of 127, 100, 73 and 46 respectively.  More details appear in the
-\PMX\ manual.  
+in the preamble of \texttt`netsoos.mtx`, a MIDI file will be generated 
+in which both instruments (Soprano/Alto and Tenor/Bass) are played on 
+MIDI instrument number 54 (on my system this means `voices') at a tempo 
+of 96 quarter-notes to a minute, with MIDI balances of 56 and 72 (centre 
+is 64) and MIDI velocities of 127 and 100 respectively.  More details 
+appear in the \PMX\ manual.  
 \end{description}
 
-\section{How to get and use \MTx}
+One thing that you must only pass to PMX by the third method — embedded
+in a music line — is a meter change, otherwise \MTx\ does not know about 
+it and will continue to count bars by the old meter.
 
-\textit{Sorry, this section assumes that you have some knowledge of 
-computers! Get a \TeX-pert to help you if necessary.}
+\section{How to get and use \MTx}
 
-\subsection{Installation} \label{Archive}
+There are such excellent tutorials available at \archiveSite\ that 
+this section is unnecessary. In every subsection, only a few random 
+remarks are left. You can safely skip it all. Just visit the website.
 
-The primary official source for all the software you need is 
-the MusiX\TeX\ \ixem{Archive} at 
-\begin{quote} \archiveSite \end{quote} in the 
-\texttt{/music/musixtex/} directory
-and its subdirectories.
-Copies spread from there to other official CTAN (Comprehensive \TeX\
-Archive Network) sites.  
-\MTx\ is in the \texttt{software/mtx} subdirectory. 
-You might find there a binary package suitable for your system; 
-if so, you can ignore the part of this section that discusses compilation.
+\subsection{Installation and running} \label{Archive}
 
-\begin{quote}
-Read the \ttxem{README} file that comes with the \MTx\ zip file.
-\end{quote}
+On a Debian system (which also includes Ubuntu) you can simply
+install the \verb`m-tx` package with all its dependencies (which,
+if you do not yet have \TeX, is staggeringly much).
 
-If you are still reading on despite the previous line, here is a
-general description --- but the most recent stuff, the real nitty-gritty,
-is in the \texttt{README} file.
-
-To use \MTx, you need a working \ibxem{PMX} installation (version 
-2.502 or later, 
-although many scores will work with earlier versions)  which 
-is in the \texttt{software/pmx} subdirectory of the Archive.
-\PMX\ itself is a 
-preprocessor to Daniel Taupin's \ixem{MusiX\TeX} (Version T.112 was used
-to prepare this manual), which is in the  MusiX\TeX\ Archive directory itself.
-All of these depend on Donald Knuth's \TeX\ typesetting package.
-If your system does not already have \TeX, put pressure on your system
-administrator.
-
-You will need Rainer Dunker's \ttxem{musixlyr} extension package (version
-2.0c or later).  This package is available with full documentation in the
-\texttt{add-ons} subdirectory of the Archive, and you should read
-that documentation if you need more lyrics features than 
-those accessible from \MTx.  
-
-My \MTx\ translator was originally written in Turbo Pascal, but I use  
-the Free Pascal compiler, available for many systems, for current development
-work.  
-For the sake of those users whose systems do not yet run Free Pascal, 
-but have a C compiler that accepts ANSI C source code,
-the Pascal source distribution provides the possiblity of making a C translation,
-using Dave Gillespie's Pascal-to-C converter \texttt{p2c}
-and a bit of post-translation hacking.  
+If you need to compile from source, grab it from \repository\ and
+look for a file whose name starts with \verb`README`. You will
+need a Free Pascal compiler.
  
 Once you have all the software, make an \MTx\ file with extension 
 \dotxem{mtx} using your normal text editor.  It must be an \ixem{editor} that
 respects the line boundaries and empty lines that you type in: in other 
-words, something fairly primitive, not an upmarket word processor.  Run 
-the program \ttxem{prepmx} with argument \texttt{basename} when
-your file is called \texttt{basename.mtx}.  The output 
-will be a file \texttt{basename.pmx} which then goes through \PMX\ 
-and \TeX.  The error detection capabilities of \texttt{prepmx} are 
-reasonable but not extensive: much is passed through unexamined to \PMX. 
-
-\subsection{The \texttt{prepmx} command line} \label{commandline}
-You could also supply other arguments on the \ixem{command line}.  
-A complicated command line in Unix (replace \verb'/' by \verb'\'
-in DOS) might be
+words, something fairly primitive, not an upmarket word processor.
+
+Thanks to Bob Tennent, all the intermediate steps that you used to
+need are now unnecessary. There will be an executable file called
+\verb`m-tx` on your system so that simply invoking 
 \begin{verbatim}
-prepmx -bvn mysong /home/dirk/texinput /home/dirk/mtx/mystyles.txt
+  m-tx jobname
 \end{verbatim}
+will take you all the way from \verb`jobname.mtx` to \verb`jobname.pdf`.
 
-This line contains switches (recognized by the leading hyphen), 
-a basename, the directory where
-the final \dotxem{tex} file will be put (if you omit it, files go in the 
-current directory), and the file where I keep my
-own styles (if omitted, the file \ttxem{mtxstyle.txt} in the current directory
-is used, if there is one).  Instead of putting the switches as here on the 
-command line, you can specify them 
-in a preamble \ttxem{Options:} line, which takes precedence over the command 
-line. 
-
-\begin{description}  \index{command line!switch}
- \item {\ttxem{-b}} \quad Disable \texttt{unbeamVocal}.
- \item {\ttxem{-c}} \quad Disable \texttt{doChords}.
- \item {\ttxem{-D}} \quad Enable \texttt{debugMode}.
- \item {\ttxem{-f}} \quad Enable \texttt{solfaNoteNames}.
- \item {\ttxem{-i}} \quad Enable \texttt{ignoreErrors}. 
- \item {\ttxem{-m}} \quad Disable \texttt{doLyrics}.
- \item {\ttxem{-n}} \quad Enable \texttt{instrumentNames}.
- \item {\ttxem{-t}} \quad Disable \texttt{doUptext}. 
- \item {\ttxem{-u}} \quad Disable \texttt{uptextOnRests}.
- \item {\ttxem{-v}} \quad Enable \texttt{beVerbose}.
- \item {\ttxem{-w}} \quad Enable \texttt{pedanticWarnings}.    
- \item {\ttxem{-0}, \ttxem{-1}, \dots, \ttxem{-9}} \quad Select specified 
-case of multiple score.  See Section \ref{multiscore}. 
-\end{description}
+You can do the seven steps separately. The first of them is running
+\verb`prepmx jobname`. After that, the command you will need is
+\verb`pmx2pdf jobname`, also courtesy of Bob Tennent.
+
+There are several options available for the first step, which can be 
+displayed by running \verb`prepmx -h`.
 
 The \texttt{prepmx} program exits with \ixem{return code} 0 if no error was 
 found, and return code $n$ if an error was found while processing line $n$ of 
-the input.  \NEW{0.40}Return code 10000 means that the input file was
-empty or could not be opened, or that an invalid option was encountered.  
-In the latter case, a list of available features is displayed ---
-this is a quick way of obtaining such a list.
-
-In some cases, the actual error may be on
-another line, e.g.\ when it is found that music lines have a different
-duration, the first line processed may be in error, but the discrepancy
-is only found  later.
-
-
+the input. 
+ 
 \subsection{Bugs, restrictions and incompatibilities} \label{limits}
 
 The status of bugs changes too quickly for this document.  Please 
 consult the files supplied with the package, in particular 
-\texttt{README}, \texttt{Corrections} and \texttt{Bugs}.
+\texttt{README.txt}, \texttt{Corrections} and \texttt{Bugs}.
 
 In \MTx\current\ a paragraph may not be more than 100 lines long, 
-an input line 
-(including those in lyrics paragraphs) not more than 255 characters, 
-a lyrics 
-line in a music paragraph not more than 128 characters, and you may define a 
-maximum of 12 extra style elements of your own, whether in the preamble or in 
-the \ttxem{mtxstyle.txt} file.  It is possible to change these easily: see 
-\texttt{README}.
+an input line (including those in lyrics paragraphs) not more than 
+255 characters, a lyrics line in a music paragraph not more than 
+128 characters, and you may define a maximum of 12 extra style 
+elements of your own, whether in the preamble or in the 
+\ttxem{mtxstyle.txt} file.  It is possible to change these if you compile
+from source: they are clearly recognizable in \texttt{globals.pas}.
 
 \NEW{0.42} You can have up to 15 voices, using up to 15
 staves.  For each two-voice stave, the number of staves you can have goes
@@ -1544,53 +1564,11 @@ Other limitations are described in the \PMX\ documentation.
 
 \subsubsection{Compatibility}
 
-In \MTx\ 0.55 a small but wide-ranging change has been made in \verb"mtx.tex"
-which affects the \verb"\musixlyr" interface and vertical spacing.  The net 
-result is that new scores will need much less tweaking with \texttt{Space:}
-and \verb"@".  On the other hand, old scores that have laboriously been 
-manipulated into correctness will now look wrong unless you put an old copy
-of \verb"mtx.tex" where it will be found first, preferably in the same 
-directory as the \MTx\ score.
-
-\MTx\ 0.55 takes advantage of the new slur syntax of \PMX\ 2.502.
-In some cases the slurs will look a little different, because \verb"{"...\verb"}"
-now generates ties.
-
-Scores made using \MTx\ 0.52 and later should still compile under 
-\MTx\current.  Older scores may need to be revised.  
-
-Some command line options allowed in \MTx\ 0.52 have been removed.
- 
-The \MTx\ 0.52 documentation stated falsely:
-\begin{quote} \small
-   The default duration at the completion of a line is that of the 
-last note appearing at that stage, which in the case of an expanded
-group is the shorter note.   Since this is opposite to what happens
-during the line itself, a line ending with a
-group should have an explicit duration code for the first note 
-on the next line for that voice.   
-\end{quote}
-Actually, duration is taken from what you code,
-so e.g.\ \texttt{c4.d} will leave the duration code as \texttt{4}.
-Of course, explicitly coding the duration can never hurt.
+\MTx\ 0.61 accepts all scores that were valid under \MTx\ 0.60.
+Older scores may need tweaking.
 
 \subsubsection{Unsupported features of Musix\TeX\ and \PMX}
 
-Unlike MusiX\TeX\ itself, which is stable and nearly complete,
-\PMX\ and \MTx\ are both still in a stage of growth.  Their authors
-are reasonable people who subscribe to the discussion list \mailingList\
-and are open to suggestions
-made there.  If you have any ideas, please email them to the list,
-so other users can see them and comment on them. 
-
-The implementation of new features depends on three factors: what I
-need in my own scores; what users of \MTx\ have asked me to do; and how
-easy and quick it is to do them.  But bear in mind that the underlying
-philosophy of \MTx\ is to be simple and intuitive: arcane features are
-best left to \PMX\ if not MusiX\TeX.  I don't mind how sophisticated the
-\PMX\ code generated needs to be, but the \MTx\ input language must not
-acquire a cluttered and obscure appearance.
-
 Support or otherwise of Musix\TeX\ and \PMX\ features comes at three 
 levels:
 \begin{enumerate}
@@ -1613,9 +1591,10 @@ to catch up later.
 Some pertinent aspects:
 \begin{enumerate}
  \item \MTx\current\ does not recognize the macro features of \PMX.
-You should therefore not use macros for notes or anything else that 
+You should therefore not use PMX macros for notes or anything else that 
 affects the count, the duration, the current octave and other properties
 that are inherited by a note from the next.  But there is no harm in
+HIESA
 using macros for things like extra space.
  \item \MTx\current\ is not aware of movement breaks and the possibility 
 to change the number of voices.
@@ -1626,10 +1605,30 @@ to change the number of voices.
 You can send commands directly to \ibxem{PMX}.  All lines starting with 
 \ttxem{\%\%} in music paragraphs are collected, stripped of the leading 
 \verb"%%" and passed otherwise uninterpreted to \PMX\ before anything 
-else from that paragraph is translated.  \NEW{0.41}  If such a line
-is found in a preamble paragraph, it is treated as a ``Type 4 \TeX\ string'',
-\TeX\ string'' \index{TeX string@{\TeX\ string}!Type 4}
-which means that it will eventually appear at the top of the \TeX\ file,
+else from that paragraph is translated.  \NEW{0.41} 
+
+PMX has four mechanisms for incorporating raw \TeX. Apart from putting
+them inside music lines as in \PMX, they are supported in \MTx\ as follows.
+
+1. A Type 1 \TeX\ string appears on a music line, terminated 
+by a backslash. It takes effect at the next note.
+
+2. A Type 2 \TeX\ string appears in a \ttxem{TeX} command in the preamble.
+The rest of the line will be taken to be \TeX\ and must not end in a
+backslash. There may be several \ttxem{TeX} commands. They take effect
+just before the real typesetting takes place, after all other definitions
+have been processed, and can be used to override just about anything.
+
+3. A Type 3 \TeX\ string appears on a \verb"%%" line in a paragraph, e.g.
+\begin{verbatim}
+%% \\\def\foo{bar}\
+\end{verbatim}
+It takes effect at the start of paragraph, irrespective of where in
+the paragraph it appeared. Note the trailing backslash.
+
+4. A Type 4 \TeX\ string appears on a \verb"%%" line in the preamble. 
+\index{TeX string@{\TeX\ string}!Type 4}
+It will eventually appear at the top of the \TeX\ file,
 after \texttt{musixtex.tex} and \texttt{pmx.tex} have been read in.  
 Such lines should \emph{not} end with \verb"\".
 An example appears in Appendix \ref{dirty}.
@@ -1896,17 +1895,10 @@ books combining the outputs of several \PMX\ runs into a single
 document, such as a collection of songs, or a mainly text document
  (like this one) with many small music excerpts.
 
-Two points apply to all cases:
-\begin{enumerate} 
-  \item Order of inclusion of packages is important.  \texttt{mtxlatex}
-    must be the first package included, before any font packages.
-  \item It is easy to incur \ttxem{TeX capacity exceeded}.  For
-example, the index to this manual is a separate document because
-package \texttt{multicol} won't load on top of all the others.
-If you wish to do large scores, it is probably advisable to change 
-\texttt{texmf.cnf} so that \verb"save_size = 10000" and run
-\texttt{initex}.
-\end{enumerate}
+\begin{quote} \emph{Order of inclusion of packages is important.
+  \emph{\texttt{mtxlatex}}
+    must be the first package included, before any font packages.}
+\end{quote}
 
 \subsection{Collections of complete pieces}
 
@@ -1915,16 +1907,24 @@ pieces, with
 perhaps a title page, a foreword and an afterword, like a typical
 published book of piano pieces or songs.  
 \begin{enumerate}
-  \item Prepare a \texttt{.tex} file for each separate piece, using the methods
-described previously, and be sure that it is fully debugged and looks
-the way you want it, using the standard \texttt{tex-musixflx-tex}
-compiling cycle.
-  \item Write a \LaTeX\ file looking something like this:
+  \item Write a \LaTeX\ file, say \texttt{halleluja.ltx}, 
+looking something like this:
 \verbatiminput{hallelujashort.ltx}
-  \item Use a \texttt{latex-musixflx-latex}
-compiling cycle to make the finished document.
+By the way, this code contains another dirty trick: vertical space
+between systems is tweaked by embedding the bar number in a vertical box.
+  \item Use the script \texttt{musixtex.lua} that, thanks to Bob Tennent,
+forms part of modern \TeX\ distributions\footnote{You need at least Version 
+0.15. If your distribution is not recent enough, download the latest version
+from \texttt{http://icking-music-archive.org/software/musixtex/musixtex.lua}} 
+to build everything in one go. In this case you need to say:
+\begin{verbatim}
+    musixtex kroonhom loofnou halleluja.ltx
+\end{verbatim}
+It is important to put the main file last, so that the \TeX\ files
+are built before the main file is processed.
   \item If you make small changes in the \LaTeX\ part only, a single
 \LaTeX\ pass is sufficient, unless the page numbering has changed.
+You achieve this with the \texttt{-1} option of \texttt{musixtex.lua}.
 \end{enumerate}
 You can see the finished product in \texttt{halleluja.pdf}.
 Some points to note: 
@@ -1934,7 +1934,7 @@ You must put the command \keyindex{mtxlatex} in the preamble.
   \item The package \texttt{times} comes with standard distributions.
 You could use any \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 a package, load it \emph{after} \texttt{mtxlatex}. 
+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\
@@ -1977,12 +1977,13 @@ environment \ttxem{excerpts}, as in the following example:
 \verbatiminput{kanons.ltx}
 The rest of the procedure is the same as for collections of longer
 pieces.
-You can see the finished product in \texttt{halleluja.pdf}.
+You can see the finished product in \texttt{kanons.pdf}.
 Some points to note: 
 \begin{itemize}
   \item The \texttt{excerpts} environment redefines the heading fonts
 to more modest sizes.
   \item A page break should be made before quitting the environment.
+
   \item The pieces do not have bar numbers, but space should be reserved
 for the numbers that show where the voices enter.  This is done
 by redefining the \keyindex{writebarno} command.
@@ -2053,12 +2054,23 @@ of the command and restore it later, e.g.
 In \LaTeX, if you redefine a command inside an environment, the saving and
 restoring is automatic.
 
+\subsection{\Large \texttt{mtx.tex}}  \label{mtxtex}
+
+The \MTx\ preprocessor, as far as possible, issues commands starting
+with \verb"\mtx" instead of direct \TeX\ commands.  The main purpose
+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 ten-point roman.
+which usually is eleven-point roman.
 It can be changed globally, e.g. 
-\verb"%% \twelverm" in the preamble will change the font to
+\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.
@@ -2079,20 +2091,19 @@ If you are not using \LaTeX, they can be redefined in two ways:
 \verb"  \font\BIGfont=cmss9 scaled \magstep4"
 \end{itemize}
 
-\subsection{\Large \texttt{mtx.tex}}  \label{mtxtex}
-
-The \MTx\ preprocessor, as far as possible, issues commands starting
-with \verb"\mtx" instead of direct \TeX\ commands.  The main purpose
-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}.
+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.
 
-Documentation of these commands can be found at the end of the file
-\texttt{mtx.tex}. 
+\pagebreak
 
-%\pagebreak
+\def\Flat{{\musixfont\char'062}}
+\def\Sharp{{\musixfont\char'064}}    
+\def\mtxSharp{\mbox{\raise1ex\hbox{\Sharp}}}
+\def\mtxFlat{\mbox{\raise1ex\hbox{\Flat}}}  
 
-%\printindex
+\printindex
 \end{document}  
 
 \endinput
diff --git a/Master/texmf-dist/doc/generic/m-tx/mtxdoc.pdf b/Master/texmf-dist/doc/generic/m-tx/mtxdoc.pdf
new file mode 100644
index 00000000000..4c93913a6c3
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/m-tx/mtxdoc.pdf
diff --git a/Master/texmf-dist/doc/generic/m-tx/mtx060/mtxdoc.sty b/Master/texmf-dist/doc/generic/m-tx/mtxdoc.sty
index 521d823bfd0..e4e0cbab27f 100644
--- a/Master/texmf-dist/doc/generic/m-tx/mtx060/mtxdoc.sty
+++ b/Master/texmf-dist/doc/generic/m-tx/mtxdoc.sty
@@ -36,14 +36,16 @@
 
 %  Making an index
 
+\definecolor{Green}{rgb}{0,0.5,0.1}
+\definecolor{Red}{rgb}{0.5,0,0.1}
 \long\def\theindex{\renewcommand{\thesection}{}\section{Index}\parindent\z@
   \parskip\z@ plus.3\p@\relax \let\item\@idxitem \columnseprule\z@
   \columnsep35\p@ \begin{multicols}{2}}
 \def\endtheindex{\end{multicols}}
 \def\keyindex#1{\leavevmode
- \hbox{{\color{red}\Bslash #1}}\index{#1@{\protect\Bslash #1}}}
-\def\zkeyindex#1{\index{#1@{\color{red}\protect\Bslash #1}}}
-\def\indexed#1{{\color{green}#1}}
+ \hbox{{\color{Red}\Bslash #1}}\index{#1@{\protect\Bslash #1}}}
+\def\zkeyindex#1{\index{#1@{\color{Red}\protect\Bslash #1}}}
+\def\indexed#1{{\color{Green}#1}}
 \def\ixem#1{\indexed{#1}\index{#1}}
 \def\itxem#1{\indexed{\ital{#1}}\index{#1}}
 \def\ttxem#1{\indexed{\tt #1}\index{#1@{\tt #1}}}
diff --git a/Master/texmf-dist/doc/generic/m-tx/mtx060/mtxindex.tex b/Master/texmf-dist/doc/generic/m-tx/mtxindex.tex
index 5015e7f58fe..5015e7f58fe 100644
--- a/Master/texmf-dist/doc/generic/m-tx/mtx060/mtxindex.tex
+++ b/Master/texmf-dist/doc/generic/m-tx/mtxindex.tex
diff --git a/Master/texmf-dist/doc/generic/m-tx/mtx060/mtxlatex.sty b/Master/texmf-dist/doc/generic/m-tx/mtxlatex.sty
index 6061de4b40b..cc682ab1a27 100644
--- a/Master/texmf-dist/doc/generic/m-tx/mtx060/mtxlatex.sty
+++ b/Master/texmf-dist/doc/generic/m-tx/mtxlatex.sty
@@ -3,7 +3,7 @@
 %   Dirk Laurie  dlaurie@na-net.ornl.gov  2001-12-27
 %   Update: see \mtxdate below
 % Some comments on usage appear at the bottom
-
+\usepackage{etex}
 \ifx\mtxlatex\undefined\else\endinput\fi
 
 \def\MTx{\mbox{\textbf{\textsl{M-Tx}}}}
@@ -28,7 +28,7 @@
 }
 % Extra vertical space evenly spread between systems
 \renewcommand\alaligne{\stoppiece\vfill\contpiece}
-\def\scoreheight{\textheight 260mm}
+\def\scoreheight{\textheight 270mm}
 \def\scorewidth{\textwidth 193mm}
 
 \newcommand{\startscore}{\let\SmuF\startmuflex\let\EmuF\endmuflex
diff --git a/Master/texmf-dist/doc/generic/m-tx/mtx060/netfirst.mtx b/Master/texmf-dist/doc/generic/m-tx/netfirst.mtx
index 8a902b00a1a..101bbac4df1 100644
--- a/Master/texmf-dist/doc/generic/m-tx/mtx060/netfirst.mtx
+++ b/Master/texmf-dist/doc/generic/m-tx/netfirst.mtx
@@ -5,7 +5,6 @@ Sharps: 2
 Meter: 3/4
 Space: 9
 
-%% w190m 
 f f f | e2s e4  | f2 b4 | a2d | g4 g g | f2 f4  | g2 c4n | b2d  |
 d d d | d2r d4r | d2 d4 | d2d | e4 e e | d2s d4 | e2 f4  | f2d  |
 L: 1. Net soos ek is, geen hulp na-by, al-leen U bloed ge-stort vir my,
diff --git a/Master/texmf-dist/doc/generic/m-tx/mtx060/netsoos.mta b/Master/texmf-dist/doc/generic/m-tx/netsoos.mta
index 6e126843cb4..ed0612e80fa 100644
--- a/Master/texmf-dist/doc/generic/m-tx/mtx060/netsoos.mta
+++ b/Master/texmf-dist/doc/generic/m-tx/netsoos.mta
@@ -3,4 +3,3 @@ Sharps: 2
 Meter: 3/4
 Space: 9
 
-%% w190m 
diff --git a/Master/texmf-dist/doc/generic/m-tx/mtx060/netsoos1.mtb b/Master/texmf-dist/doc/generic/m-tx/netsoos1.mtb
index 43b015fe49c..43b015fe49c 100644
--- a/Master/texmf-dist/doc/generic/m-tx/mtx060/netsoos1.mtb
+++ b/Master/texmf-dist/doc/generic/m-tx/netsoos1.mtb
diff --git a/Master/texmf-dist/doc/generic/m-tx/mtx060/netsoos2.mtb b/Master/texmf-dist/doc/generic/m-tx/netsoos2.mtb
index 1d971a9fed0..1d971a9fed0 100644
--- a/Master/texmf-dist/doc/generic/m-tx/mtx060/netsoos2.mtb
+++ b/Master/texmf-dist/doc/generic/m-tx/netsoos2.mtb
diff --git a/Master/texmf-dist/doc/generic/m-tx/mtx060/notes.tex b/Master/texmf-dist/doc/generic/m-tx/notes.tex
index 02d08b1b4ff..02d08b1b4ff 100644
--- a/Master/texmf-dist/doc/generic/m-tx/mtx060/notes.tex
+++ b/Master/texmf-dist/doc/generic/m-tx/notes.tex
diff --git a/Master/texmf-dist/doc/generic/m-tx/prepmx.html b/Master/texmf-dist/doc/generic/m-tx/prepmx.html
deleted file mode 100644
index 494710c31c1..00000000000
--- a/Master/texmf-dist/doc/generic/m-tx/prepmx.html
+++ /dev/null
@@ -1,166 +0,0 @@
-Content-type: text/html
-
-<HTML><HEAD><TITLE>Manpage of prepmx</TITLE>
-</HEAD><BODY>
-<H1>prepmx</H1>
-Section: prepmx Manual Page (1)<BR>Updated: 01 September 2005<BR><A HREF="#index">Index</A>
-<A HREF="http://localhost/cgi-bin/man/man2html">Return to Main Contents</A><HR>
-
-<A NAME="lbAB">&nbsp;</A>
-<H2>NAME</H2>
-
-prepmx - preprocessor for PMX, easy music typesetting program
-<A NAME="lbAC">&nbsp;</A>
-<H2>SYNOPSIS</H2>
-
-<B>prepmx</B>
-
-[<I>options</I>]
-
-<I>jobname</I>
-
-[<I>outdir/</I>]
-
-[<I>stylefile</I>]
-
-<A NAME="lbAD">&nbsp;</A>
-<H2>DESCRIPTION</H2>
-
-<B>M-Tx</B>
-
-is an easy to use preprocessor language for the
-<B>PMX</B>
-
-music typesetting program, aimed at people who are not experts.  For an
-easy example, have a look at the following example:
-<P>
-<BR>&nbsp;&nbsp;c2+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;e4&nbsp;&nbsp;&nbsp;&nbsp;g&nbsp;&nbsp;&nbsp;|&nbsp;b4d-&nbsp;&nbsp;c1&nbsp;d&nbsp;c2&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;|
-<BR>&nbsp;&nbsp;c8&nbsp;g+&nbsp;e&nbsp;g&nbsp;c-&nbsp;g+&nbsp;e&nbsp;g&nbsp;|&nbsp;d&nbsp;g&nbsp;f&nbsp;g&nbsp;&nbsp;&nbsp;&nbsp;c-&nbsp;g+&nbsp;e&nbsp;g&nbsp;|
-<P>
-For syntax reference, please look at the M-Tx manual written by Dirk
-Laurie, the creator of the M-Tx language and the author of prepmx, its
-command line utility.
-<P>
-<B>prepmx</B>
-
-processes the file
-<I>jobname</I>.mtx
-
-to generate
-<I>jobname</I>.pmx.
-
-You can then process this file using the `pmx' command.
-<B>PMX</B>
-
-is a preprocessor for MusiXTeX.
-<P>
-<I>outdir/</I>
-
-is the directory where `pmx' will put the final .tex file. Note that the
-trailing slash is mandatory. You can provide a
-<I>stylefile</I>
-
-for M-Tx. If omitted, the file `mtxstyle.txt' in the current
-directory is used, if there is one.
-<A NAME="lbAE">&nbsp;</A>
-<H2>OPTIONS</H2>
-
-Options can also be specified in a `Options:' line in the preamble,
-which takes precedence over the command line.
-<DL COMPACT>
-<DT><B>-b</B>
-
-<DD>
-never unbeam eighth notes and shorter
-<DT><B>-c</B>
-
-<DD>
-main music lines only - ignore chords
-<DT><B>-D</B>
-
-<DD>
-enable debug mode
-<DT><B>-f</B>
-
-<DD>
-use tonic sol-fa note names
-<DT><B>-i</B>
-
-<DD>
-ignore errors
-<DT><B>-m</B>
-
-<DD>
-music only - ignore lyrics
-<DT><B>-n</B>
-
-<DD>
-indent first system and print default instrument names
-<DT><B>-t</B>
-
-<DD>
-ignore uptext lines
-<DT><B>-u</B>
-
-<DD>
-uptext synchronizes with notes only, not rests
-<DT><B>-v</B>
-
-<DD>
-verbose progress report
-<DT><B>-w</B>
-
-<DD>
-enable pedantic warnings
-<DT><B>-</B><I>n</I>
-
-<DD>
-select specified case of multiple score
-</DL>
-<A NAME="lbAF">&nbsp;</A>
-<H2>EXIT STATUS</H2>
-
-If no error was found,
-<B>prepmx</B>
-
-exits with return code 0.  In case of an error, the line number of the
-processed line is returned. This may not always be the line containing
-the actual error. A return status of 10000 means that the input file was
-empty or could not be opened.
-<A NAME="lbAG">&nbsp;</A>
-<H2>SEE ALSO</H2>
-
-<B>M-Tx</B>
-
-User's Guide (mtx060.pdf)
-<BR>
-
-<A HREF="http://localhost/cgi-bin/man/man2html?1+pmx">pmx</A>(1), <A HREF="http://localhost/cgi-bin/man/man2html?1+musixtex">musixtex</A>(1)
-<A NAME="lbAH">&nbsp;</A>
-<H2>AUTHORS</H2>
-
-prepmx was written by Dirk Laurie &lt;<A HREF="mailto:dpl@sun.ac.za">dpl@sun.ac.za</A>&gt;.
-This manual page was written by Roland Stigge &lt;<A HREF="mailto:stigge@antcom.de">stigge@antcom.de</A>&gt; for the Debian
-project. It was revised and extended by Nis Martensen
-&lt;<A HREF="mailto:nis.martensen@web.de">nis.martensen@web.de</A>&gt;, mostly by copying text from Dirk Laurie's M-Tx
-User's Guide.
-<P>
-
-<HR>
-<A NAME="index">&nbsp;</A><H2>Index</H2>
-<DL>
-<DT><A HREF="#lbAB">NAME</A><DD>
-<DT><A HREF="#lbAC">SYNOPSIS</A><DD>
-<DT><A HREF="#lbAD">DESCRIPTION</A><DD>
-<DT><A HREF="#lbAE">OPTIONS</A><DD>
-<DT><A HREF="#lbAF">EXIT STATUS</A><DD>
-<DT><A HREF="#lbAG">SEE ALSO</A><DD>
-<DT><A HREF="#lbAH">AUTHORS</A><DD>
-</DL>
-<HR>
-This document was created by
-<A HREF="http://localhost/cgi-bin/man/man2html">man2html</A>,
-using the manual pages.<BR>
-Time: 08:56:25 GMT, September 14, 2012
-</BODY>
-</HTML>
diff --git a/Master/texmf-dist/doc/generic/m-tx/prepmx.pdf b/Master/texmf-dist/doc/generic/m-tx/prepmx.pdf
new file mode 100644
index 00000000000..7f1420b5d07
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/m-tx/prepmx.pdf
diff --git a/Master/texmf-dist/doc/generic/m-tx/mtx060/psalm42.mtx b/Master/texmf-dist/doc/generic/m-tx/psalm42.mtx
index c5ad930720a..c5ad930720a 100644
--- a/Master/texmf-dist/doc/generic/m-tx/mtx060/psalm42.mtx
+++ b/Master/texmf-dist/doc/generic/m-tx/psalm42.mtx
diff --git a/Master/texmf-dist/doc/generic/m-tx/mtx060/sanctus.mtx b/Master/texmf-dist/doc/generic/m-tx/sanctus.mtx
index 102a400cc80..2aea4ad3112 100644
--- a/Master/texmf-dist/doc/generic/m-tx/mtx060/sanctus.mtx
+++ b/Master/texmf-dist/doc/generic/m-tx/sanctus.mtx
@@ -5,7 +5,7 @@ Meter: C
 Style: Singer
 Systems: 2
 Size: 20
-%% \hidebarrule1
+TeX: \hidebarrule1
 
 U: !bf 1 | | 2 | | 3 | | 4 | | 5
 (~ c4+.b a of g f e d2 )~ { c2 c4 } of (~ c4 f g a g8 f g2 )~ f4 of (~ c+ d c2 b8 a b4 g cd of b8 a4 g2 { f4 f } e )~ fd of (~ g8 a b c4 )~ f2-
diff --git a/Master/texmf-dist/doc/generic/m-tx/mtx060/title.mtx b/Master/texmf-dist/doc/generic/m-tx/title.mtx
index 2bee58c2706..da0236b8ab8 100644
--- a/Master/texmf-dist/doc/generic/m-tx/mtx060/title.mtx
+++ b/Master/texmf-dist/doc/generic/m-tx/title.mtx
@@ -1,8 +1,9 @@
 Bars/line: 2 
 Style: Solo 
 Meter: m3400
+Width: 3.7in
+TeX: \Largemusicsize
 
-%% w3.7i \\Largemusicsize\
 U: @<v-2 ~ ~ ~ ~ sf ~ ~ sf sf
 [ c1+ r g g ] ( [ af8 g ] ) r b o. | c o. 
 
diff --git a/Master/texmf-dist/doc/generic/m-tx/mtx060/title1.mtx b/Master/texmf-dist/doc/generic/m-tx/title1.mtx
index 9535e62b47a..6ef0af7db87 100644
--- a/Master/texmf-dist/doc/generic/m-tx/mtx060/title1.mtx
+++ b/Master/texmf-dist/doc/generic/m-tx/title1.mtx
@@ -2,8 +2,8 @@ Bars/line: 2
 Style: Solo 
 Meter: m3400
 Size: 29pt
+Width: 3.7in
 
-%% w3.7i 
 U: @<v ~ ~ ~ ~ sf ~ ~ sf sf
 [ c1+ r g g ] ( [ af8 g ] ) r b o. | c o. 
 
diff --git a/Master/texmf-dist/doc/generic/m-tx/mtx060/viva.mtx b/Master/texmf-dist/doc/generic/m-tx/viva.mtx
index 652203d10b1..652203d10b1 100644
--- a/Master/texmf-dist/doc/generic/m-tx/mtx060/viva.mtx
+++ b/Master/texmf-dist/doc/generic/m-tx/viva.mtx
diff --git a/Master/texmf-dist/doc/generic/m-tx/mtx060/volta.mtx b/Master/texmf-dist/doc/generic/m-tx/volta.mtx
index 8052b4ec2c3..8052b4ec2c3 100644
--- a/Master/texmf-dist/doc/generic/m-tx/mtx060/volta.mtx
+++ b/Master/texmf-dist/doc/generic/m-tx/volta.mtx
diff --git a/Master/texmf-dist/doc/man/man1/m-tx.1 b/Master/texmf-dist/doc/man/man1/m-tx.1
deleted file mode 100644
index 66fae3c6d17..00000000000
--- a/Master/texmf-dist/doc/man/man1/m-tx.1
+++ /dev/null
@@ -1,113 +0,0 @@
-.\" This manpage is licensed under the GNU Public License
-.TH m-tx 1 2013-12-11  "m-tx script, version 0.4" ""
-
-.SH NAME
-m-tx \- This script processes mtx files then deletes intermediate files
-
-.SH SYNOPSIS
-[ texlua ]
-.B m-tx[.lua]
-{
-.IR option
-|
-.IR jobname 
-[ .mtx ] 
-} ...
-.TP 
-The default effect is to process each file using 
-.TP 12
-.BR prepmx  (1)
-(pre-pre-processing pass)
-.TP
-.BR pmxab (1)
-(pre-processing pass)
-.TP 
-.BR etex (1)
-(first pass)
-.TP
-.BR musixflx (1)
-(second pass)
-.TP
-.BR etex (1)
-(third pass)
-.TP
-.BR dvips (1)
-(dvi to Postscript)
-.TP
-.BR ps2pdf (1)
-(Postscript to Portable Document Format)
-.TP
-followed by removal of intermediate files.
-
-.SH OPTIONS
-.TP 8
-.B -v 
-output program name and version number, and quit
-.TP
-.B -h
-output usage summary and quit
-.TP
-.B -l 
-changes the TeX processor to
-.BR latex (1)
-or
-.BR pdflatex (1)
-.TP
-.B -p 
-changes the TeX processor to 
-.BR pdfetex (1) 
-or
-.BR pdflatex (1)
-(and doesn't run 
-.BR dvips (1)
-and 
-.BR ps2pdf (1)
-or
-.BR dvipdfm (1)
-)
-.TP
-.B -d 
-changes the dvi processor to
-.BR dvipdfm (1)
-.TP
-.B -c
-use pmxchords before pmx
-.TP
-.B -F fmt
-uses fmt as the TeX processor
-.TP
-.B -s 
-stops processing at the dvi file
-.TP
-.B -t
-stops processing at the tex (and midi) files
-.TP
-.B -m
-stops processing at the pmx file
-.TP
-.B -i
-retain intermediate files
-.TP
-.B -f
-default processing 
-.TP 0
-Options affect processing of all succeeding mtx files unless changed by another option.
-
-.SH SEE ALSO
-.BR prepmx (1)
-.BR pmxab (1)
-.BR scor2prt (1)
-.BR etex (1),
-.BR latex (1),
-.BR pdfetex (1),
-.BR pdflatex (1),
-.BR musixflx (1),
-.BR dvipdfm (1),
-.BR pmxchords (1),
-.BR dvips (1),
-.BR ps2pdf (1).
-.br
-mtx260.pdf
-
-.SH AUTHOR 
-This manual page was written by Bob Tennent <rdt@cs.queensu.ca>.
diff --git a/Master/texmf-dist/doc/man/man1/m-tx.man1.pdf b/Master/texmf-dist/doc/man/man1/m-tx.man1.pdf
deleted file mode 100644
index 01c7102e57f..00000000000
--- a/Master/texmf-dist/doc/man/man1/m-tx.man1.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/man/man1/prepmx.1 b/Master/texmf-dist/doc/man/man1/prepmx.1
index 299591e2e9d..226457c532e 100644
--- a/Master/texmf-dist/doc/man/man1/prepmx.1
+++ b/Master/texmf-dist/doc/man/man1/prepmx.1
@@ -1,4 +1,4 @@
-.TH prepmx 1 "01 September 2005" "M-Tx Version 0.60" "prepmx Manual Page"
+.TH prepmx 1 "15 December 2015" "M-Tx Version 0.61" "prepmx Manual Page"
 .SH NAME
 prepmx \- preprocessor for PMX, easy music typesetting program
 .SH SYNOPSIS
@@ -18,17 +18,18 @@ easy example, have a look at the following example:
   c8 g+ e g c- g+ e g | d g f g    c- g+ e g |
 
 For syntax reference, please look at the M-Tx manual written by Dirk
-Laurie, the creator of the M-Tx language and the author of prepmx, its
-command line utility.
+Laurie, the creator of the M-Tx language and the author of 
+.BR prepmx (1), 
+its command-line utility.
 
 .B prepmx
 processes the file
 .IR jobname .mtx
 to generate
 .IR jobname .pmx.
-You can then process this file using the `pmx' command.
-.B PMX
-is a preprocessor for MusiXTeX.
+You can then process this file using the 
+.BR pmxab (1)
+command, which is a preprocessor for MusiXTeX.
 
 .I outdir/
 is the directory where `pmx' will put the final .tex file. Note that the
@@ -41,40 +42,44 @@ Options can also be specified in a `Options:' line in the preamble,
 which takes precedence over the command line.
 .TP
 .B \-b
-never unbeam eighth notes and shorter
+disable unbeamVocal
 .TP
 .B \-c
-main music lines only \- ignore chords
+disable doChords
 .TP
 .B \-D
-enable debug mode
+enable debugMode
 .TP
 .B \-f
-use tonic sol\-fa note names
+enable solfaNoteNames
 .TP
 .B \-i
-ignore errors
+enable ignoreErrors
 .TP
 .B \-m
-music only \- ignore lyrics
+disable doLyrics
 .TP
 .B \-n
-indent first system and print default instrument names
+enable instrumentNames
 .TP
 .B \-t
-ignore uptext lines
+disable doUptext
 .TP
 .B \-u
-uptext synchronizes with notes only, not rests
+disable uptextOnRests
 .TP
 .B \-v
-verbose progress report
+enable beVerbose
 .TP
 .B \-w
-enable pedantic warnings
+enable pedanticWarnings
 .TP
 .BI \- n
-select specified case of multiple score
+select Special Case 
+.I n
+.TP
+.B \-H
+print enabled status of all options
 .SH EXIT STATUS
 If no error was found,
 .B prepmx
@@ -84,12 +89,12 @@ the actual error. A return status of 10000 means that the input file was
 empty or could not be opened.
 .SH SEE ALSO
 .B M-Tx
-User's Guide (mtx060.pdf)
+User's Guide (mtxdoc.pdf)
 .br
-pmx(1), musixtex(1)
+pmxab(1), musixtex(1)
 .SH AUTHORS
-prepmx was written by Dirk Laurie <dpl@sun.ac.za>.
-This manual page was written by Roland Stigge <stigge@antcom.de> for the Debian
-project. It was revised and extended by Nis Martensen
-<nis.martensen@web.de>, mostly by copying text from Dirk Laurie's M-Tx
-User's Guide.
+prepmx was written by Dirk Laurie <dirk.laurie@gmail.com>. This
+manual page was written by Roland Stigge <stigge@antcom.de>
+for the Debian project. It was revised and extended by
+Nis Martensen <nis.martensen@web.de> and Bob Tennent
+<rdt@cs.queensu.ca>.
diff --git a/Master/texmf-dist/doc/man/man1/prepmx.man1.pdf b/Master/texmf-dist/doc/man/man1/prepmx.man1.pdf
index 910b332a802..e3d478a3b63 100644
--- a/Master/texmf-dist/doc/man/man1/prepmx.man1.pdf
+++ b/Master/texmf-dist/doc/man/man1/prepmx.man1.pdf
diff --git a/Master/texmf-dist/scripts/m-tx/m-tx.lua b/Master/texmf-dist/scripts/m-tx/m-tx.lua
deleted file mode 100755
index 3587a24e2c1..00000000000
--- a/Master/texmf-dist/scripts/m-tx/m-tx.lua
+++ /dev/null
@@ -1,186 +0,0 @@
-#!/usr/bin/env texlua  
-
-VERSION = "0.4"
-
---[[
-     m-tx.lua: processes MusiXTeX files using prepmx and pmxab as pre-processors (and deletes intermediate files)
-
-     (c) Copyright 2011-2012 Bob Tennent rdt@cs.queensu.ca
-
-     This program is free software; you can redistribute it and/or modify it
-     under the terms of the GNU General Public License as published by the
-     Free Software Foundation; either version 2 of the License, or (at your
-     option) any later version.
-
-     This program is distributed in the hope that it will be useful,
-     but WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-     Public License for more details.
-
-     You should have received a copy of the GNU General Public License along
-     with this program; if not, write to the Free Software Foundation, Inc.,
-     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
---]]
-
---[[
-
-  ChangeLog:
-
-     version 0.4   2013-12-11 RDT
-       Add -c option for pmxchords preprocessing of pmx file
-       Add -F fmt option to use fmt as TeX processor
-
-     version 0.3   2012-04-09 RDT
-       Change name to m-tx to avoid clash with another program.
-
-     version 0.2   2011-11-28 RDT
-       Added -i (retain intermediate files) option
-
-     version 0.1.1 2011-07-18 RDT
-
-       Removed a file check that caused it to fail (only on Windows!)
-
-     version 0.1   2011-07-15 RDT
-
---]]
-
-function usage()
-  print("Usage:  [texlua] m-tx.lua { option | basename[.mtx] } ... ")
-  print("options: -v  version")
-  print("         -h  help")
-  print("         -l  latex (or pdflatex)")
-  print("         -p  pdfetex (or pdflatex)")
-  print("         -d  dvipdfm")
-  print("         -c  preprocess pmx file using pmxchords")
-  print("         -F fmt  use fmt as the TeX processor")
-  print("         -s  stop at dvi")
-  print("         -t  stop at tex/mid")
-  print("         -m  stop at pmx")
-  print("         -i  retain intermediate files")
-  print("         -f  restore default processing")
-end
-
-function whoami ()
-  print("This is m-tx.lua version ".. VERSION .. ".")
-end
-
-whoami()
-if #arg == 0 then
-  usage()
-  os.exit(0)
-end
-
--- defaults:
-prepmx = "prepmx"
-pmx = "pmxab"
-tex = "etex"  
-musixflx = "musixflx"
-dvi = "dvips"
-ps2pdf = "ps2pdf"
-intermediate = 1
-
-exit_code = 0
-narg = 1
-repeat
-  this_arg = arg[narg]
-  if this_arg == "-v" then
-    os.exit(0)
-  elseif this_arg == "-h" then
-    usage()
-    os.exit(0)
-  elseif this_arg == "-l" then
-    if tex == "pdfetex" then
-      tex = "pdflatex"
-    else
-      tex = "latex"
-    end
-  elseif this_arg == "-p" then
-    if tex == "latex" then
-      tex = "pdflatex"
-    else
-      tex = "pdfetex"
-    end
-    dvi = ""; ps2pdf = ""
-  elseif this_arg == "-d" then
-    dvi = "dvipdfm"; ps2pdf = ""
-  elseif this_arg == "-c" then
-    pmx = "pmxchords"
-  elseif this_arg == "-F" then
-    narg = narg+1
-    tex = arg[narg]
-  elseif this_arg == "-s" then
-    dvi = ""; ps2pdf = ""
-  elseif this_arg == "-i" then
-    intermediate = 0
-  elseif this_arg == "-f" then
-    pmx = "pmxab"; tex = "etex"; dvi = "dvips"; ps2pdf = "ps2pdf"; intermediate = 1
-  elseif this_arg == "-t" then
-    tex = ""; dvi = ""; ps2pdf = ""
-  elseif this_arg == "-m" then
-    pmx = ""; tex = ""; dvi = ""; ps2pdf = ""
-  else
-    filename = this_arg 
-    if filename ~= "" and string.sub(filename, -4, -1) == ".mtx" then
-        filename = string.sub(filename, 1, -5)
-    end
-    print("Processing ".. filename .. ".mtx.")
-    OK = true
-    if ( os.execute(prepmx .. " " .. filename ) ~= 0 ) then
-      OK = false
-    end
-    if  (OK and pmx ~= "") then 
-      os.execute(pmx .. " " .. filename)  -- does pmx return an error code?
-      pmxaerr = io.open("pmxaerr.dat", "r")
-      if (not pmxaerr) then
-        print("No log file.")
-        OK = false
-      else
-        linebuf = pmxaerr:read()
-        err = tonumber(linebuf)
-        if (err ~= 0) then
-          OK = false
-        end
-        pmxaerr:close()
-      end
-    end
-    os.remove( filename .. ".mx2" )
-    if ( OK ) and
-       (tex == "" or os.execute(tex .. " " .. filename) == 0) and
-       (tex == "" or os.execute(musixflx .. " " .. filename) == 0) and
-       (tex == "" or os.execute(tex .. " " .. filename) == 0) and
-       ((tex ~= "latex" and tex ~= "pdflatex") 
-         or (os.execute(tex .. " " .. filename) == 0)) and
-       (dvi == "" or  (os.execute(dvi .. " " .. filename) == 0)) and
-       (ps2pdf == "" or (os.execute(ps2pdf .. " " .. filename .. ".ps") == 0) )
-    then 
-      if ps2pdf ~= "" then 
-        print(filename .. ".pdf generated by " .. ps2pdf .. ".")
-      end
-      if intermediate == 1 then -- clean-up:
-        os.remove( "pmxaerr.dat" )
-        os.remove( filename .. ".mx1" )
-        os.remove( filename .. ".mx2" )
-        if pmx ~= "" then
-          os.remove( filename .. ".pmx" )
-        end
-        if dvi ~= "" then
-          os.remove( filename .. ".dvi" )
-        end
-        if ps2pdf ~= "" then 
-          os.remove( filename .. ".ps" )
-        end
-      end
-    else
-      print("M-Tx/pmx/MusiXTeX processing of " .. filename .. ".mtx fails.\n")
-      exit_code = 2
-      --[[ uncomment for debugging
-      print("tex = ", tex)
-      print("dvi = ", dvi)
-      print("ps2pdf = ", ps2pdf)
-      --]]
-    end
-  end --if this_arg == ...
-  narg = narg+1
-until narg > #arg 
-os.exit( exit_code )
diff --git a/Master/texmf-dist/tex/generic/m-tx/mtx.tex b/Master/texmf-dist/tex/generic/m-tx/mtx.tex
index a12633d4fff..93a172f2c5d 100644
--- a/Master/texmf-dist/tex/generic/m-tx/mtx.tex
+++ b/Master/texmf-dist/tex/generic/m-tx/mtx.tex
@@ -1,4 +1,6 @@
-% mtx.tex   Dirk Laurie 2001-3-11  Corrections: see mtxtexdate, below.
+% mtx.tex      © 2001–2015 Dirk Laurie     License: MIT (see file LICENSE)
+%    Some code © 2001 André van Ryckeghem  License: GPL
+% Corrections: see mtxtexdate, below.
 
 % All TeX commands put directly into PMX files by M-Tx are defined below,
 %   except the following:
@@ -10,13 +12,15 @@
 % It is therefore possible for a TeXpert to tune the performance
 %   of M-Tx without touching the preprocessor.
 
-% The commands all start with the letters "\mtx" except one:
+% Commands borrowed unchanged from André van Ryckeghem's mypmxdef.tex
+%   have AVR prepended to their names.
+% All other commands start with the letters "\mtx" except one:
 %  "\:" is a short alias for "\relax" to save space on input line length
 
 \ifx\mtxtexversion\undefined\else\endinput\fi 
 
-\def\mtxtexversion{0.60}
-\def\mtxtexdate{16 March 2005}
+\def\mtxtexversion{0.61}
+\def\mtxtexdate{19 November 2015}
 \let\:=\relax
 \message{mtx.tex \mtxtexversion\space<\mtxtexdate>} 
 \message{M-Tx \mtxversion\space(Music from TeXt) <\mtxdate>} 
@@ -33,12 +37,12 @@
 \ifx\assignlyricshere\undefined\message{Your musixlyr.tex is too old}\fi
 
 % M-Tx font definitions
-% Three macros are associated with each lyrics font, e.g.
-%   \mtxmyfont defines \myfont but does not select it
-%   \myfont selects it later
-%   \mtxMyfont (note capital) defines and selects \myfont
-
-\def\mtxInstrfont{\twelvebf}
+% \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
+% \mtxHelvetica: replaces Computer Modern font definitions of
+%    \eightsf etc by Helvetica
 
 \def\mtxeightsf{\font\eightsf=cmss8}
 \def\mtxEightsf{\mtxeightsf\eightsf}
@@ -52,12 +56,42 @@
 \def\mtxtwelvesf{\font\twelvesf=cmss12}
 \def\mtxTwelvesf{\mtxtwelvesf\twelvesf}
 
-% Title fonts are immediately selected
-
 \def\mtxBigsf{\font\Bigtype=cmss9 scaled \magstep2}
 \def\mtxBIGsf{\font\BIGtype=cmss9 scaled \magstep4}
 
-\def\mtxAllsf{\mtxElevensf\mtxBigsf\mtxBIGsf}
+\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 17truept
+\font\BIGtype=pplb at 25truept
+}
+
+\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}
+}
+
+\def\mtxInstrfont{\twelvebf}
+\def\mtxAllsf{\mtxeightsf\mtxtensf\mtxElevensf\mtxtwelvesf\mtxBigsf\mtxBIGsf}
+
+\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
 
@@ -131,9 +165,41 @@
 %         \lyr%                   post the numbers
 %  \en}
 
+% Commands taken from André van Ryckeghem's mypmxdef.tex
+% Page layout: Letter/A4, A4 only, Letter/A4 centered, A3 
+% Use only with plain TeX: these do not interact seamlessly with 
+% LaTeX page layout commands!
+\def\AVRpagforletaiv{%
+\hoffset=-12.4mm\hsize=210mm\advance\hsize-23mm% A4 10mm margin
+\voffset-15.4mm\vsize=11in\advance\vsize-20mm\advance\vsize-12pt}% letter 10 mm margin
+\def\AVRpagforaiv{%
+\hoffset=-12.4mm\hsize=210mm\advance\hsize-23mm%
+\voffset=-15.4mm\vsize=297mm\advance\vsize-20mm\advance\vsize-12pt}%
+\def\AVRpagforaivc{%
+\hoffset=-12.4mm\hsize=210mm\advance\hsize-23mm%
+\voffset=-7.4mm\vsize=11in\advance\vsize-20mm\advance\vsize-12pt}%
+\def\pagforaiii{%
+\hoffset=-5.4mm\hsize=297mm\advance\hsize-37mm%
+\voffset=-5.4mm\vsize=420mm\advance\vsize-37mm\advance\vsize-12pt}%
+
+% Next command adapted from AVR's code. Use thus:
+%  \footline=\mtxFootLine{P1}{P2}{P3}{P4}{P5}
+% The footline on pages 3 and 4 look like this:
+%     P1 - P2           P3          P4 - P5      3
+%  4  P5 - P4           P3          P2 - P1
+% Each parameter should contain its own font selector, or inherit
+%   whatever was in effect.
+\def\mtxFootline#1#2#3#4#5{\ifodd\pageno%
+{{{#1}{\rm~---~}{#2}} \hfill {#3} \hfill {#4}{\rm~---~}{#5}{\rm ~~~ }{\bf \folio }}%
+\else
+{{\bf \folio}{\rm ~~~ }{#5}{\rm~---~}{#4} \hfill {#3} \hfill {#2}{\rm~---~}{#1}}%
+\fi}
+
 % M-Tx default settings
 
 \sepbarrules
+\mtxPalatino
+\elevenrm     % this will be the lyrics font unless overridden
 
 \immediate\write10{=== end of mtx.tex ===}
 \endinput