autosp-2018-02-14

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

16 files changed, 104 insertions, 124 deletions

diff --git a/Build/source/utils/README b/Build/source/utils/README
index 3686f95fbd8..ff2059e19eb 100644
--- a/Build/source/utils/README
+++ b/Build/source/utils/README
@@ -10,7 +10,7 @@ asymptote 2.41 - checked 23mar17
   see http://tug.org/texlive/build.html#asymptote
   and tlpkg/bin/tl-update-asy
 
-autosp 2017-12-26 - checked 29dec17
+autosp 2018-02-14 - checked 14feb18
   http://ctan.org/pkg/autosp
 
 devnag - from devanagari package installed in texmf-dist.
diff --git a/Build/source/utils/autosp/ChangeLog b/Build/source/utils/autosp/ChangeLog
index c51094c7144..2f3fe48f642 100644
--- a/Build/source/utils/autosp/ChangeLog
+++ b/Build/source/utils/autosp/ChangeLog
@@ -1,3 +1,8 @@
+2018-02-14  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
+
+	* Import autosp-2018-02-14
+	configure.ac: Adapted.
+
 2017-12-30  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
 
 	* Import autosp-2017-12-26
diff --git a/Build/source/utils/autosp/TLpatches/ChangeLog b/Build/source/utils/autosp/TLpatches/ChangeLog
index b9fcb0432ef..a7dc56b8e04 100644
--- a/Build/source/utils/autosp/TLpatches/ChangeLog
+++ b/Build/source/utils/autosp/TLpatches/ChangeLog
@@ -1,3 +1,8 @@
+2018-02-14  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
+
+	Import autosp-2018-02-14.
+	* patch-01-binary-write: Adapt.
+
 2018-01-01  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
 
 	* Add patch-01-binary-write to avoid errors in test on
diff --git a/Build/source/utils/autosp/TLpatches/patch-01-binary-write b/Build/source/utils/autosp/TLpatches/patch-01-binary-write
index f13be8973cd..f07fe67ff14 100644
--- a/Build/source/utils/autosp/TLpatches/patch-01-binary-write
+++ b/Build/source/utils/autosp/TLpatches/patch-01-binary-write
@@ -1,7 +1,7 @@
-diff -ur autosp-2017-12-26.orig/autosp.c autosp-2017-12-26/autosp.c
---- autosp-2017-12-26.orig/autosp.c	Fri Dec 22 23:28:50 2017
-+++ autosp-2017-12-26/autosp.c	Mon Jan 01 09:04:08 2018
-@@ -511,7 +511,7 @@
+diff -ur autosp-2018-02-14/autosp.c autosp-src/autosp.c
+--- autosp-2018-02-14/autosp.c	Thu Feb 15 00:06:24 2018
++++ autosp-src/autosp.c	Thu Feb 15 08:01:12 2018
+@@ -510,7 +510,7 @@
      update_global_skip (n);
        /* commas will be discarded by filter_output (i) */
      if (*s == '.' && new_beaming == 0 && !dottedbeamnotes) 
@@ -10,7 +10,7 @@ diff -ur autosp-2017-12-26.orig/autosp.c autosp-2017-12-26/autosp.c
      else if ( (*s == '^' || *s == '_' || *s == '=' || *s == '>') 
                && !vspacing_active[i]  /* is additional spacing needed? */
              )
-@@ -985,7 +985,7 @@
+@@ -984,7 +984,7 @@
     || prefix ("\\qbpp", s) 
     || prefix ("\\dspp", s) 
     || doubledotted  )
@@ -19,7 +19,7 @@ diff -ur autosp-2017-12-26.orig/autosp.c autosp-2017-12-26/autosp.c
    else 
    if (prefix ("\\whp", s)
     || prefix ("\\hup", s)
-@@ -1009,7 +1009,7 @@
+@@ -1008,7 +1008,7 @@
     || prefix ("\\qbp", s) 
     || prefix ("\\dsp", s) 
      || dotted  ) 
@@ -28,16 +28,16 @@ diff -ur autosp-2017-12-26.orig/autosp.c autosp-2017-12-26/autosp.c
  
    t = strpbrk (s+1, "{\\&|$"); /* collective coding?  */
    if (*t == '{')  /*  {...}  */
