autosp 2020-02-06

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

21 files changed, 303 insertions, 110 deletions

diff --git a/Build/source/utils/README b/Build/source/utils/README
index 9e055cf016b..a682227e068 100644
--- a/Build/source/utils/README
+++ b/Build/source/utils/README
@@ -9,7 +9,7 @@ asymptote 2.62 - checked 16jan20
   see http://tug.org/texlive/build.html#asymptote
   and tlpkg/bin/tl-update-asy
 
-autosp 2019-12-22 - checked 23jan20
+autosp 2020-02-06 - checked 07feb20
   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 cae63ee26d6..cea86cadd8e 100644
--- a/Build/source/utils/autosp/ChangeLog
+++ b/Build/source/utils/autosp/ChangeLog
@@ -1,3 +1,8 @@
+2020-02-07  Akira Kakuto  <kakuto@w32tex.org>
+
+	* Import autosp-2020-02-06.
+	configure.ac: Adapted.
+
 2020-01-23  Akira Kakuto  <kakuto@w32tex.org>
 
 	* Import autosp-2019-12-22.
diff --git a/Build/source/utils/autosp/TLpatches/ChangeLog b/Build/source/utils/autosp/TLpatches/ChangeLog
index 7a727652706..8a5398e5f7e 100644
--- a/Build/source/utils/autosp/TLpatches/ChangeLog
+++ b/Build/source/utils/autosp/TLpatches/ChangeLog
@@ -1,3 +1,8 @@
+2020-02-07  Akira Kakuto  <kakuto@w32tex.org>
+
+	Import autosp-2020-02-06.
+	* patch-01-binary-write: Adapt.
+
 2020-01-23  Akira Kakuto  <kakuto@w32tex.org>
 
 	Import autosp-2019-12-22.
