m-tx 0.63

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

39 files changed, 393 insertions, 532 deletions

diff --git a/Build/source/utils/m-tx/ChangeLog b/Build/source/utils/m-tx/ChangeLog
index b278d7b4285..078a91cbe49 100644
--- a/Build/source/utils/m-tx/ChangeLog
+++ b/Build/source/utils/m-tx/ChangeLog
@@ -1,3 +1,7 @@
+2018-01-09  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
+
+	* Import m-tx 0.63.
+
 2016-02-10  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
 
 	* Import m-tx 0.62.
diff --git a/Build/source/utils/m-tx/TLpatches/ChangeLog b/Build/source/utils/m-tx/TLpatches/ChangeLog
index 0f2b678a6c1..40217e37dcb 100644
--- a/Build/source/utils/m-tx/TLpatches/ChangeLog
+++ b/Build/source/utils/m-tx/TLpatches/ChangeLog
@@ -1,3 +1,8 @@
+2018-01-09  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
+
+	* patch-01-write-bin: Update for 0.63.
+	* patch-02-malloc, patch-03-different-size: Remove.
+
 2016-02-10  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
 
 	* patch-01-write-bin, patch-02-malloc, patch-03-different-size:
diff --git a/Build/source/utils/m-tx/TLpatches/TL-Changes b/Build/source/utils/m-tx/TLpatches/TL-Changes
index 49723579796..f178e27141f 100644
--- a/Build/source/utils/m-tx/TLpatches/TL-Changes
+++ b/Build/source/utils/m-tx/TLpatches/TL-Changes
@@ -1,4 +1,4 @@
-Changes applied to the mtx-0.62 tree as obtained from:
+Changes applied to the mtx-0.63 tree as obtained from:
 	http://www.ctan.org/tex-archive/support/m-tx/
 
 Remove:
@@ -8,6 +8,7 @@ Remove:
 	depcomp
 	install-sh
 	missing
+	test-driver
 
 Move to top directory:
 	tests/*
diff --git a/Build/source/utils/m-tx/TLpatches/patch-01-write-bin b/Build/source/utils/m-tx/TLpatches/patch-01-write-bin
index 0c85cedf4f8..5023d2009b7 100644
--- a/Build/source/utils/m-tx/TLpatches/patch-01-write-bin
+++ b/Build/source/utils/m-tx/TLpatches/patch-01-write-bin
@@ -1,7 +1,7 @@
-diff -ur mtx-0.62.orig/globals.c mtx-0.62/globals.c
---- mtx-0.62.orig/globals.c	Tue Feb 09 05:51:40 2016
-+++ mtx-0.62/globals.c	Thu Feb 11 01:50:54 2016
-@@ -223,7 +223,7 @@
+diff -ur mtx-0.63.orig/globals.c mtx-0.63/globals.c
+--- mtx-0.63.orig/globals.c	Tue Jan 09 01:39:42 2018
++++ mtx-0.63/globals.c	Tue Jan 09 08:46:40 2018
+@@ -230,7 +230,7 @@
      if (outfile != NULL)
        fclose(outfile);
      outfile = NULL;
diff --git a/Build/source/utils/m-tx/TLpatches/patch-02-malloc b/Build/source/utils/m-tx/TLpatches/patch-02-malloc
deleted file mode 100644
index 178d04ee483..00000000000
--- a/Build/source/utils/m-tx/TLpatches/patch-02-malloc
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur mtx-0.62.orig/multfile.c mtx-0.62/multfile.c
---- mtx-0.62.orig/multfile.c	Tue Feb 09 05:52:29 2016
-+++ mtx-0.62/multfile.c	Thu Feb 11 01:52:08 2016
-@@ -61,7 +61,7 @@
-     printf("===! Ignoring recursive include of file %s\n", filename);
-     return;
-   }
--  newnode = malloc(sizeof(filenode));
-+  newnode = Malloc(sizeof(filenode));
-   newnode->actualfile = NULL;
-   strcpy(newnode->name, filename);
-   newnode->prev = current;
diff --git a/Build/source/utils/m-tx/TLpatches/patch-03-different-size b/Build/source/utils/m-tx/TLpatches/patch-03-different-size
deleted file mode 100644
index d51fd15b774..00000000000
--- a/Build/source/utils/m-tx/TLpatches/patch-03-different-size
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -ur mtx-0.62.orig/libp2c/p2c.h mtx-0.62/libp2c/p2c.h
---- mtx-0.62.orig/libp2c/p2c.h	Tue Feb 09 05:23:09 2016
-+++ mtx-0.62/libp2c/p2c.h	Thu Feb 11 01:54:30 2016
-@@ -428,10 +428,10 @@
- 
- /* Memory allocation */
- #ifdef __GCC__
--# define Malloc(n)  (malloc(n) ?: (Anyptr)_OutMem())
-+# define Malloc(n)  (malloc(n) ?: (Anyptr)(size_t)_OutMem())
- #else
- extern Anyptr __MallocTemp__;
--# define Malloc(n)  ((__MallocTemp__ = malloc(n)) ? __MallocTemp__ : (Anyptr)_OutMem())
-+# define Malloc(n)  ((__MallocTemp__ = malloc(n)) ? __MallocTemp__ : (Anyptr)(size_t)_OutMem())
- #endif
- #define FreeR(p)    (free((Anyptr)(p)))    /* used if arg is an rvalue */
- #define Free(p)     (free((Anyptr)(p)), (p)=NULL)
diff --git a/Build/source/utils/m-tx/configure b/Build/source/utils/m-tx/configure
index 86c5ac4d354..94d7864c7ee 100755
--- a/Build/source/utils/m-tx/configure
+++ b/Build/source/utils/m-tx/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for m-tx (TeX Live) 0.62.
+# Generated by GNU Autoconf 2.69 for m-tx (TeX Live) 0.63.
 #
 # Report bugs to <tex-k@tug.org>.
 #
@@ -580,8 +580,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='m-tx (TeX Live)'
 PACKAGE_TARNAME='m-tx--tex-live-'
-PACKAGE_VERSION='0.62'
-PACKAGE_STRING='m-tx (TeX Live) 0.62'
+PACKAGE_VERSION='0.63'
+PACKAGE_STRING='m-tx (TeX Live) 0.63'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL=''
 