-@@ -2176,7 +2176,7 @@
-       printf ("\n");
-       error ("outfile same as infile.");
-     }
+@@ -2152,7 +2152,7 @@
+   }
+   else
+   {
 -    outfile = fopen (outfilename, "w");
 +    outfile = fopen (outfilename, "wb");
      if (outfile == NULL)
      { printf ("Can't open %s\n", outfilename);
        exit (EXIT_FAILURE);
-@@ -2194,7 +2194,7 @@
+@@ -2170,7 +2170,7 @@
    *logfilename_n = '\0';
    append (logfilename, &logfilename_n, "alog", sizeof (logfilename));
    if (debug)  
@@ -46,10 +46,9 @@ diff -ur autosp-2017-12-26.orig/autosp.c autosp-2017-12-26/autosp.c
      if (logfile == NULL)
      { printf ("Can't open %s\n", logfilename);
        exit (EXIT_FAILURE);
-Only in autosp-2017-12-26: config.h
-diff -ur autosp-2017-12-26.orig/rebar.c autosp-2017-12-26/rebar.c
---- autosp-2017-12-26.orig/rebar.c	Thu Jun 15 03:08:12 2017
-+++ autosp-2017-12-26/rebar.c	Mon Jan 01 09:04:08 2018
+diff -ur autosp-2018-02-14/rebar.c autosp-src/rebar.c
+--- autosp-2018-02-14/rebar.c	Thu Jun 15 03:08:12 2017
++++ autosp-src/rebar.c	Thu Feb 15 08:02:35 2018
 @@ -262,7 +262,7 @@
        else
          append (outfilename, &outfilename_n, ".aspc", sizeof (outfilename));
@@ -59,9 +58,9 @@ diff -ur autosp-2017-12-26.orig/rebar.c autosp-2017-12-26/rebar.c
      if (outfile == NULL)
      { fprintf (stderr,"Can't open %s\n", outfilename);
        exit (EXIT_FAILURE);
-diff -ur autosp-2017-12-26.orig/tex2aspc.c autosp-2017-12-26/tex2aspc.c
---- autosp-2017-12-26.orig/tex2aspc.c	Sat Dec 16 00:04:13 2017
-+++ autosp-2017-12-26/tex2aspc.c	Mon Jan 01 09:04:08 2018
+diff -ur autosp-2018-02-14/tex2aspc.c autosp-src/tex2aspc.c
+--- autosp-2018-02-14/tex2aspc.c	Sat Dec 16 00:04:13 2017
++++ autosp-src/tex2aspc.c	Thu Feb 15 08:03:01 2018
 @@ -337,7 +337,7 @@
      append (outfilename, &outfilename_n, ".aspc", sizeof (outfilename));
    }
diff --git a/Build/source/utils/autosp/autosp-src/ChangeLog b/Build/source/utils/autosp/autosp-src/ChangeLog
index b7554491442..c3bf343787a 100644
--- a/Build/source/utils/autosp/autosp-src/ChangeLog
+++ b/Build/source/utils/autosp/autosp-src/ChangeLog
@@ -1,5 +1,10 @@
 AUTOSP
 
+2018-02-14
+ 
+  Allow for \end{...} in LaTeX-oriented inputs.
+  Processing of .tex files not supported; users can use tex2aspc.
+
 2017-12-21
 
   Allow for new commands \nqq, \nqqq, \hap and \happ.
diff --git a/Build/source/utils/autosp/autosp-src/README b/Build/source/utils/autosp/autosp-src/README
index e84c3eacf53..32cdc77ed78 100644
--- a/Build/source/utils/autosp/autosp-src/README
+++ b/Build/source/utils/autosp/autosp-src/README
@@ -1,5 +1,5 @@
 This is the README for the autosp package, 
-version 2017-07-14.
+version 2018-02-14.
 
 autosp is a preprocessor that generates note-spacing
 commands for MusiXTeX scores. It simplifies the creation
@@ -119,13 +119,18 @@ comments of the form %barno appended to commands such as
 \bar, \alaligne, etc. replacing any existing comments.
 Bar-numbering in the MusiXTeX output is not affected
 
+Also included is the program tex2aspc which re-factors
+conventional MusiXTeX scores to aspc format suitable for
+autosp pre-processing by merging every conventional notes
+commands in a measure into a single \anotes command.
+
 To install the autosp package, unzip autosp.tds.zip
 at the root of a local or personal texmf tree and
 update the file-name database.  This will install
 documentation and examples.
 
-On Windows or MacOSX, install the relevant binaries on the
-PATH of executables. On Unix-like systems, unpack the
+On Windows or MacOSX, install the relevant binaries on
+the PATH of executables. On Unix-like systems, unpack the
 .tar.gz archive, and compile and install using the sequence
 
 ./configure && make && sudo make install
diff --git a/Build/source/utils/autosp/autosp-src/autosp.1 b/Build/source/utils/autosp/autosp-src/autosp.1
index a72d363ab0c..3d51ccd5947 100644
--- a/Build/source/utils/autosp/autosp-src/autosp.1
+++ b/Build/source/utils/autosp/autosp-src/autosp.1
@@ -1,5 +1,5 @@
 .\" This manpage is licensed under the GNU Public License
-.TH AUTOSP 1 2017-12-19  "" ""
+.TH AUTOSP 1 2018-02-14  "" ""
 
 .SH NAME
 autosp \- preprocessor to generate note-spacing commands for MusiXTeX scores
@@ -14,12 +14,6 @@ autosp \- preprocessor to generate note-spacing commands for MusiXTeX scores
 .IR infile [\fR.aspc\fP]
 .RI [ outfile [ \fR.tex\fP ]]
 
-.B autosp
-.RB [ \-d\ |\ \-\-dotted ]
-.RB [ \-l\ |\ \-\-log ]
-.IR infile \fR.tex\fP\ 
-.IR outfile [ \fR.tex\fP ]
-
 
 This program makes it easier to create MusiXTeX scores by converting (non-standard) commands of the 
 form \\anotes ... \\en into one or more conventional
@@ -48,44 +42,27 @@ an
 \\anotes command generates several conventional
 note-spacing commands.
 
-If the
-.I infile
-argument
-has .tex extension, 
-.B autosp
-will process conventional note-spacing commands
-(but not \\vnotes or \\znotes) 
-similarly. 
-This is intended to 
-correct spacing in an extracted single-instrument part,
-but may not produce satisfactory output when applied to a conventional multi-instrument MusiXTeX score.
-
 If the 
 .I infile
 argument 
-has neither .aspc nor .tex extension, input is taken from 
+does not have an .aspc extension, input is taken from 
 .IR infile .aspc 
-if that file exists, or from 
-.IR infile .tex 
-otherwise.
+if that file exists.
+
 If the
-input is from a file
-.IR infile .aspc
-and no 
+.I outfile
+argument does not have a .tex extension, output is sent to
+.IR outfile .tex.
+If no 
 .I outfile 
 argument is provided, output will go to
 .IR infile .tex
 (or to
 .IR infile .ltx
 if a \\documentclass declaration is encountered).
-If the input is from a file
-.IR infile .tex,
-an 
-.I outfile
-argument must be provided.
 
 For
-\\anotes commands (and, for a .tex file, all conventional note-spacing commands), 
+\\anotes commands,
 line breaks and spaces may precede note segments, allowing more flexible source formatting; 
 the line breaks and spaces will be elided from the output. 
 
diff --git a/Build/source/utils/autosp/autosp-src/autosp.c b/Build/source/utils/autosp/autosp-src/autosp.c
index 1145f7fa7ea..ed0d27327aa 100644
--- a/Build/source/utils/autosp/autosp-src/autosp.c
+++ b/Build/source/utils/autosp/autosp-src/autosp.c
@@ -1,6 +1,6 @@
-char version[12] = "2017-12-22";
+char version[12] = "2018-01-17";
 
-/*  Copyright (C) 2014-17 R. D. Tennent School of Computing,
+/*  Copyright (C) 2014-18 R. D. Tennent School of Computing,
  *  Queen's University, rdt@cs.queensu.ca
  *
  *  This program is free software; you can redistribute it
@@ -24,7 +24,7 @@ char version[12] = "2017-12-22";
 /*  autosp - preprocessor to generate note-spacing commands for MusiXTeX scores */
 
 /*  Usage: autosp [-v | --version | -h | --help]
- *         autosp [-d | --dotted] [-l | --log] infile[.aspc | .tex] [outfile[.tex]]
+ *         autosp [-d | --dotted] [-l | --log] infile[.aspc] [outfile[.tex]]
  *
  *  Options 
  *    --dotted (-d) suppresses extra spacing for dotted beam notes.
@@ -178,7 +178,6 @@ PRIVATE bool first_collectivei;
 PRIVATE int xtuplet[MAX_STAFFS];        /* x for xtuplet in staff i          */
 
 PRIVATE bool appoggiatura;
-PRIVATE bool fixnotes = false;          /* process \Notes etc. like \anotes? */
 PRIVATE bool dottedbeamnotes = false;   /* dotted beam notes ignored?        */
 
 PRIVATE bool bar_rest[MAX_STAFFS];
@@ -1718,15 +1717,7 @@ void process_command (char **ln)
     }
   }
 
-  else if ( prefix("\\anotes", *ln) 
-            || (fixnotes &&
-              ( prefix("\\nnnotes", *ln) ||
-                prefix("\\nnotes", *ln) ||
-                prefix("\\notes", *ln) || 
-                prefix("\\Notes", *ln) ||
-                prefix("\\NOtes", *ln) ||
-                prefix("\\NOTes", *ln) ||
-                prefix("\\NOTEs", *ln) ) ) )
+  else if ( prefix("\\anotes", *ln) )
   { if (debug)
     { fprintf (logfile, "\nProcessing %s", *ln);
       fprintf (logfile, "lineno=%d\n",  lineno);
@@ -1916,6 +1907,7 @@ void process_command (char **ln)
          || prefix ("\\alapage", *ln)
          || prefix ("\\changecontext", *ln)
          || prefix ("\\Changecontext", *ln)
+         || prefix ("\\zchangecontext", *ln)
          || prefix ("\\zalaligne", *ln)
          || prefix ("\\zalapage", *ln) )
   { int i;
@@ -2011,7 +2003,8 @@ void process_command (char **ln)
     *ln = *ln + strlen(*ln);
   }
 
-  else if ( prefix ("\\end", *ln))
+  else if ( prefix ("\\end", *ln)
+        && !prefix ("\\end{", *ln) )
   {
     fprintf (outfile, "\\end\n");
     exit(0);
@@ -2120,7 +2113,7 @@ int main (int argc, char *argv[])
   infilename_n = infilename;
   if (optind < argc)
   { append (infilename, &infilename_n, argv[optind], sizeof (infilename));
-    if (!suffix (".tex", infilename) && !suffix (".aspc", infilename)) 
+    if (!suffix (".aspc", infilename)) 
       append (infilename, &infilename_n, ".aspc", sizeof (infilename));
   }
   else 
@@ -2128,24 +2121,12 @@ int main (int argc, char *argv[])
      exit (EXIT_FAILURE);
   }
   infile = fopen (infilename, "r");
-  if (infile == NULL && suffix (".tex", infilename) )
+  if (infile == NULL )
   { printf ("Can't open %s\n", infilename);
     exit (EXIT_FAILURE);
   }
-  else if (infile == NULL && suffix (".aspc", infilename) )
-  { /* try infile.tex */
-    infilename_n -= 4;
-    *infilename_n = '\0';
-    append (infilename, &infilename_n, "tex", sizeof (infilename));
-    infile = fopen (infilename, "r");
-    if (infile == NULL && suffix (".tex", infilename) )
-    { printf ("Can't open %s\n", infilename);
-      exit (EXIT_FAILURE);
-    }
-  }
+
   printf ("Reading from %s.", infilename);
-  if (suffix (".tex", infilename) ) 
-    fixnotes = true;
 
   optind++;
   outfilename[0] = '\0';
@@ -2171,11 +2152,6 @@ int main (int argc, char *argv[])
   }
   else
   {
-    if (strcmp (outfilename, infilename) == 0)
-    {
-      printf ("\n");
-      error ("outfile same as infile.");
-    }
     outfile = fopen (outfilename, "wb");
     if (outfile == NULL)
     { printf ("Can't open %s\n", outfilename);
diff --git a/Build/source/utils/autosp/autosp-src/compile b/Build/source/utils/autosp/autosp-src/compile
index 0bb9d0f53ab..531136b068e 100755
--- a/Build/source/utils/autosp/autosp-src/compile
+++ b/Build/source/utils/autosp/autosp-src/compile
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Wrapper for compilers which do not understand '-c -o'.
 
-scriptversion=2017-09-16.17; # UTC
+scriptversion=2012-10-14.11; # UTC
 
-# Copyright (C) 1999-2018 Free Software Foundation, Inc.
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
 # Written by Tom Tromey <tromey@cygnus.com>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@ scriptversion=2017-09-16.17; # UTC
 # 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, see <https://www.gnu.org/licenses/>.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -255,8 +255,7 @@ EOF
     echo "compile $scriptversion"
     exit $?
     ;;
-  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
-  icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
+  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
     func_cl_wrapper "$@"      # Doesn't return...
     ;;
 esac
@@ -343,6 +342,6 @@ exit $ret
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC0"
+# time-stamp-time-zone: "UTC"
 # time-stamp-end: "; # UTC"
 # End:
diff --git a/Build/source/utils/autosp/autosp-src/configure b/Build/source/utils/autosp/autosp-src/configure
index 522808c7bca..31f2922de58 100755
--- a/Build/source/utils/autosp/autosp-src/configure
+++ b/Build/source/utils/autosp/autosp-src/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for autosp 2017-12-26.
+# Generated by GNU Autoconf 2.69 for autosp 2018-02-14.
 #
 # Report bugs to <rdt@cs.queensu.ca>.
 #
@@ -580,8 +580,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='autosp'
 PACKAGE_TARNAME='autosp'
-PACKAGE_VERSION='2017-12-26'
-PACKAGE_STRING='autosp 2017-12-26'
+PACKAGE_VERSION='2018-02-14'
+PACKAGE_STRING='autosp 2018-02-14'
 PACKAGE_BUGREPORT='rdt@cs.queensu.ca'
 PACKAGE_URL=''
 
@@ -1265,7 +1265,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 autosp 2017-12-26 to adapt to many kinds of systems.
+\`configure' configures autosp 2018-02-14 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1331,7 +1331,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of autosp 2017-12-26:";;
+     short | recursive ) echo "Configuration of autosp 2018-02-14:";;
    esac
   cat <<\_ACEOF
 
@@ -1422,7 +1422,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-autosp configure 2017-12-26
+autosp configure 2018-02-14
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1845,7 +1845,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 autosp $as_me 2017-12-26, which was
+It was created by autosp $as_me 2018-02-14, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2708,7 +2708,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='autosp'
- VERSION='2017-12-26'
+ VERSION='2018-02-14'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -4974,7 +4974,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 autosp $as_me 2017-12-26, which was
+This file was extended by autosp $as_me 2018-02-14, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -5040,7 +5040,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="\\
-autosp config.status 2017-12-26
+autosp config.status 2018-02-14
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/Build/source/utils/autosp/autosp-src/configure.ac b/Build/source/utils/autosp/autosp-src/configure.ac
index 43c35444be4..57d151f9f9b 100644
--- a/Build/source/utils/autosp/autosp-src/configure.ac
+++ b/Build/source/utils/autosp/autosp-src/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.63)
-AC_INIT([autosp],[2017-12-26],[rdt@cs.queensu.ca])
+AC_INIT([autosp],[2018-02-14],[rdt@cs.queensu.ca])
 AC_CONFIG_AUX_DIR([.])
 AM_INIT_AUTOMAKE
 AC_CONFIG_HEADERS([config.h])
diff --git a/Build/source/utils/autosp/autosp-src/depcomp b/Build/source/utils/autosp/autosp-src/depcomp
index 49eb4bff6e0..4ebd5b3a2f2 100755
--- a/Build/source/utils/autosp/autosp-src/depcomp
+++ b/Build/source/utils/autosp/autosp-src/depcomp
@@ -1,9 +1,9 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2017-09-16.17; # UTC
+scriptversion=2013-05-30.07; # UTC
 
-# Copyright (C) 1999-2018 Free Software Foundation, Inc.
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
 
 # 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
@@ -16,7 +16,7 @@ scriptversion=2017-09-16.17; # UTC
 # 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, see <https://www.gnu.org/licenses/>.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -786,6 +786,6 @@ exit 0
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC0"
+# time-stamp-time-zone: "UTC"
 # time-stamp-end: "; # UTC"
 # End:
diff --git a/Build/source/utils/autosp/autosp-src/tex2aspc.1 b/Build/source/utils/autosp/autosp-src/tex2aspc.1
index 92b7d24fcb2..5fa7e3c5b82 100644
--- a/Build/source/utils/autosp/autosp-src/tex2aspc.1
+++ b/Build/source/utils/autosp/autosp-src/tex2aspc.1
@@ -1,5 +1,5 @@
 .\" This manpage is licensed under the GNU Public License
-.TH TEX2ASPC 1 2017-12-13  "" ""
+.TH TEX2ASPC 1 2018-02-14  "" ""
 
 .SH NAME
 
@@ -18,13 +18,22 @@ for processing by
 
 This program re-factors (sequences of) conventional 
 note-spacing commands (\\notes \\Notes \\NOtes ...)
+in a measure 
 into
-\\anotes commands.
+a single \\anotes command.
 This is intended for "legacy" scores in order to take advantage of
 features 
 only provided by 
 .BR autosp (1),
-such as "global" skips.
+such as "global" skips and processing of \TransformNotes commands.
+
+.SH LIMITATIONS
+
+
+.B tex2aspc
+assumes that & and | (rather than \\nextinstrument and \\nextstaff) are used to separate instruments and staffs.
+
+User-defined macros are not processed or expanded.
 
 .SH SEE ALSO
 .BR autosp (1)
diff --git a/Build/source/utils/autosp/autosp-src/tex2aspc.test b/Build/source/utils/autosp/autosp-src/tex2aspc.test
index c43fc053b13..c176b6ebea8 100755
--- a/Build/source/utils/autosp/autosp-src/tex2aspc.test
+++ b/Build/source/utils/autosp/autosp-src/tex2aspc.test
@@ -13,7 +13,7 @@ echo && echo "*** tex2aspc  (missing infile)"
 ./tex2aspc  && exit 1
 
 echo && echo "*** tex2aspc quod2.tex quod4.aspc"
-cp tests/quod2.tex .
+cp tests/quod2.aspc .
 rm -f quod4.aspc
 ./tex2aspc quod2.tex quod4.aspc || exit 1
 
diff --git a/Build/source/utils/autosp/configure b/Build/source/utils/autosp/configure
index 8008477bee6..b251ef1d581 100755
--- a/Build/source/utils/autosp/configure
+++ b/Build/source/utils/autosp/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for autosp (TeX Live) 2017-12-26.
+# Generated by GNU Autoconf 2.69 for autosp (TeX Live) 2018-02-14.
 #
 # Report bugs to <tex-k@tug.org>.
 #
@@ -580,8 +580,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='autosp (TeX Live)'
 PACKAGE_TARNAME='autosp--tex-live-'
-PACKAGE_VERSION='2017-12-26'
-PACKAGE_STRING='autosp (TeX Live) 2017-12-26'
+PACKAGE_VERSION='2018-02-14'
+PACKAGE_STRING='autosp (TeX Live) 2018-02-14'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL=''
 
@@ -1278,7 +1278,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 autosp (TeX Live) 2017-12-26 to adapt to many kinds of systems.
+\`configure' configures autosp (TeX Live) 2018-02-14 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1345,7 +1345,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of autosp (TeX Live) 2017-12-26:";;
+     short | recursive ) echo "Configuration of autosp (TeX Live) 2018-02-14:";;
    esac
   cat <<\_ACEOF
 
@@ -1442,7 +1442,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-autosp (TeX Live) configure 2017-12-26
+autosp (TeX Live) configure 2018-02-14
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1865,7 +1865,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 autosp (TeX Live) $as_me 2017-12-26, which was
+It was created by autosp (TeX Live) $as_me 2018-02-14, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3788,7 +3788,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='autosp--tex-live-'
- VERSION='2017-12-26'
+ VERSION='2018-02-14'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -5968,7 +5968,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 autosp (TeX Live) $as_me 2017-12-26, which was
+This file was extended by autosp (TeX Live) $as_me 2018-02-14, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -6025,7 +6025,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="\\
-autosp (TeX Live) config.status 2017-12-26
+autosp (TeX Live) config.status 2018-02-14
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/Build/source/utils/autosp/configure.ac b/Build/source/utils/autosp/configure.ac
index 3a2cdcc086f..061e143bb19 100644
--- a/Build/source/utils/autosp/configure.ac
+++ b/Build/source/utils/autosp/configure.ac
@@ -7,7 +7,7 @@ dnl   This file is free software; the copyright holder
 dnl   gives unlimited permission to copy and/or distribute it,
 dnl   with or without modifications, as long as this notice is preserved.
 dnl
-m4_define([autosp_version], [2017-12-26])[]dnl using unmodified autosp source
+m4_define([autosp_version], [2018-02-14])[]dnl using unmodified autosp source
 AC_INIT([autosp (TeX Live)], autosp_version, [tex-k@tug.org])
 AC_PREREQ([2.65])
 AC_CONFIG_SRCDIR([autosp-src/autosp.c])