diff --git a/Build/source/utils/autosp/TLpatches/patch-01-binary-write b/Build/source/utils/autosp/TLpatches/patch-01-binary-write
index 9d4cc914bc5..b5a2d57f5e1 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-2019-12-22/autosp.c autosp-src/autosp.c
---- autosp-2019-12-22/autosp.c	Mon Dec 23 05:43:59 2019
-+++ autosp-src/autosp.c	Thu Jan 23 12:32:48 2020
-@@ -183,7 +183,7 @@
+diff -ur autosp-2020-02-06/autosp.c autosp-src/autosp.c
+--- autosp-2020-02-06/autosp.c	Thu Feb 06 23:00:34 2020
++++ autosp-src/autosp.c	Fri Feb 07 07:43:38 2020
+@@ -221,7 +221,7 @@
    }
    else
    {
@@ -10,7 +10,7 @@ diff -ur autosp-2019-12-22/autosp.c autosp-src/autosp.c
      if (outfile == NULL)
      { printf ("Can't open %s\n", outfilename);
        exit (EXIT_FAILURE);
-@@ -201,7 +201,7 @@
+@@ -239,7 +239,7 @@
    *logfilename_n = '\0';
    append (logfilename, &logfilename_n, "alog", sizeof (logfilename));
    if (debug)  
@@ -19,9 +19,9 @@ diff -ur autosp-2019-12-22/autosp.c autosp-src/autosp.c
      if (logfile == NULL)
      { printf ("Can't open %s\n", logfilename);
        exit (EXIT_FAILURE);
-diff -ur autosp-2019-12-22/rebar.c autosp-src/rebar.c
---- autosp-2019-12-22/rebar.c	Tue Jan 08 22:28:27 2019
-+++ autosp-src/rebar.c	Thu Jan 23 12:33:20 2020
+diff -ur autosp-2020-02-06/rebar.c autosp-src/rebar.c
+--- autosp-2020-02-06/rebar.c	Thu Feb 06 16:22:35 2020
++++ autosp-src/rebar.c	Fri Feb 07 07:44:13 2020
 @@ -264,7 +264,7 @@
        else
          append (outfilename, &outfilename_n, ".aspc", sizeof (outfilename));
@@ -31,9 +31,9 @@ diff -ur autosp-2019-12-22/rebar.c autosp-src/rebar.c
      if (outfile == NULL)
      { fprintf (stderr,"Can't open %s\n", outfilename);
        exit (EXIT_FAILURE);
-diff -ur autosp-2019-12-22/spacing_note.c autosp-src/spacing_note.c
---- autosp-2019-12-22/spacing_note.c	Wed May 16 22:35:31 2018
-+++ autosp-src/spacing_note.c	Thu Jan 23 12:35:52 2020
+diff -ur autosp-2020-02-06/spacing_note.c autosp-src/spacing_note.c
+--- autosp-2020-02-06/spacing_note.c	Thu Feb 06 16:22:35 2020
++++ autosp-src/spacing_note.c	Fri Feb 07 07:47:00 2020
 @@ -30,7 +30,7 @@
      update_global_skip (n);
        /* commas will be discarded by filter_output (i) */
@@ -61,9 +61,9 @@ diff -ur autosp-2019-12-22/spacing_note.c autosp-src/spacing_note.c
  
    t = strpbrk (s+1, "{\\&|$"); /* collective coding?  */
    if (*t == '{')  /*  {...}  */
-diff -ur autosp-2019-12-22/tex2aspc.c autosp-src/tex2aspc.c
---- autosp-2019-12-22/tex2aspc.c	Wed Aug 28 20:34:53 2019
-+++ autosp-src/tex2aspc.c	Thu Jan 23 12:38:10 2020
+diff -ur autosp-2020-02-06/tex2aspc.c autosp-src/tex2aspc.c
+--- autosp-2020-02-06/tex2aspc.c	Thu Feb 06 16:22:35 2020
++++ autosp-src/tex2aspc.c	Fri Feb 07 07:47:30 2020
 @@ -342,7 +342,7 @@
      append (outfilename, &outfilename_n, ".aspc", sizeof (outfilename));
    }
diff --git a/Build/source/utils/autosp/autosp-src/Makefile.am b/Build/source/utils/autosp/autosp-src/Makefile.am
index d79642d21d8..65b2e856454 100644
--- a/Build/source/utils/autosp/autosp-src/Makefile.am
+++ b/Build/source/utils/autosp/autosp-src/Makefile.am
@@ -3,7 +3,7 @@ autosp_SOURCES = utils.h utils.c autosp.h autosp.c process_score.h process_score
   process_command.h process_command.c status.c spacing_note.c xtuplet.c
 rebar_SOURCES = utils.h utils.c rebar.c
 tex2aspc_SOURCES = utils.h utils.c tex2aspc.c
-AM_CFLAGS = -O4 -ansi -Wall -Wextra -pedantic-errors -Werror
+AM_CFLAGS = -fno-common -O4 -ansi -Wall -Wextra -pedantic-errors -Werror
 dist_man_MANS = autosp.1 rebar.1 tex2aspc.1
 ## Tests
 ##
diff --git a/Build/source/utils/autosp/autosp-src/Makefile.in b/Build/source/utils/autosp/autosp-src/Makefile.in
index 10d1eede27b..502f9d5a3c0 100644
--- a/Build/source/utils/autosp/autosp-src/Makefile.in
+++ b/Build/source/utils/autosp/autosp-src/Makefile.in
@@ -476,7 +476,7 @@ autosp_SOURCES = utils.h utils.c autosp.h autosp.c process_score.h process_score
 
 rebar_SOURCES = utils.h utils.c rebar.c
 tex2aspc_SOURCES = utils.h utils.c tex2aspc.c
-AM_CFLAGS = -O4 -ansi -Wall -Wextra -pedantic-errors -Werror
+AM_CFLAGS = -fno-common -O4 -ansi -Wall -Wextra -pedantic-errors -Werror
 dist_man_MANS = autosp.1 rebar.1 tex2aspc.1
 TESTS = autosp.test rebar.test tex2aspc.test
 EXTRA_DIST = $(TESTS) tests/quod2.aspc tests/quod2.tex \
diff --git a/Build/source/utils/autosp/autosp-src/README b/Build/source/utils/autosp/autosp-src/README
index 2aec8c04948..779d7a94459 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 2019-08-27.
+version 2019-12-22.
 
 autosp is a preprocessor that generates note-spacing
 commands for MusiXTeX scores. It simplifies the creation
diff --git a/Build/source/utils/autosp/autosp-src/autosp.1 b/Build/source/utils/autosp/autosp-src/autosp.1
index a4a24c68273..59cb4f7796c 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 2019-08-27  "" ""
+.TH AUTOSP 1 2019-12-22  "" ""
 
 .SH NAME
 autosp \- preprocessor to generate note-spacing commands for MusiXTeX scores
diff --git a/Build/source/utils/autosp/autosp-src/autosp.c b/Build/source/utils/autosp/autosp-src/autosp.c
index b109032e94a..77add3b53d5 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] = "2019-12-22";
+char version[12] = "2020-02-06";
 
-/*  Copyright (C) 2014-19 R. D. Tennent School of Computing,
+/*  Copyright (C) 2014-20 R. D. Tennent School of Computing,
  *  Queen's University, rdt@cs.queensu.ca
  *
  *  This program is free software; you can redistribute it
@@ -80,8 +80,46 @@ char version[12] = "2019-12-22";
  *      
  */
 
-# include "autosp.h"
+# include "utils.h"
 
+#ifdef HAVE_CONFIG_H   /* for TeXLive */
+#include <config.h>
+#endif
+
+# ifdef KPATHSEA
+# include <kpathsea/getopt.h>
+# else
+# include <getopt.h>
+# endif
+
+# ifdef HAVE_STDBOOL_H
+# include <stdbool.h>
+# else
+# ifndef HAVE__BOOL
+# define _Bool signed char
+# endif
+# define bool    _Bool
+# define true    1
+# define false   0
+# endif
+
+# define PRIVATE static
+
+# define SHORT_LEN 256
+
+bool debug;
+bool dottedbeamnotes;          /* dotted beam notes ignored?        */
+
+char infilename[SHORT_LEN];
+char *infilename_n;
+char outfilename[SHORT_LEN];
+char *outfilename_n;
+char logfilename[SHORT_LEN];
+char *logfilename_n;
+FILE *infile, *outfile, *logfile;
+
+
+void process_score ();
 
 PRIVATE void
 usage ()
@@ -108,7 +146,7 @@ int main (int argc, char *argv[])
   };
   
   printf ("This is autosp, version %s.\n", version);
-  printf ("Copyright (C) 2014-19  R. D. Tennent\n" );
+  printf ("Copyright (C) 2014-20  R. D. Tennent\n" );
   printf ("School of Computing, Queen's University, rdt@cs.queensu.ca\n" );
   printf ("License GNU GPL version 2 or later <http://gnu.org/licences/gpl.html>.\n" );
   printf ("There is NO WARRANTY, to the extent permitted by law.\n\n" );
diff --git a/Build/source/utils/autosp/autosp-src/autosp.h b/Build/source/utils/autosp/autosp-src/autosp.h
index c8247c7eafa..158b2c30544 100644
--- a/Build/source/utils/autosp/autosp-src/autosp.h
+++ b/Build/source/utils/autosp/autosp-src/autosp.h
@@ -25,16 +25,16 @@
 
 # define SHORT_LEN 256
 
-bool debug;
-bool dottedbeamnotes;          /* dotted beam notes ignored?        */
+extern bool debug;
+extern bool dottedbeamnotes;          /* dotted beam notes ignored?        */
 
-char infilename[SHORT_LEN];
-char *infilename_n;
-char outfilename[SHORT_LEN];
-char *outfilename_n;
-char logfilename[SHORT_LEN];
-char *logfilename_n;
-FILE *infile, *outfile, *logfile;
+extern char infilename[SHORT_LEN];
+extern char *infilename_n;
+extern char outfilename[SHORT_LEN];
+extern char *outfilename_n;
+extern char logfilename[SHORT_LEN];
+extern char *logfilename_n;
+extern FILE *infile, *outfile, *logfile;
 
 
-void process_score ();
+extern void process_score ();
diff --git a/Build/source/utils/autosp/autosp-src/configure b/Build/source/utils/autosp/autosp-src/configure
index 358ca14d93a..470284c32b4 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 2019-12-22.
+# Generated by GNU Autoconf 2.69 for autosp 2020-02-06.
 #
 # Report bugs to <rdt@cs.queensu.ca>.
 #
@@ -580,8 +580,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='autosp'
 PACKAGE_TARNAME='autosp'
-PACKAGE_VERSION='2019-12-22'
-PACKAGE_STRING='autosp 2019-12-22'
+PACKAGE_VERSION='2020-02-06'
+PACKAGE_STRING='autosp 2020-02-06'
 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 2019-12-22 to adapt to many kinds of systems.
+\`configure' configures autosp 2020-02-06 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 2019-12-22:";;
+     short | recursive ) echo "Configuration of autosp 2020-02-06:";;
    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 2019-12-22
+autosp configure 2020-02-06
 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 2019-12-22, which was
+It was created by autosp $as_me 2020-02-06, 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='2019-12-22'
+ VERSION='2020-02-06'
 
 
 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 2019-12-22, which was
+This file was extended by autosp $as_me 2020-02-06, 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 2019-12-22
+autosp config.status 2020-02-06
 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 3d1016caedd..ae531df3441 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],[2019-12-22],[rdt@cs.queensu.ca])
+AC_INIT([autosp],[2020-02-06],[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/process_command.c b/Build/source/utils/autosp/autosp-src/process_command.c
index 6ec9e8533ea..154ac17eadc 100644
--- a/Build/source/utils/autosp/autosp-src/process_command.c
+++ b/Build/source/utils/autosp/autosp-src/process_command.c
@@ -1,9 +1,77 @@
-# include "process_command.h"
 
+# include "process_score.h"
 
-void process_xtuplet (void);
+# define APPOGG_SPACING SP(64)+SP(256)  /* not a legitimate spacing */
+# define notespp "\\vnotes2.95\\elemskip"
+# define Notespp "\\vnotes3.95\\elemskip"
+# define NOtespp "\\vnotes4.95\\elemskip"
+# define NOTespp "\\vnotes6.95\\elemskip"
+# define NOTEsp  "\\vnotes9.52\\elemskip"
+# define APPOGG_NOTES "\\vnotes1.45\\elemskip"
+
+char terminator[MAX_STAFFS];    /* one of '&' "|', '$'                */
+
+char *notes[MAX_STAFFS];        /* note segment for ith staff         */
+char *current[MAX_STAFFS];
+
+int spacings[MAX_STAFFS];       /* spacing for ith staff              */
+
+int vspacing[MAX_STAFFS];       /* virtual-note (skip) spacing        */
+bool vspacing_active[MAX_STAFFS]; /* virtual-note spacing active?       */
+                      /* used to preclude unnecessary pre-accidental skips    */
+
+bool nonvirtual_notes;          /* used to preclude output of *only* virtual notes */
+
+int cspacing[MAX_STAFFS];       /* nominal collective-note spacing    */
+char collective[MAX_STAFFS][SHORT_LEN];
+                                    /* prefixes for collective note sequences */
+bool first_collective[MAX_STAFFS];
+
+char deferred_bar[SHORT_LEN];   /* deferred \bar (or \endpiece etc.)  */
+
+int beaming[MAX_STAFFS];        /* spacing for beamed notes           */
+int new_beaming;
+int semiauto_beam_notes[MAX_STAFFS]; /* semi-automatic beam notes     */
+
+int spacing_staff;              /* staff that determines current spacing  */
 
-int i;
+/* save-restore state for a staff; used in process_xtuplet */
+int beamingi;  
+char *currenti;
+int cspacingi;
+int vspacingi;
+char collectivei[SHORT_LEN];
+bool first_collectivei;
+
+int xtuplet[MAX_STAFFS];        /* x for xtuplet in staff i          */
+
+bool appoggiatura;
+
+char outstrings[MAX_STAFFS][LINE_LEN];  
+                                     /* accumulate commands to be output    */
+char *n_outstrings[MAX_STAFFS];
+
+int global_skip;  
+   /* = 1, 2, 3, or 4 for (non-standard) commands \QQsk \HQsk \TQsk \Qsk    */
+   /* = 5 for five commas and double-flat accidental spacing                */
+   /* = 6 for six commas                                                    */
+
+
+char s[SHORT_LEN];  /* string for ps()  */
+char *s_n;
+char *ps(int spacing);
+void note_segment (char *s);
+void status (int i);
+void status_spacing (void);
+void status_all (void);
+void status_collective (int i);
+void status_beam (int i);
+
+
+int spacing_note (int i);
+void output_notes (int i);
+void initialize_notes ();
+void process_xtuplet (void);
 
 PRIVATE
 void analyze_notes (char **ln) 
diff --git a/Build/source/utils/autosp/autosp-src/process_command.h b/Build/source/utils/autosp/autosp-src/process_command.h
index ed50475b944..c22ae8f9938 100644
--- a/Build/source/utils/autosp/autosp-src/process_command.h
+++ b/Build/source/utils/autosp/autosp-src/process_command.h
@@ -8,56 +8,57 @@
 # define NOTEsp  "\\vnotes9.52\\elemskip"
 # define APPOGG_NOTES "\\vnotes1.45\\elemskip"
 
-char terminator[MAX_STAFFS];    /* one of '&' "|', '$'                */
+extern char terminator[MAX_STAFFS];    /* one of '&' "|', '$'                */
 
-char *notes[MAX_STAFFS];        /* note segment for ith staff         */
-char *current[MAX_STAFFS];
+extern char *notes[MAX_STAFFS];        /* note segment for ith staff         */
+extern char *current[MAX_STAFFS];
 
-int spacings[MAX_STAFFS];       /* spacing for ith staff              */
+extern int spacings[MAX_STAFFS];       /* spacing for ith staff              */
 
-int vspacing[MAX_STAFFS];       /* virtual-note (skip) spacing        */
-bool vspacing_active[MAX_STAFFS]; /* virtual-note spacing active?       */
+extern int vspacing[MAX_STAFFS];       /* virtual-note (skip) spacing        */
+extern bool vspacing_active[MAX_STAFFS]; /* virtual-note spacing active?       */
                       /* used to preclude unnecessary pre-accidental skips    */
 
-bool nonvirtual_notes;          /* used to preclude output of *only* virtual notes */
+extern bool nonvirtual_notes;          /* used to preclude output of *only* virtual notes */
 
-int cspacing[MAX_STAFFS];       /* nominal collective-note spacing    */
-char collective[MAX_STAFFS][SHORT_LEN];
+extern int cspacing[MAX_STAFFS];       /* nominal collective-note spacing    */
+extern char collective[MAX_STAFFS][SHORT_LEN];
                                     /* prefixes for collective note sequences */
-bool first_collective[MAX_STAFFS];
+extern bool first_collective[MAX_STAFFS];
 
-char deferred_bar[SHORT_LEN];   /* deferred \bar (or \endpiece etc.)  */
+extern char deferred_bar[SHORT_LEN];   /* deferred \bar (or \endpiece etc.)  */
 
-int beaming[MAX_STAFFS];        /* spacing for beamed notes           */
-int new_beaming;
-int semiauto_beam_notes[MAX_STAFFS]; /* semi-automatic beam notes     */
+extern int beaming[MAX_STAFFS];        /* spacing for beamed notes           */
+extern int new_beaming;
+extern int semiauto_beam_notes[MAX_STAFFS]; /* semi-automatic beam notes     */
 
-int spacing_staff;              /* staff that determines current spacing  */
+extern int spacing_staff;              /* staff that determines current spacing  */
 
 /* save-restore state for a staff; used in process_xtuplet */
-int beamingi;  
-char *currenti;
-int cspacingi;
-int vspacingi;
-char collectivei[SHORT_LEN];
-bool first_collectivei;
+extern int beamingi;  
+extern char *currenti;
+extern int cspacingi;
+extern int vspacingi;
+extern char collectivei[SHORT_LEN];
+extern bool first_collectivei;
 
-int xtuplet[MAX_STAFFS];        /* x for xtuplet in staff i          */
+extern int xtuplet[MAX_STAFFS];        /* x for xtuplet in staff i          */
 
-bool appoggiatura;
+extern bool appoggiatura;
 
-char outstrings[MAX_STAFFS][LINE_LEN];  
+extern char outstrings[MAX_STAFFS][LINE_LEN];  
                                      /* accumulate commands to be output    */
-char *n_outstrings[MAX_STAFFS];
+extern char *n_outstrings[MAX_STAFFS];
 
-int global_skip;  
+extern int global_skip;  
    /* = 1, 2, 3, or 4 for (non-standard) commands \QQsk \HQsk \TQsk \Qsk    */
    /* = 5 for five commas and double-flat accidental spacing                */
    /* = 6 for six commas                                                    */
 
 
-char s[SHORT_LEN];  /* string for ps()  */
-char *s_n;
+extern char s[SHORT_LEN];  /* string for ps()  */
+extern char *s_n;
+
 char *ps(int spacing);
 void note_segment (char *s);
 void status (int i);
diff --git a/Build/source/utils/autosp/autosp-src/process_score.c b/Build/source/utils/autosp/autosp-src/process_score.c
index bdd63ddf8f5..7c319944cd8 100644
--- a/Build/source/utils/autosp/autosp-src/process_score.c
+++ b/Build/source/utils/autosp/autosp-src/process_score.c
@@ -1,4 +1,36 @@
-# include "process_score.h"
+# include "autosp.h"
+
+# define MAX_STAFFS 9
+
+# define SMALL_NOTE 512
+# define SP(note) (SMALL_NOTE/note)  
+/* note = { 256 | 128 | 64 | 32 | 16 | 8 | 4 | 2 | 1 }  */
+# define MAX_SPACING 2*SP(1)
+int staffs[MAX_STAFFS]; /* number of staffs for ith instrument*/
+bool active[MAX_STAFFS];        /* is staff i active?                 */
+bool bar_rest[MAX_STAFFS];
+int spacing;                    /* spacing for current notes          */
+int restbars;
+char global_skip_str[7][16];   
+int ninstr;                 /* number of instruments              */
+int nstaffs;                /* number of staffs                   */
+int nastaffs;               /* number of active staffs;           */
+int old_spacing;
+int oldspacing_staff;
+bool Changeclefs;               /* output \Changeclefs after \def\atnextbar */
+char TransformNotes2[SHORT_LEN];      /* 2nd argument of \TransformNotes    */
+bool TransformNotesDefined;
+char instrument_size[MAX_STAFFS][SHORT_LEN];
+     /* instrument size as set by setsize or by default ("\\@one") */
+float instr_numsize[MAX_STAFFS];
+     /* nummerical intrument size */
+int staff_instr[MAX_STAFFS];  /* instrument for each staff */
+
+char line[LINE_LEN];            /* line of input                      */
+
+void process_line ();
+
+void process_command (char **ln);
 
 void process_line ()
 {
diff --git a/Build/source/utils/autosp/autosp-src/process_score.h b/Build/source/utils/autosp/autosp-src/process_score.h
index 152f4c1b795..1965c46fcf9 100644
--- a/Build/source/utils/autosp/autosp-src/process_score.h
+++ b/Build/source/utils/autosp/autosp-src/process_score.h
@@ -6,28 +6,28 @@
 # define SP(note) (SMALL_NOTE/note)  
 /* note = { 256 | 128 | 64 | 32 | 16 | 8 | 4 | 2 | 1 }  */
 # define MAX_SPACING 2*SP(1)
-int staffs[MAX_STAFFS]; /* number of staffs for ith instrument*/
-bool active[MAX_STAFFS];        /* is staff i active?                 */
-bool bar_rest[MAX_STAFFS];
-int spacing;                    /* spacing for current notes          */
-int restbars;
-char global_skip_str[7][16];   
-int ninstr;                 /* number of instruments              */
-int nstaffs;                /* number of staffs                   */
-int nastaffs;               /* number of active staffs;           */
-int old_spacing;
-int oldspacing_staff;
-bool Changeclefs;               /* output \Changeclefs after \def\atnextbar */
-char TransformNotes2[SHORT_LEN];      /* 2nd argument of \TransformNotes    */
-bool TransformNotesDefined;
-char instrument_size[MAX_STAFFS][SHORT_LEN];
+extern int staffs[MAX_STAFFS]; /* number of staffs for ith instrument*/
+extern bool active[MAX_STAFFS];        /* is staff i active?                 */
+extern bool bar_rest[MAX_STAFFS];
+extern int spacing;                    /* spacing for current notes          */
+extern int restbars;
+extern char global_skip_str[7][16];   
+extern int ninstr;                 /* number of instruments              */
+extern int nstaffs;                /* number of staffs                   */
+extern int nastaffs;               /* number of active staffs;           */
+extern int old_spacing;
+extern int oldspacing_staff;
+extern bool Changeclefs;               /* output \Changeclefs after \def\atnextbar */
+extern char TransformNotes2[SHORT_LEN];      /* 2nd argument of \TransformNotes    */
+extern bool TransformNotesDefined;
+extern char instrument_size[MAX_STAFFS][SHORT_LEN];
      /* instrument size as set by setsize or by default ("\\@one") */
-float instr_numsize[MAX_STAFFS];
+extern float instr_numsize[MAX_STAFFS];
      /* nummerical intrument size */
-int staff_instr[MAX_STAFFS];  /* instrument for each staff */
+extern int staff_instr[MAX_STAFFS];  /* instrument for each staff */
 
-char line[LINE_LEN];            /* line of input                      */
+extern char line[LINE_LEN];            /* line of input                      */
 
-void process_line ();
+extern void process_line ();
 
-void process_command (char **ln);
+extern void process_command (char **ln);
diff --git a/Build/source/utils/autosp/autosp-src/tests/quod2.tex b/Build/source/utils/autosp/autosp-src/tests/quod2.tex
index 7d5bb0bf018..0bd05c040cd 100644
--- a/Build/source/utils/autosp/autosp-src/tests/quod2.tex
+++ b/Build/source/utils/autosp/autosp-src/tests/quod2.tex
@@ -1,4 +1,4 @@
-%  Generated by autosp (2019-12-22).
+%  Generated by autosp (2020-02-06).
 \input musixtex
 \input musixplt
 \input soul.sty
diff --git a/Build/source/utils/autosp/autosp-src/utils.c b/Build/source/utils/autosp/autosp-src/utils.c
index ada298e8bfa..2e84a70ba40 100644
--- a/Build/source/utils/autosp/autosp-src/utils.c
+++ b/Build/source/utils/autosp/autosp-src/utils.c
@@ -22,7 +22,51 @@
 /*  utils.c  - utilities for autosp, fixmsxpart.c and msxlint.c
  */
 
-# include "utils.h"
+#ifdef HAVE_CONFIG_H   /* for TeXLive */
+#include <config.h>
+#endif
+
+# define PRIVATE static
+# include <stdlib.h>
+# include <string.h>
+# include <stdio.h>
+# include <ctype.h>
+
+# ifdef KPATHSEA
+# include <kpathsea/getopt.h>
+# else
+# include <getopt.h>
+# endif
+# include <time.h>
+
+# define LINE_LEN 1024
+
+# ifdef HAVE_STDBOOL_H
+# include <stdbool.h>
+# else
+# ifndef HAVE__BOOL
+# define _Bool signed char
+# endif
+# define bool    _Bool
+# define true    1
+# define false   0
+# endif
+
+extern size_t append (char *dst, char **offset, const char *src, size_t n);
+/*  Copies src to *offset and updates *offset accordingly (if possible). 
+ *  Assumes *offset is dst if offset == NULL.
+ *  The src string must be null-terminated.
+ *  Execution aborts unless **offset == '\0'. 
+ *  Returns (original offset - dst) + strlen(src);  if >= n, the string was truncated.
+ */
+
+extern bool prefix (const char *cs, const char *ct); /* is string cs[] a prefix of ct[]?  */
+extern bool suffix (const char *cs, const char *ct); /* is string cs[] a suffix of ct[]?  */
+
+int lineno;
+
+extern void error (const char msg[]);	/* abort with stderr message msg */
+extern void warning (const char msg[]); /* output warning message msg to stderr  */
 
 void
 warning (const char msg[])    /* output warning message msg to stderr                 */
diff --git a/Build/source/utils/autosp/autosp-src/utils.h b/Build/source/utils/autosp/autosp-src/utils.h
index 1bcb884b889..419bfdbca03 100644
--- a/Build/source/utils/autosp/autosp-src/utils.h
+++ b/Build/source/utils/autosp/autosp-src/utils.h
@@ -61,6 +61,6 @@ extern size_t append (char *dst, char **offset, const char *src, size_t n);
 extern bool prefix (const char *cs, const char *ct); /* is string cs[] a prefix of ct[]?  */
 extern bool suffix (const char *cs, const char *ct); /* is string cs[] a suffix of ct[]?  */
 
-int lineno;
+extern int lineno;
 extern void error (const char msg[]);	/* abort with stderr message msg */
 extern void warning (const char msg[]); /* output warning message msg to stderr  */
diff --git a/Build/source/utils/autosp/configure b/Build/source/utils/autosp/configure
index 128330df5fb..4dae76dad5a 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) 2019-12-22.
+# Generated by GNU Autoconf 2.69 for autosp (TeX Live) 2020-02-06.
 #
 # 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='2019-12-22'
-PACKAGE_STRING='autosp (TeX Live) 2019-12-22'
+PACKAGE_VERSION='2020-02-06'
+PACKAGE_STRING='autosp (TeX Live) 2020-02-06'
 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) 2019-12-22 to adapt to many kinds of systems.
+\`configure' configures autosp (TeX Live) 2020-02-06 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) 2019-12-22:";;
+     short | recursive ) echo "Configuration of autosp (TeX Live) 2020-02-06:";;
    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 2019-12-22
+autosp (TeX Live) configure 2020-02-06
 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 2019-12-22, which was
+It was created by autosp (TeX Live) $as_me 2020-02-06, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3789,7 +3789,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='autosp--tex-live-'
- VERSION='2019-12-22'
+ VERSION='2020-02-06'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -5973,7 +5973,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 2019-12-22, which was
+This file was extended by autosp (TeX Live) $as_me 2020-02-06, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -6030,7 +6030,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 2019-12-22
+autosp (TeX Live) config.status 2020-02-06
 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 a9d17b403db..9dc68c7d5bf 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], [2019-12-22])[]dnl using unmodified autosp source
+m4_define([autosp_version], [2020-02-06])[]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])