@@ -1275,7 +1275,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures m-tx (TeX Live) 0.62 to adapt to many kinds of systems.
+\`configure' configures m-tx (TeX Live) 0.63 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1341,7 +1341,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of m-tx (TeX Live) 0.62:";;
+     short | recursive ) echo "Configuration of m-tx (TeX Live) 0.63:";;
    esac
   cat <<\_ACEOF
 
@@ -1438,7 +1438,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-m-tx (TeX Live) configure 0.62
+m-tx (TeX Live) configure 0.63
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1861,7 +1861,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by m-tx (TeX Live) $as_me 0.62, which was
+It was created by m-tx (TeX Live) $as_me 0.63, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3784,7 +3784,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='m-tx--tex-live-'
- VERSION='0.62'
+ VERSION='0.63'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -5868,7 +5868,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by m-tx (TeX Live) $as_me 0.62, which was
+This file was extended by m-tx (TeX Live) $as_me 0.63, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -5925,7 +5925,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-m-tx (TeX Live) config.status 0.62
+m-tx (TeX Live) config.status 0.63
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/Build/source/utils/m-tx/mtx-src/AUTHORS b/Build/source/utils/m-tx/mtx-src/AUTHORS
index 9fdff1fe9d3..2f006f46a68 100644
--- a/Build/source/utils/m-tx/mtx-src/AUTHORS
+++ b/Build/source/utils/m-tx/mtx-src/AUTHORS
@@ -1 +1 @@
-Dirk Laurie (dpl@sun.ac.za)
+Dirk Laurie (dirk.laurie@gmail.com)
diff --git a/Build/source/utils/m-tx/mtx-src/Bugs b/Build/source/utils/m-tx/mtx-src/Bugs
index 716a28c5d6e..589233c9dce 100644
--- a/Build/source/utils/m-tx/mtx-src/Bugs
+++ b/Build/source/utils/m-tx/mtx-src/Bugs
@@ -1,3 +1,8 @@
+From Bob Tennent (e-mail on 2015-12-30):
+  Dirk: I suggest you experiment to see whether the 1st argument is 
+  sufficient for your purposes with the new pmx and musixtex, or whether 
+  other modifications are needed.
+
 Lyrics lines when not from same paragraph don't join neatly.
 Problem has been discussed on mailing list and Rainer gave
 a solution. This still (TeXLive 2013) seems to be a little 
@@ -6,4 +11,7 @@ unsatisfactory.
 Rest in dot and comma shortcuts gives error at PMX stage.
 Not recently (2015-08-04) checked.
 
+-----
+
+Warning for unbalanced braces in the first line a lyrics paragraph.
 
diff --git a/Build/source/utils/m-tx/mtx-src/COPYING b/Build/source/utils/m-tx/mtx-src/COPYING
index 623b6258a13..de697792b65 100644
--- a/Build/source/utils/m-tx/mtx-src/COPYING
+++ b/Build/source/utils/m-tx/mtx-src/COPYING
@@ -1,340 +1,20 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    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
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year  name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.
+The MIT License (MIT)
+
+Copyright (c) 2014 Dirk Laurie <dirk.laurie@gmail.com>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/Build/source/utils/m-tx/mtx-src/ChangeLog b/Build/source/utils/m-tx/mtx-src/ChangeLog
index de5c759a9ad..87d5421ad2c 100644
--- a/Build/source/utils/m-tx/mtx-src/ChangeLog
+++ b/Build/source/utils/m-tx/mtx-src/ChangeLog
@@ -3,6 +3,35 @@ Corrections and enhancements to M-Tx starting from 0.53
    
 Newest items at top. You might also want to look at file `MAINTENANCE`.
 
+Version 0.63
+------------
+
+1. `Space` can put in optional extra space between title block and 
+    first stave.
+2. Multibar rest may appear after comment lines in its paragraph. (Thanks
+   to Christian Mondrup for finding the bug.)
+3. Spurious error message when using `][` corrected. (Thanks
+   to Christian Mondrup for finding the bug.)
+4. Pickup consisting of rests allowed with multibar rest. (Feature requested
+   by  Christian Mondrup.)
+5. Also recognizes `F` as doubling duration in multiplet. (Feature requested
+   by  Christian Mondrup.)
+6. No longer adds an undesired duration to rests in a multiplet.  (Thanks
+   to Christian Mondrup for finding the bug.)
+
+Version 0.62c
+-------------
+
+1. Emit one `rmN` per stave, rather than only one. This error was
+  introduced in Version 0.61a when the multibar coding was streamlined.
+
+Version 0.62b
+-------------
+
+1. An error is raised if a cumulative preamble command like TeX grows 
+   too long.
+2. Typo corrected in Makefile item README.md.
+
 Version 0.62a
 -------------
 
diff --git a/Build/source/utils/m-tx/mtx-src/Corrections b/Build/source/utils/m-tx/mtx-src/Corrections
index 99efcccc19a..23b6da91690 100644
--- a/Build/source/utils/m-tx/mtx-src/Corrections
+++ b/Build/source/utils/m-tx/mtx-src/Corrections
@@ -3,6 +3,59 @@ Corrections and enhancements to M-Tx starting from 0.53
    
 Newest items at top. You might also want to look at file `MAINTENANCE`.
 
+Version 0.63
+------------
+
+1. `Space` can put in optional extra space between title block and 
+first stave.
+2. Multibar rest may appear after comment lines in its paragraph. (Thanks
+to Christian Mondrup for finding the bug.)
+3. Spurious error message when using `][` corrected. (Thanks
+to Christian Mondrup for finding the bug.)
+4. Pickup consisting of rests allowed with multibar rest. (Feature requested
+by  Christian Mondrup.)
+5. Also recognizes `F` as doubling duration in multiplet. (Feature requested
+by  Christian Mondrup.)
+6. No longer adds an undesired duration to rests in a multiplet.  (Thanks
+to Christian Mondrup for finding the bug.)
+
+Version 0.62c
+-------------
+
+1. Emit one `rmN` per stave, rather than only one. This error was
+  introduced in Version 0.61a when the multibar coding was streamlined.
+
+Version 0.62b
+-------------
+
+1. An error is raised if a cumulative preamble command like TeX grows 
+  too long.
+2. Typo corrected in Makefile item README.md.
+
+Version 0.62a
+-------------
+
+1. Fonts bigtype and BIgtype, needed because PMX header font sizes
+were made smaller in July 2015, added to \mtxPalatino. Also, for
+completeness, \mtxbigsf and \mtxBIGsf. This version tagged on GitHub
+as 0.62.
+
+Version 0.62
+------------
+
+1. `\mtxlatex` command no longer needed.
+2. Various subtleties in the code have been commented.
+
+Version 0.61a
+-------------
+
+1. Special code for multi-bar rests removed, taking advantage of
+upstream improvements. 
+2. MusiXTeX 1.21 and PMX 2.71 required in `mtx.tex`.
+3. When the last line of a file does not have an end-of-line,
+its line number in comments and error messages was 0. Corrected now. 
+(This bug was almost 11 years old.)
+
 Version 0.61
 ------------
 
@@ -206,3 +259,11 @@ Version 0.53a
     preamble.pas: added trailing backslash to \mtxTenorClef
     mtx.tex: changed \mtxmtxNormalSize to \mtxNormalSize 
 
+Changes since 0.52b, undated.
+   Uses mtx.tex file
+   More than one # or % per word treated correctly in uptext
+   Better way of handling line numbers in lyrics
+
+For earlier history, see comments in prepmx.pas of 0.52b.
+
+
diff --git a/Build/source/utils/m-tx/mtx-src/INSTALL b/Build/source/utils/m-tx/mtx-src/INSTALL
index 7d1c323beae..007e9396d0a 100644
--- a/Build/source/utils/m-tx/mtx-src/INSTALL
+++ b/Build/source/utils/m-tx/mtx-src/INSTALL
@@ -1,8 +1,8 @@
 Installation Instructions
 *************************
 
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation,
+Inc.
 
    Copying and distribution of this file, with or without modification,
 are permitted in any medium without royalty provided the copyright
@@ -226,6 +226,11 @@ order to use an ANSI C compiler:
 
 and if that doesn't work, install pre-built binaries of GCC for HP-UX.
 
+   HP-UX `make' updates targets which have the same time stamps as
+their prerequisites, which makes it generally unusable when shipped
+generated files such as `configure' are involved.  Use GNU `make'
+instead.
+
    On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
 parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
 a workaround.  If GNU CC is not installed, it is therefore recommended
@@ -304,9 +309,10 @@ causes the specified `gcc' to be used as the C compiler (unless it is
 overridden in the site shell script).
 
 Unfortunately, this technique does not work for `CONFIG_SHELL' due to
-an Autoconf bug.  Until the bug is fixed you can use this workaround:
+an Autoconf limitation.  Until the limitation is lifted, you can use
+this workaround:
 
-     CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
+     CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash
 
 `configure' Invocation
 ======================
@@ -362,4 +368,3 @@ operates.
 
 `configure' also accepts some other, not widely useful, options.  Run
 `configure --help' for more details.
-
diff --git a/Build/source/utils/m-tx/mtx-src/Makefile.am b/Build/source/utils/m-tx/mtx-src/Makefile.am
index 9c7f033a1e9..38f1584ca8e 100644
--- a/Build/source/utils/m-tx/mtx-src/Makefile.am
+++ b/Build/source/utils/m-tx/mtx-src/Makefile.am
@@ -35,6 +35,7 @@ prepmx_SOURCES = \
 	prepmx.c \
 	status.c \
 	status.h \
+##      strings.c \  ## p2c generated, replaced by cfuncs.c
 	strings.h \
 	uptext.c \
 	uptext.h \
diff --git a/Build/source/utils/m-tx/mtx-src/Makefile.orig b/Build/source/utils/m-tx/mtx-src/Makefile.orig
index 14118ffe3db..3ec575dee05 100644
--- a/Build/source/utils/m-tx/mtx-src/Makefile.orig
+++ b/Build/source/utils/m-tx/mtx-src/Makefile.orig
@@ -9,7 +9,7 @@ prepmx: $(pasfiles)
 	fpc -g -B -vn -So prepmx -T$(SYSTEM)
 
 README.md: README.txt
-	pandoc -s -t markdown_githum README.txt
+	pandoc -s -t markdown_github README.txt
 
 commit: $(pasfiles) $(sfiles) README.txt README.md
 	make -C doc commit
diff --git a/Build/source/utils/m-tx/mtx-src/Makefile.p2c b/Build/source/utils/m-tx/mtx-src/Makefile.p2c
index ba75e632b00..a6732b2967e 100644
--- a/Build/source/utils/m-tx/mtx-src/Makefile.p2c
+++ b/Build/source/utils/m-tx/mtx-src/Makefile.p2c
@@ -1,12 +1,8 @@
 all: globals.c mtx.c preamble.c lyrics.c analyze.c mtxline.c\
-  status.c uptext.c prepmx.c files.c notes.c multfile.c utility.c control.c
+  status.c uptext.c prepmx.c files.c notes.c multfile.c utility.c control.c strings.c
 
-multfile.c: multfile.pas
-	p2c -a -LTurbo multfile.pas -o temp.c
-	sed -e "s/Malloc/malloc/" < temp.c > multfile.c
-	rm temp.c
-	
 %.c: %.pas 
 	p2c -a -LTurbo $*.pas
 	cp $*.c $*.c.orig
+	sed -e "s/#include <p2c\/p2c.h>/#include \"p2c.h\"/" < $*.c.orig > $*.c
 
diff --git a/Build/source/utils/m-tx/mtx-src/NEWS b/Build/source/utils/m-tx/mtx-src/NEWS
index de5c759a9ad..87d5421ad2c 100644
--- a/Build/source/utils/m-tx/mtx-src/NEWS
+++ b/Build/source/utils/m-tx/mtx-src/NEWS
@@ -3,6 +3,35 @@ Corrections and enhancements to M-Tx starting from 0.53
    
 Newest items at top. You might also want to look at file `MAINTENANCE`.
 
+Version 0.63
+------------
+
+1. `Space` can put in optional extra space between title block and 
+    first stave.
+2. Multibar rest may appear after comment lines in its paragraph. (Thanks
+   to Christian Mondrup for finding the bug.)
+3. Spurious error message when using `][` corrected. (Thanks
+   to Christian Mondrup for finding the bug.)
+4. Pickup consisting of rests allowed with multibar rest. (Feature requested
+   by  Christian Mondrup.)
+5. Also recognizes `F` as doubling duration in multiplet. (Feature requested
+   by  Christian Mondrup.)
+6. No longer adds an undesired duration to rests in a multiplet.  (Thanks
+   to Christian Mondrup for finding the bug.)
+
+Version 0.62c
+-------------
+
+1. Emit one `rmN` per stave, rather than only one. This error was
+  introduced in Version 0.61a when the multibar coding was streamlined.
+
+Version 0.62b
+-------------
+
+1. An error is raised if a cumulative preamble command like TeX grows 
+   too long.
+2. Typo corrected in Makefile item README.md.
+
 Version 0.62a
 -------------
 
diff --git a/Build/source/utils/m-tx/mtx-src/analyze.c b/Build/source/utils/m-tx/mtx-src/analyze.c
index 2a7ef8bf0c8..e6f5848aa4b 100644
--- a/Build/source/utils/m-tx/mtx-src/analyze.c
+++ b/Build/source/utils/m-tx/mtx-src/analyze.c
@@ -85,7 +85,7 @@ void testParagraph(void)
   if (top > bottom)
     return;
   pickup = 0;
-  multi_bar_rest = false;
+  *multi_bar_rest = '\0';
   FORLIM = bottom;
   for (voice = top; voice <= FORLIM; voice++) {
     mus = musicLineNo(voice);
@@ -93,7 +93,7 @@ void testParagraph(void)
       nv++;
       line_no = orig_line_no[mus-1];
       scanMusic(voice, &l);
-      if (multi_bar_rest && nv > 1)
+      if (*multi_bar_rest != '\0' && nv > 1)
 	error("Multi-bar rest allows only one voice", print);
       if (!pmx_preamble_done) {
 	if (voice == top)
@@ -103,7 +103,7 @@ void testParagraph(void)
       }
       nbar = numberOfBars(voice);
       extra = ExtraLength(voice);
-      if (multi_bar_rest && (nbar > 0 || extra > 0))
+      if (*multi_bar_rest != '\0' && (nbar > 0 || extra > 0))
 	error3(voice, "Multi-bar rest allows no other rests or notes");
       if (nbar > nbars || nbar == nbars && extra > nleft) {
 	nbars = nbar;
diff --git a/Build/source/utils/m-tx/mtx-src/analyze.pas b/Build/source/utils/m-tx/mtx-src/analyze.pas
index e1ce135992d..499c73ba317 100644
--- a/Build/source/utils/m-tx/mtx-src/analyze.pas
+++ b/Build/source/utils/m-tx/mtx-src/analyze.pas
@@ -32,20 +32,20 @@ procedure testParagraph;
       extra, l, nbar: integer;
 begin
   nbars:=0; pickup:=0; nleft:=0; if top>bottom then exit;
-  pickup:=0;  nv:=0;  leader:=0;  multi_bar_rest := false;
+  pickup:=0;  nv:=0;  leader:=0;  multi_bar_rest := '';
   for voice:=top to bottom do
   begin mus:=musicLineNo(voice);
     if mus>0 then   {* -------------- Voice is present  ---- }
     begin  inc(nv); line_no:=orig_line_no[mus];
       scanMusic(voice,l);
-      if multi_bar_rest and (nv>1) then error(
+      if (multi_bar_rest<>'') and (nv>1) then error(
         'Multi-bar rest allows only one voice',print);
       if not pmx_preamble_done then
       if voice=top then pickup:=l
         else if pickup<>l then
         error3(voice,'The same pickup must appear in all voices');
       nbar := numberOfBars(voice);  extra := extraLength(voice);
-      if multi_bar_rest and ((nbar>0) or (extra>0)) then error3(voice,
+      if (multi_bar_rest<>'') and ((nbar>0) or (extra>0)) then error3(voice,
         'Multi-bar rest allows no other rests or notes');
       if (nbar>nbars) or (nbar=nbars) and (extra>nleft) then
       begin nbars:=nbar; nleft:=extra; leader:=voice; end;
diff --git a/Build/source/utils/m-tx/mtx-src/configure.ac b/Build/source/utils/m-tx/mtx-src/configure.ac
index 6814d0ba88d..99c60fa12ef 100644
--- a/Build/source/utils/m-tx/mtx-src/configure.ac
+++ b/Build/source/utils/m-tx/mtx-src/configure.ac
@@ -8,10 +8,11 @@ dnl   with or without modifications, as long as this notice is preserved.
 dnl
 m4_include([version.ac])[] dnl define mtx_version
 AC_INIT([mtx], mtx_version, [rdt@cs.queensu.ca])
-AC_PREREQ([2.63])
+AC_PREREQ([2.69])
 AC_CONFIG_SRCDIR([analyze.c])
+AC_CONFIG_AUX_DIR([.])
 
-AM_INIT_AUTOMAKE(mtx, mtx_version)
+AM_INIT_AUTOMAKE
 
 dnl Check compiler and flags
 AC_PROG_CC
diff --git a/Build/source/utils/m-tx/mtx-src/globals.c b/Build/source/utils/m-tx/mtx-src/globals.c
index 82709dc4651..6a359d77fee 100644
--- a/Build/source/utils/m-tx/mtx-src/globals.c
+++ b/Build/source/utils/m-tx/mtx-src/globals.c
@@ -88,16 +88,23 @@ Char *meterChange(Char *Result, short n1, short n2, boolean blind)
 void setSpace(Char *line_)
 {
   Char line[256];
-  short i = 0;
+  short i;
   Char word[256];
+  Char STR1[256];
 
   strcpy(line, line_);
+  i = pos1(';', line);
+  if (i > 0) {
+    getNum(substr_(STR1, line, 1, i - 1), nspace);
+    predelete(line, i);
+  }
+  i = 0;
   while (i < ninstr) {
     GetNextWord(word, line, blank, dummy);
     if (*word == '\0')
       return;
     i++;
-    getNum(word, &nspace[i-1]);
+    getNum(word, &nspace[i]);
   }
 }
 
diff --git a/Build/source/utils/m-tx/mtx-src/globals.h b/Build/source/utils/m-tx/mtx-src/globals.h
index 415383c1c18..f121dcc7f63 100644
--- a/Build/source/utils/m-tx/mtx-src/globals.h
+++ b/Build/source/utils/m-tx/mtx-src/globals.h
@@ -109,7 +109,8 @@ vextern Char voice_label[maxvoices][256];
 vextern Char clef[maxstaves];
 vextern voice_index0 instr[maxstaves], stave[maxstaves],
 		     first_on_stave[maxstaves], number_on_stave[maxstaves];
-vextern short nspace[maxstaves], stave_size[maxstaves];
+vextern short stave_size[maxstaves];
+vextern short nspace[maxstaves + 1];
 vextern voice_index0 nvoices, nstaves, ninstr, bottom, top;
 vextern short one_beat, full_bar, line_no, short_note, musicsize, meternum,
 	      meterdenom, pmnum, pmdenom, paragraph_no, bar_no, pickup, nbars,
@@ -120,9 +121,10 @@ vextern paragraph P, orig_P;
 vextern line_nos orig_line_no;
 vextern FILE *infile, *outfile, *stylefile;
 vextern Char default_duration;
-vextern Char fracindent[256], this_version[256], this_version_date[256];
+vextern Char fracindent[256], this_version[256], this_version_date[256],
+	     multi_bar_rest[256];
 vextern boolean pmx_preamble_done, first_paragraph, final_paragraph,
-		must_respace, must_restyle, multi_bar_rest, some_vocal;
+		must_respace, must_restyle, some_vocal;
 vextern Char infile_NAME[_FNSIZE];
 vextern Char outfile_NAME[_FNSIZE];
 vextern Char stylefile_NAME[_FNSIZE];
diff --git a/Build/source/utils/m-tx/mtx-src/globals.pas b/Build/source/utils/m-tx/mtx-src/globals.pas
index bf72e3dee03..cca8083a400 100644
--- a/Build/source/utils/m-tx/mtx-src/globals.pas
+++ b/Build/source/utils/m-tx/mtx-src/globals.pas
@@ -83,7 +83,8 @@ var  voice_label: array[voice_index] of string;
      clef: array[stave_index] of char;
      instr, stave, first_on_stave, number_on_stave:
        array[stave_index] of voice_index0;
-     nspace, stave_size: array[stave_index] of integer;
+     stave_size: array[stave_index] of integer;
+     nspace: array[stave_index0] of integer;
      nvoices, nstaves, ninstr, bottom, top: voice_index0;
      one_beat, full_bar, line_no, short_note, musicsize,
        meternum, meterdenom, pmnum, pmdenom, paragraph_no,
@@ -94,9 +95,9 @@ var  voice_label: array[voice_index] of string;
      orig_line_no: line_nos;
      infile, outfile, stylefile: text;
      default_duration: char;
-     fracindent, this_version, this_version_date: string;
+     fracindent, this_version, this_version_date, multi_bar_rest: string;
      pmx_preamble_done, first_paragraph, final_paragraph, must_respace,
-       must_restyle, multi_bar_rest, some_vocal: boolean;
+       must_restyle, some_vocal: boolean;
 
 procedure error(message: string; printLine: boolean);
 procedure fatalerror(message: string);
@@ -150,7 +151,14 @@ end;
 procedure setSpace(line: string);
   var i: integer;
       word: string;
-  begin  i:=0;
+  begin 
+    i := pos1(';',line);   
+    if i>0 then
+    begin
+      getNum(substr(line,1,i-1),nspace[0]);      
+      predelete (line,i)
+    end;
+    i:=0;
     while i<ninstr do
     begin  word:=GetNextWord(line,blank,dummy);
       if word='' then exit;
diff --git a/Build/source/utils/m-tx/mtx-src/libp2c/p2clib.c b/Build/source/utils/m-tx/mtx-src/libp2c/p2clib.c
index 98a00edf41b..30b6c55a96f 100644
--- a/Build/source/utils/m-tx/mtx-src/libp2c/p2clib.c
+++ b/Build/source/utils/m-tx/mtx-src/libp2c/p2clib.c
@@ -87,7 +87,6 @@ register int n;
     return d;
 }
 
-
 #ifdef __STDC__
 Anyptr my_memcpy(Anyptr d, Const Anyptr s, size_t n)
 #else
@@ -102,6 +101,7 @@ register int n;
     return d;
 }
 
+
 #ifdef __STDC__
 int my_memcmp(Const Anyptr s1, Const Anyptr s2, size_t n)
 #else
diff --git a/Build/source/utils/m-tx/mtx-src/mtx.c b/Build/source/utils/m-tx/mtx-src/mtx.c
index fbdf8b8d87b..6271b2094c5 100644
--- a/Build/source/utils/m-tx/mtx-src/mtx.c
+++ b/Build/source/utils/m-tx/mtx-src/mtx.c
@@ -212,9 +212,9 @@ Static boolean isMultiBarRest(Char *rest_)
     return false;
   if (rest_[1] != 'm')
     return false;
-  if (multi_bar_rest)
+  if (*multi_bar_rest != '\0')
     error("Only one multibar rest allowed per line", print);
-  multi_bar_rest = true;
+  strcpy(multi_bar_rest, rest_);
   return true;
 }
 
@@ -384,7 +384,7 @@ void scanMusic(voice_index voice_, short *left_over)
     V.count = 0;
     /*    if isNoteOrRest(note) and not (isPause(note) or isMultibarRest(note))
           then note:=toStandard(note); */
-    V.doublex = (pos1('D', V.note) > 0);
+    V.doublex = (pos1('D', V.note) > 0 || pos1('F', V.note) > 0);
     if (nscan == mword) {
       if (*V.note == '\0')
 	error3(V.voice, "You may not end a line with a meter change");
@@ -393,7 +393,9 @@ void scanMusic(voice_index voice_, short *left_over)
       else
 	V.bar = barLength(V.note);
     } else if (nscan == rword) {
-      if (!(isPause(V.note) || isMultiBarRest(V.note))) {
+      if (!(isPause(V.note) || isMultiBarRest(V.note) ||
+	    V.ngrace + V.nmulti > 0))
+      {   /*0.63: allow rests in xtuples*/
 	processNote(V.note, xnote, dur1, &lastdur, &V.count);
 	checkSticky(V.note, rest_attrib[V.voice-1]);
       }
@@ -404,7 +406,7 @@ void scanMusic(voice_index voice_, short *left_over)
     if (nscan == macro || nscan == endmacro)
       examineMacro(&V);
     if (nscan == abcdefg) {
-      if (!multi_bar_rest && V.ngrace + V.nmulti == 0) {
+      if (*multi_bar_rest == '\0' && V.ngrace + V.nmulti == 0) {
 	processNote(enote, xnote, dur1, &lastdur, &V.count);
 	if (*xnote != '\0') {
 	  checkSticky(enote, note_attrib[V.voice-1]);
@@ -426,7 +428,7 @@ void scanMusic(voice_index voice_, short *left_over)
 	markBar(V.voice);
       else if (numberOfBars(V.voice) == 0 && V.bar_length < V.bar) {
 	if (has_next)
-	  has_next = false;   /*Should check whether pickups are equal*/
+	  has_next = false;   /*TODO Should check whether pickups are equal*/
 	else if (*left_over > 0)
 	  error3(V.voice, "Bar is too short");
 	*left_over = V.bar_length;
@@ -441,7 +443,7 @@ void scanMusic(voice_index voice_, short *left_over)
       has_next = true;
     } else if (isPause(V.note))
       V.bar_length += V.bar;
-    else if (!multi_bar_rest) {   /*do nothing*/
+    else if (*multi_bar_rest == '\0') {   /*do nothing*/
       if (!done && isNoteOrRest(V.note))
 	countIt(&V);
       else
@@ -453,7 +455,7 @@ void scanMusic(voice_index voice_, short *left_over)
 	printf("%d %d\n", V.voice, V.bar_length);
       barForward(V.voice, V.bar_length / V.bar);
       V.bar_length %= V.bar;
-/* p2c: mtx.pas, line 268:
+/* p2c: mtx.pas, line 269:
  * Note: Using % for possibly-negative arguments [317] */
     }
   } while (!done);
diff --git a/Build/source/utils/m-tx/mtx-src/mtx.pas b/Build/source/utils/m-tx/mtx-src/mtx.pas
index 0b1b1042cd4..7fc12ec554c 100644
--- a/Build/source/utils/m-tx/mtx-src/mtx.pas
+++ b/Build/source/utils/m-tx/mtx-src/mtx.pas
@@ -114,9 +114,9 @@ end;
 function isMultiBarRest(rest: string): boolean;
 begin  isMultibarRest:=false;  if length(rest)<3 then exit;
   if rest[2]<>'m' then exit;
-  if multi_bar_rest then error(
+  if multi_bar_rest<>'' then error(
     'Only one multibar rest allowed per line',print);
-  multi_bar_rest := true; isMultibarRest:=true;
+  multi_bar_rest := rest; isMultibarRest:=true;
 end;
 
 { Double-length in xtuplet detected by a brute search for D anywhere.
@@ -211,7 +211,7 @@ begin
   repeat  GetNextMusWord(buf,note,nscan);  if length(note)=0 then break; count:=0;
 {    if isNoteOrRest(note) and not (isPause(note) or isMultibarRest(note))
       then note:=toStandard(note); }
-    doublex := pos1('D',note)>0; 
+    doublex := (pos1('D',note)>0) or (pos1('F',note)>0); 
     if nscan=mword then
     begin 
       if length(note)=0 then 
@@ -221,7 +221,8 @@ begin
       else bar:=barLength(note);
     end
     else if nscan=rword then
-      if not (isPause(note) or isMultiBarRest(note)) then
+      if not (isPause(note) or isMultiBarRest(note) 
+        or (ngrace + nmulti > 0)) then  {0.63: allow rests in xtuples}
       begin
         processNote(note,xnote,dur1,lastdur,count);
         checkSticky(note,rest_attrib[voice]);
@@ -230,7 +231,7 @@ begin
     enote := note;
     if (nscan=macro) or (nscan=endMacro) then examineMacro;
     if nscan=abcdefg then
-      if (not multi_bar_rest) and (ngrace + nmulti = 0) then
+      if (multi_bar_rest='') and (ngrace + nmulti = 0) then
       begin
         processNote(enote,xnote,dur1,lastdur,count);
         if xnote<>'' then
@@ -249,7 +250,7 @@ begin
     else if bar_length=0 then markBar(voice)
     else if (numberOfBars(voice)=0) and (bar_length<bar) then
     begin  if has_next then
-      has_next:=false  {Should check whether pickups are equal}
+      has_next:=false  {TODO Should check whether pickups are equal}
       else if left_over>0 then error3(voice,'Bar is too short');
       left_over:=bar_length;  bar_length := 0;
     end;
@@ -258,7 +259,7 @@ begin
       else barForward(voice,-1);  has_next := true;
     end
     else  if isPause(note) then  inc(bar_length,bar)
-    else  if multi_bar_rest then {do nothing}
+    else  if multi_bar_rest<>'' then {do nothing}
     else if not done and isNoteOrRest(note) then countIt
       else maybeGroup;
     dur1:=lastdur; 
diff --git a/Build/source/utils/m-tx/mtx-src/mtx.test b/Build/source/utils/m-tx/mtx-src/mtx.test
index 1b67f5243c3..9705cdd87aa 100644
--- a/Build/source/utils/m-tx/mtx-src/mtx.test
+++ b/Build/source/utils/m-tx/mtx-src/mtx.test
@@ -1,6 +1,6 @@
 #! /bin/sh -vx
-# Copyright 2017 Karl Berry <tex-live@tug.org>
-# Copyright 2012 Peter Breitenlohner <tex-live@tug.org>
+
+# Copyright (C) 2012 Peter Breitenlohner <tex-live@tug.org>
 # You may freely use, modify and/or distribute this file.
 
 rm -f mozart*
diff --git a/Build/source/utils/m-tx/mtx-src/mtxline.c b/Build/source/utils/m-tx/mtx-src/mtxline.c
index 26c05b0247e..c815d69387c 100644
--- a/Build/source/utils/m-tx/mtx-src/mtxline.c
+++ b/Build/source/utils/m-tx/mtx-src/mtxline.c
@@ -667,7 +667,10 @@ void getNextMusWord(Char *buf_, Char *note_, music_word *nscan)
     break;
 
   case ']':
-    *nscan = rbrac;
+    if (!strcmp(V.note, "]["))
+      *nscan = other;
+    else
+      *nscan = rbrac;
     break;
 
   case '@':
diff --git a/Build/source/utils/m-tx/mtx-src/mtxline.pas b/Build/source/utils/m-tx/mtx-src/mtxline.pas
index 5f6e4062fde..9f567da5e2b 100644
--- a/Build/source/utils/m-tx/mtx-src/mtxline.pas
+++ b/Build/source/utils/m-tx/mtx-src/mtxline.pas
@@ -377,7 +377,7 @@ procedure GetNextMusWord (var buf, note: string; var nscan: music_word);
 ')':    if pos1('(',note)=0 then nscan:=rparen else nscan:=rlparen;
 '}':    if pos1('{',note)=0 then nscan:=rparen else nscan:=rlparen;
 '[':    nscan:=lbrac;
-']':    nscan:=rbrac;
+']':    if note='][' then nscan:=other else nscan:=rbrac;
 '@':    nscan:=atword;
 'm':    nscan:=mword;
 'r':    nscan:=rword;
diff --git a/Build/source/utils/m-tx/mtx-src/preamble.c b/Build/source/utils/m-tx/mtx-src/preamble.c
index 4ec599ee39b..cd403bd46e5 100644
--- a/Build/source/utils/m-tx/mtx-src/preamble.c
+++ b/Build/source/utils/m-tx/mtx-src/preamble.c
@@ -564,36 +564,38 @@ Static void doEnable(Char *line, boolean choice)
 Static void setRange(Char *line_)
 {
   Char line[256];
-  short v, p, FORLIM;
-  Char STR1[256];
-  Char STR2[256];
+  short v, p;
+  Char vl[256];
+  short FORLIM;
+  Char STR1[256], STR2[256];
 
   strcpy(line, line_);
   line_no = orig_range_line;
   FORLIM = nvoices;
   for (v = 1; v <= FORLIM; v++) {
-    sprintf(STR1, "%s=", voice_label[v-1]);
+    strcpy(vl, voice_label[v-1]);
+    sprintf(STR1, "%s=", vl);
     p = strpos2(line, STR1, 1);
     if (p > 0) {
       if (strlen(line) < p + 6) {
-	sprintf(STR2, "At least five characters must follow \"%s=\"",
-		voice_label[v-1]);
+	sprintf(STR2, "At least five characters must follow \"%s=\"", vl);
 	error(STR2, print);
       }
-      defineRange(v, substr_(STR2, line, p + 2, 5));
-    } else
+      defineRange(v, substr_(STR2, line, p + strlen(vl) + 1, 5));
+    } else {
+      sprintf(STR2, "No range defined for voice %s", vl);
+      warning(STR2, print);
       defineRange(v, "");
+    }
   }
 }
 
 
+/* TODO: This procedure should test for assertions in a comment
+ or be removed */
 Static boolean isAssertion(Char *line)
 {
-  boolean Result;
-
-/* p2c: preamble.pas, line 369:
- * Note: Attempting to EXIT beyond this function [188] */
-  return Result;
+  return false;
 }
 
 
@@ -604,7 +606,9 @@ Static line_type doCommand(Char *line_)
   Char command[256];
   command_type last_command;
   boolean starts_with_note;
-  Char STR1[256], STR3[256];
+  Char STR1[256];
+  Char STR3[70];
+  Char STR4[256];
 
   strcpy(line, line_);
   if (line[0] == comment && !isAssertion(line))
@@ -622,14 +626,20 @@ Static line_type doCommand(Char *line_)
     else if (last_command == range)
       orig_range_line = line_no;
     if (last_command != none) {
-      if (mustAppend(last_command) && redefined[(long)last_command])
+      if (mustAppend(last_command) && redefined[(long)last_command]) {
+	if (strlen(cline[(long)last_command]) + strlen(line) > 254) {
+	  sprintf(STR3,
+		  "Total length of preamble command %s must not exceed 255",
+		  commands[(long)last_command]);
+	  error(STR3, !print);
+	}
 	sprintf(cline[(long)last_command] + strlen(cline[(long)last_command]),
 		"\n%s", line);
-      else {
+      } else {
 	strcpy(cline[(long)last_command], line);
 	if (warn_redefine && redefined[(long)last_command]) {
-	  sprintf(STR3, "You have redefined preamble command %s", command);
-	  warning(STR3, print);
+	  sprintf(STR4, "You have redefined preamble command %s", command);
+	  warning(STR4, print);
 	}
       }
       if (last_command == start)
@@ -638,8 +648,8 @@ Static line_type doCommand(Char *line_)
       return Result;
     }
     Result = colon_line;
-    sprintf(STR3, "%s%c %s", command, colon_, line);
-    addStyle(STR3);
+    sprintf(STR4, "%s%c %s", command, colon_, line);
+    addStyle(STR4);
     orig_style_line[known_styles-1] = line_no;
     return Result;
   } else if (starts_with_note)
@@ -787,10 +797,12 @@ void preambleDefaults(void)
   style_supplied = false;
   for (i = 1; i <= maxvoices; i++)
     setVocal(i, false);
-  for (i = 0; i <= maxstaves - 1; i++) {
-    nspace[i] = unspec;
+  for (i = 0; i <= maxstaves - 1; i++)
     stave_size[i] = unspec;
-  }
+  for (i = 0; i <= maxstaves; i++)
+    nspace[i] = unspec;
+  nspace[i] = unspec;
+  stave_size[i-1] = unspec;
   n_pages = 1;
   n_systems = 1;
   readStyles();
@@ -928,14 +940,14 @@ void respace(void)
 
   for (i = ninstr; i >= 2; i--) {
     j = ninstr - i + 1;
-    if (nspace[j-1] != unspec) {
+    if (nspace[j] != unspec) {
       sprintf(STR3, "\\mtxInterInstrument{%s}{%s}",
-	      toString(STR1, i - 1), toString(STR2, nspace[j-1]));
+	      toString(STR1, i - 1), toString(STR2, nspace[j]));
       TeXtype2(STR3);
     }
   }
-  if (nspace[ninstr-1] != unspec) {
-    sprintf(STR3, "\\mtxStaffBottom{%s}", toString(STR1, nspace[ninstr-1]));
+  if (nspace[ninstr] != unspec) {
+    sprintf(STR3, "\\mtxStaffBottom{%s}", toString(STR1, nspace[ninstr]));
     TeXtype2(STR3);
   }
   must_respace = false;
@@ -951,6 +963,7 @@ void restyle(void)
 Static short clefno(Char cl)
 {
   short Result;
+  Char STR2[44];
 
   switch (cl) {
 
@@ -997,7 +1010,8 @@ Static short clefno(Char cl)
     break;
 
   default:
-    warning("Unknown clef code - replaced by treble", print);
+    sprintf(STR2, "Unknown clef code \"%c\" - replaced by treble", cl);
+    warning(STR2, print);
     Result = 0;
     break;
   }
@@ -1095,8 +1109,7 @@ void doPMXpreamble(void)
   static Char clefcode[9] = "0123456";
   short i, j;
   Char clefs[256];
-  Char STR1[256];
-  Char STR2[256];
+  Char STR1[256], STR2[256];
   Char STR3[58];
   short FORLIM;
   Char STR5[256];
@@ -1157,14 +1170,17 @@ void doPMXpreamble(void)
     putLine("Ti");
     putLine(part_line);
   }
-  if (*title_line != '\0') {
-    putLine("Tt");
-    putLine("\\mtxTitle");
-  }
   if (*composer_line != '\0') {
     putLine("Tc");
     putLine("\\mtxPoetComposer");
   }
+  if (*title_line != '\0') {
+    fprintf(outfile, "Tt");
+    if (nspace[0] != unspec)
+      fputs(toString(STR1, nspace[0]), outfile);
+    putc('\n', outfile);
+    putLine("\\mtxTitle");
+  }
   if (*pmx_line != '\0')
     putLine(pmx_line);
   doTenorClefs();
diff --git a/Build/source/utils/m-tx/mtx-src/preamble.pas b/Build/source/utils/m-tx/mtx-src/preamble.pas
index ffc3716567b..7898864bd26 100644
--- a/Build/source/utils/m-tx/mtx-src/preamble.pas
+++ b/Build/source/utils/m-tx/mtx-src/preamble.pas
@@ -349,24 +349,31 @@ end;
 
 procedure setRange(line: string);
   var v,p: integer;
+      vl: string;
 begin 
   line_no := orig_range_line;
   for v:=1 to nvoices do 
-  begin p:=pos(voice_label[v]+'=',line);
+  begin vl := voice_label[v];
+    p:=pos(vl+'=',line);
     if p>0 then
     begin
       if length(line)<p+6 then
-        error('At least five characters must follow "'+voice_label[v]+'="',
+        error('At least five characters must follow "'+vl+'="',
         print);
-      defineRange(v,substr(line,p+2,5));
+      defineRange(v,substr(line,p+1+length(vl),5));
+    end
+    else begin
+      warning('No range defined for voice '+vl,print);
+      defineRange(v,'');
     end
-    else defineRange(v,'');
   end;
 end;
 
+{ TODO: This procedure should test for assertions in a comment
+ or be removed }
 function isAssertion(var line: string): boolean;
 begin 
-  exit(false)
+  isAssertion := false
 end;  
 
 function doCommand(line: string): line_type;
@@ -387,7 +394,12 @@ begin
     if last_command<>none then
     begin 
       if mustAppend(last_command) and redefined[last_command] then
-        cline[last_command]:=cline[last_command]+#10+line
+        begin
+          if length(cline[last_command])+length(line)>254 then
+          error('Total length of preamble command '+commands[last_command]+
+            ' must not exceed 255',not print);
+          cline[last_command]:=cline[last_command]+#10+line
+        end
       else 
       begin cline[last_command]:=line;
         if warn_redefine and redefined[last_command] then
@@ -487,7 +499,8 @@ begin
   some_vocal:=false; ngroups:=0;
   style_supplied := false; 
   for i:=1 to maxvoices do setVocal(i,false);
-  for i:=1 to maxstaves do
+  for i:=1 to maxstaves do stave_size[i]:=unspec;
+  for i:=0 to maxstaves do nspace[i]:=unspec;
   begin  nspace[i]:=unspec;  stave_size[i]:=unspec;  end;
   n_pages:=1; n_systems:=1;
   readStyles; old_known_styles := known_styles;
@@ -588,7 +601,7 @@ begin
 'F','b','6': clefno:=6;
 'C': clefno:=3;
     else
-    begin  warning('Unknown clef code - replaced by treble',print);
+    begin  warning('Unknown clef code "' + cl + '" - replaced by treble',print);
       clefno:=0;
     end;
   end
@@ -667,10 +680,14 @@ begin
       '\\mtxSetSize{'+toString(ninstr+1-j)+'}{'+sizecode(stave_size[j])+'}\');
   if part_line <> '' then
   begin putLine('Ti'); putLine(part_line); end;
-  if title_line <> '' then
-  begin putLine('Tt'); putLine('\mtxTitle'); end;
   if composer_line <> '' then
   begin putLine('Tc'); putLine('\mtxPoetComposer'); end;
+  if title_line <> '' then
+  begin write(outfile,'Tt'); 
+    if nspace[0] <> unspec then write(outfile,toString(nspace[0]));
+    writeln(outfile);
+    putLine('\mtxTitle'); 
+  end;
   if pmx_line <> '' then putLine(pmx_line);
   doTenorClefs;
   if cline[width] <> '' then putLine(cline[width]);
diff --git a/Build/source/utils/m-tx/mtx-src/prepmx.c b/Build/source/utils/m-tx/mtx-src/prepmx.c
index 6f5bf37bf69..d7fc8f38161 100644
--- a/Build/source/utils/m-tx/mtx-src/prepmx.c
+++ b/Build/source/utils/m-tx/mtx-src/prepmx.c
@@ -66,14 +66,12 @@
 
 /** M-Tx preprocessor to PMX     Dirk Laurie */
 
-#define version         "0.62"
-#define version_date    "<08 February 2016>"
+#define version         "0.63"
+#define version_date    "<7 January 2018>"
 
-/** See file "Corrections" for updates later than those listed below
-*/
+/** See file "Corrections" for updates */
 
 /** To do next:
-   Take notice of recent improvements in musixtex, pmx and musixlyr
 {* Current bugs:
 {* Old bugs:
    Does not check PMX syntax
@@ -363,7 +361,7 @@ Local void lookahead(struct LOC_processLine *LINK)
 	    processOther(STR2, getMusicWord(STR3, LINK->voice), LINK));
 }
 
-Local void processNote_(struct LOC_processLine *LINK)
+Local void processUsual(struct LOC_processLine *LINK)
 {
   if (hasVerseNumber(LINK->voice))
     strcat(LINK->pretex, "\\mtxVerse");
@@ -418,7 +416,7 @@ Static void processLine(voice_index voice_, short bar_no)
     switch (thisNote(V.voice)) {
 
     case rword:
-      if (multi_bar_rest) {
+      if (*multi_bar_rest != '\0') {
 	if (uptextOnRests())
 	  addUptext(V.voice, &V.no_uptext, V.pretex);
       } else {
@@ -431,13 +429,14 @@ Static void processLine(voice_index voice_, short bar_no)
 	}
 	if (uptextOnRests())
 	  addUptext(V.voice, &V.no_uptext, V.pretex);
-	if (!isPause(V.note))
-	  resetDuration(V.voice, durationCode(V.note));
+	if (!(isPause(V.note) || V.in_group))
+	      /*0.63: allow rests in xtuples*/
+		resetDuration(V.voice, durationCode(V.note));
       }
       break;
 
     case abcdefg:
-      processNote_(&V);
+      processUsual(&V);
       break;
 
     case barword:
@@ -579,17 +578,23 @@ Local void putMeter(Char *new_meter_word, struct LOC_musicParagraph *LINK)
 
 Local void processMBR(struct LOC_musicParagraph *LINK)
 {
-  short bars_of_rest;
+  short s, bars_of_rest;
   Char mbr[256];
+  short FORLIM;
   Char STR1[256];
   Char STR3[256];
 
-  strcpy(mbr, P[0]);
+  strcpy(mbr, multi_bar_rest);
   predelete(mbr, 2);
   getNum(mbr, &bars_of_rest);
   bar_no += bars_of_rest;
-  sprintf(STR3, "rm%s /", toString(STR1, bars_of_rest));
-  putLine(STR3);
+  FORLIM = nstaves;
+  for (s = 1; s <= FORLIM; s++) {
+    if (pickup > 0)
+      put(rests(STR1, pickup, meterdenom, visible), nospace);
+    sprintf(STR3, "rm%s /", toString(STR1, bars_of_rest));
+    putLine(STR3);
+  }
   putLine("");
 }
 
@@ -661,7 +666,7 @@ Static void musicParagraph(void)
     putMeter(meterChange(STR2, beatsPerLine(), meterdenom, true), &V);
   if (nleft > 0)
     nbars++;
-  if (nbars == 0 && multi_bar_rest)
+  if (nbars == 0 && *multi_bar_rest != '\0')
     processMBR(&V);
   else {
     FORLIM1 = nbars;
@@ -753,7 +758,7 @@ Static boolean isControlParagraph(Char (*P)[256], paragraph_index para_len)
 Static void topOfPMXfile(void)
 {
   Char STR2[24];
-  Char STR3[34];
+  Char STR3[32];
 
   putLine("---");
   sprintf(STR2, "\\def\\mtxversion{%s}", version);
diff --git a/Build/source/utils/m-tx/mtx-src/prepmx.pas b/Build/source/utils/m-tx/mtx-src/prepmx.pas
index 139d4e1911d..4c743365964 100644
--- a/Build/source/utils/m-tx/mtx-src/prepmx.pas
+++ b/Build/source/utils/m-tx/mtx-src/prepmx.pas
@@ -5,14 +5,12 @@ uses control, strings, globals, preamble, lyrics, mtx, analyze,
 { CMO: addition/change by Christian Mondrup }
 
 {* M-Tx preprocessor to PMX     Dirk Laurie }
-const version = '0.62';
-      version_date = '<08 February 2016>';
+const version = '0.63';
+      version_date = '<7 January 2018>';
 
-{* See file "Corrections" for updates later than those listed below
-}
+{* See file "Corrections" for updates }
 
 {* To do next:
-   Take notice of recent improvements in musixtex, pmx and musixlyr
 {* Current bugs:
 {* Old bugs:
    Does not check PMX syntax
@@ -163,7 +161,7 @@ atword: lyricsAdjust(voice, note);
  var l: integer;
      in_group: boolean;
 
-  procedure processNote;
+  procedure processUsual;
   begin  
     begin if hasVerseNumber(voice) then pretex:=pretex+'\mtxVerse';
       l := pos1(multi_group,note);  
@@ -188,7 +186,7 @@ begin
   repeat note:=getMusicWord(voice);  if note='' then exit;
     { if debugMode then writeln(voice,' ',note); }
     case thisNote(voice) of
-  rword: begin if multi_bar_rest then
+  rword: begin if multi_bar_rest<>'' then
            begin if uptextOnRests then
                addUptext(voice, no_uptext, pretex);
            end
@@ -198,10 +196,11 @@ begin
              if nmulti>0 then begin in_group:=true; dec(nmulti);  end;
              if uptextOnRests then
                addUptext(voice, no_uptext, pretex);
-             if not isPause(note) then resetDuration(voice,durationCode(note));
+             if not (isPause(note) or in_group) {0.63: allow rests in xtuples}
+               then resetDuration(voice,durationCode(note));
            end
          end;
-  abcdefg: processNote;
+  abcdefg: processUsual;
   barword: begin
       if voice=nvoices then
       if endOfBar(voice,bar_no) then repeat_sign := note
@@ -287,13 +286,18 @@ procedure musicParagraph;
   end;
 
   procedure processMBR;
-  var bars_of_rest: integer;
+  var s, bars_of_rest: integer;
       mbr: string;
   begin  
-    mbr := P[1];
+    mbr := multi_bar_rest;  
     predelete(mbr,2); getNum(mbr,bars_of_rest);
     bar_no := bar_no + bars_of_rest;
-    putLine('rm' + toString(bars_of_rest) + ' /'); putLine('')
+    for s:=1 to nstaves do 
+    begin
+      if pickup>0 then put(rests(pickup,meterdenom,visible),nospace);
+      putLine('rm' + toString(bars_of_rest) + ' /')
+    end;
+    putLine('')
   end;
 
 begin
@@ -328,7 +332,7 @@ begin
   if must_respace then respace;
   if (meternum=0) then putMeter(meterChange(beatsPerLine,meterdenom,true));
   if nleft > 0 then inc(nbars);
-  if (nbars=0) and multi_bar_rest then 
+  if (nbars=0) and (multi_bar_rest<>'') then 
     processMBR
   else for bar_of_line:=1 to nbars do
     processOneBar;
diff --git a/Build/source/utils/m-tx/mtx-src/status.c b/Build/source/utils/m-tx/mtx-src/status.c
index da0ce7bd2a6..d991022c0ab 100644
--- a/Build/source/utils/m-tx/mtx-src/status.c
+++ b/Build/source/utils/m-tx/mtx-src/status.c
@@ -72,12 +72,14 @@ meaningful, a and b (which come after g) are translated to h and i. */
 void checkRange(short voice, Char *note_)
 {
   Char note[256];
+  Char orig_note[256];
   Char STR1[4];
   Char STR3[256];
 
   strcpy(note, note_);
   if (*voice_range[voice-1] == '\0')
     return;
+  strcpy(orig_note, note);
   if (strlen(note) > 2) {   /* assume usual PMX form with octave */
     sprintf(STR1, "%c%c", note[2], note[0]);
     strcpy(note, STR1);
@@ -89,7 +91,7 @@ void checkRange(short voice, Char *note_)
   if (strcmp(note, range_low[voice-1]) < 0 ||
       strcmp(note, range_high[voice-1]) > 0) {
     sprintf(STR3, "%s is out of range, specified as %s",
-	    note, voice_range[voice-1]);
+	    orig_note, voice_range[voice-1]);
     error3(voice, STR3);
   }
 }
@@ -140,7 +142,7 @@ void chordTie(short voice, Char *lab)
     *lab = WITH->chord_tie_label[n-1];
   (*lab)++;
   sprintf(WITH->chord_tie_label + strlen(WITH->chord_tie_label), "%c", *lab);
-/* p2c: status.pas, line 113:
+/* p2c: status.pas, line 115:
  * Note: Possible string truncation in assignment [145] */
   n++;
   WITH->chord_tie_pitch[n-1] = WITH->chord_pitch;
diff --git a/Build/source/utils/m-tx/mtx-src/status.pas b/Build/source/utils/m-tx/mtx-src/status.pas
index 3048027a7bb..cc45dbc0373 100644
--- a/Build/source/utils/m-tx/mtx-src/status.pas
+++ b/Build/source/utils/m-tx/mtx-src/status.pas
@@ -56,9 +56,9 @@ const
 '7c','7d','7e','7f','7g','7a','7b');
 
 type
-  line_status = record
-    pitch, chord_pitch, octave_adjust, beam_level, 
-      slur_level, after_slur: integer;
+  line_status = 
+  record
+    pitch, chord_pitch, octave_adjust, beam_level, slur_level, after_slur: integer;
     octave, lastnote, chord_lastnote, duration, slurID, tieID: char;
     beamnext, beamed, slurnext, slurred, no_beam_melisma: boolean;
     no_slur_melisma: array[1..12] of boolean; 
@@ -74,14 +74,16 @@ var current: array[voice_index] of line_status;
 meaningful, a and b (which come after g) are translated to h and i. }
 
 procedure checkRange(voice: integer; note: string);
+  var orig_note: string;
 begin 
   if voice_range[voice]='' then exit;
+  orig_note := note;
   if length(note)>2 { assume usual PMX form with octave } then 
     note := note[3]+note[1];
   if note[2]='a' then note[2]:='h'; 
   if note[2]='b' then note[2]:='i';
-  if (note<range_low[voice]) or (note>range_high[voice]) then
-    error3(voice,note+' is out of range, specified as '+voice_range[voice])
+  if (note<range_low[voice]) or (note>range_high[voice]) then error3(voice,
+   orig_note+' is out of range, specified as '+voice_range[voice])
 end;
 
 procedure defineRange(voice: integer; range: string);
diff --git a/Build/source/utils/m-tx/mtx-src/strings.h b/Build/source/utils/m-tx/mtx-src/strings.h
index 0a0530062d8..3b8e7f4a539 100644
--- a/Build/source/utils/m-tx/mtx-src/strings.h
+++ b/Build/source/utils/m-tx/mtx-src/strings.h
@@ -12,20 +12,20 @@
 /* These should be recoded in C instead of using the p2c code. */
 
 
-extern Void scan1 PP((Char *s, int p, short *n));
+extern void scan1(Char *s, short p, short *n);
 /* Read an integer at position p of s */
-extern boolean startsWith PP((Char *s1, Char *s2));
-extern short pos1 PP((int c, Char *s));
-extern short posNot PP((int c, Char *s));
-extern Void insertChar PP((int c, Char *s, int p));
-extern Char *substr_ PP((Char *Result, Char *s, int start, int count));
-extern Void getNum PP((Char *line, short *k));
-extern Void getTwoNums PP((Char *line, short *k1, short *k2));
-extern Void toUpper PP((Char *s));
-extern Void delete1 PP((Char *s, int p));
-extern Void predelete PP((Char *s, int l));
-extern Void shorten PP((Char *s, int new_length));
-extern short nextWordBound PP((Char *s, int trigger, int p));
+extern boolean startsWith(Char *s1, Char *s2);
+extern short pos1(Char c, Char *s);
+extern short posNot(Char c, Char *s);
+extern void insertChar(Char c, Char *s, short p);
+extern Char *substr_(Char *Result, Char *s, short start, short count);
+extern void getNum(Char *line, short *k);
+extern void getTwoNums(Char *line, short *k1, short *k2);
+extern void toUpper(Char *s);
+extern void delete1(Char *s, short p);
+extern void predelete(Char *s, short l);
+extern void shorten(Char *s, short new_length);
+extern short nextWordBound(Char *s, Char trigger, short p);
 /* find end of first word starting with trigger after s[p] */
 
 
diff --git a/Build/source/utils/m-tx/mtx-src/version.ac b/Build/source/utils/m-tx/mtx-src/version.ac
index 3873ea93dd5..61c3423259d 100644
--- a/Build/source/utils/m-tx/mtx-src/version.ac
+++ b/Build/source/utils/m-tx/mtx-src/version.ac
@@ -8,4 +8,4 @@ dnl
 dnl --------------------------------------------------------
 dnl
 dnl  m4-include this file to define the current mtx version
-m4_define([mtx_version], [0.62])
+m4_define([mtx_version], [0.63])
diff --git a/Build/source/utils/m-tx/tests/mozart.pmx b/Build/source/utils/m-tx/tests/mozart.pmx
index ad7876c801a..695b691838a 100644
--- a/Build/source/utils/m-tx/tests/mozart.pmx
+++ b/Build/source/utils/m-tx/tests/mozart.pmx
@@ -1,6 +1,6 @@
 ---
-\def\mtxversion{0.62}
-\def\mtxdate{<08 February 2016>}
+\def\mtxversion{0.63}
+\def\mtxdate{<7 January 2018>}
 \input mtx
 \mtxComposerLine{}{W. A. Mozart (1756--1791)}
 \mtxTitleLine{Riff in C}
@@ -9,10 +9,10 @@
 
 60
 ./
-Tt
-\mtxTitle
 Tc
 \mtxPoetComposer
+Tt
+\mtxTitle
 w190m
 % Paragraph 2 line 5 bar 1
  w120m
diff --git a/Build/source/utils/m-tx/version.ac b/Build/source/utils/m-tx/version.ac
index 3873ea93dd5..61c3423259d 100644
--- a/Build/source/utils/m-tx/version.ac
+++ b/Build/source/utils/m-tx/version.ac
@@ -8,4 +8,4 @@ dnl
 dnl --------------------------------------------------------
 dnl
 dnl  m4-include this file to define the current mtx version
-m4_define([mtx_version], [0.62])
+m4_define([mtx_version], [0.63])