texlive[53702] Build/source/utils: autosp 2020-02-06
commits+kakuto at tug.org
commits+kakuto at tug.org
Fri Feb 7 00:02:46 CET 2020
Revision: 53702
http://tug.org/svn/texlive?view=revision&revision=53702
Author: kakuto
Date: 2020-02-07 00:02:45 +0100 (Fri, 07 Feb 2020)
Log Message:
-----------
autosp 2020-02-06
Modified Paths:
--------------
trunk/Build/source/utils/README
trunk/Build/source/utils/autosp/ChangeLog
trunk/Build/source/utils/autosp/TLpatches/ChangeLog
trunk/Build/source/utils/autosp/TLpatches/patch-01-binary-write
trunk/Build/source/utils/autosp/autosp-src/Makefile.am
trunk/Build/source/utils/autosp/autosp-src/Makefile.in
trunk/Build/source/utils/autosp/autosp-src/README
trunk/Build/source/utils/autosp/autosp-src/autosp.1
trunk/Build/source/utils/autosp/autosp-src/autosp.c
trunk/Build/source/utils/autosp/autosp-src/autosp.h
trunk/Build/source/utils/autosp/autosp-src/configure
trunk/Build/source/utils/autosp/autosp-src/configure.ac
trunk/Build/source/utils/autosp/autosp-src/process_command.c
trunk/Build/source/utils/autosp/autosp-src/process_command.h
trunk/Build/source/utils/autosp/autosp-src/process_score.c
trunk/Build/source/utils/autosp/autosp-src/process_score.h
trunk/Build/source/utils/autosp/autosp-src/tests/quod2.tex
trunk/Build/source/utils/autosp/autosp-src/utils.c
trunk/Build/source/utils/autosp/autosp-src/utils.h
trunk/Build/source/utils/autosp/configure
trunk/Build/source/utils/autosp/configure.ac
Modified: trunk/Build/source/utils/README
===================================================================
--- trunk/Build/source/utils/README 2020-02-06 20:54:06 UTC (rev 53701)
+++ trunk/Build/source/utils/README 2020-02-06 23:02:45 UTC (rev 53702)
@@ -9,7 +9,7 @@
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.
Modified: trunk/Build/source/utils/autosp/ChangeLog
===================================================================
--- trunk/Build/source/utils/autosp/ChangeLog 2020-02-06 20:54:06 UTC (rev 53701)
+++ trunk/Build/source/utils/autosp/ChangeLog 2020-02-06 23:02:45 UTC (rev 53702)
@@ -1,3 +1,8 @@
+2020-02-07 Akira Kakuto <kakuto at w32tex.org>
+
+ * Import autosp-2020-02-06.
+ configure.ac: Adapted.
+
2020-01-23 Akira Kakuto <kakuto at w32tex.org>
* Import autosp-2019-12-22.
Modified: trunk/Build/source/utils/autosp/TLpatches/ChangeLog
===================================================================
--- trunk/Build/source/utils/autosp/TLpatches/ChangeLog 2020-02-06 20:54:06 UTC (rev 53701)
+++ trunk/Build/source/utils/autosp/TLpatches/ChangeLog 2020-02-06 23:02:45 UTC (rev 53702)
@@ -1,3 +1,8 @@
+2020-02-07 Akira Kakuto <kakuto at w32tex.org>
+
+ Import autosp-2020-02-06.
+ * patch-01-binary-write: Adapt.
+
2020-01-23 Akira Kakuto <kakuto at w32tex.org>
Import autosp-2019-12-22.
Modified: trunk/Build/source/utils/autosp/TLpatches/patch-01-binary-write
===================================================================
--- trunk/Build/source/utils/autosp/TLpatches/patch-01-binary-write 2020-02-06 20:54:06 UTC (rev 53701)
+++ trunk/Build/source/utils/autosp/TLpatches/patch-01-binary-write 2020-02-06 23:02:45 UTC (rev 53702)
@@ -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 @@
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 @@
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 @@
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 @@
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));
}
Modified: trunk/Build/source/utils/autosp/autosp-src/Makefile.am
===================================================================
--- trunk/Build/source/utils/autosp/autosp-src/Makefile.am 2020-02-06 20:54:06 UTC (rev 53701)
+++ trunk/Build/source/utils/autosp/autosp-src/Makefile.am 2020-02-06 23:02:45 UTC (rev 53702)
@@ -3,7 +3,7 @@
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
##
Modified: trunk/Build/source/utils/autosp/autosp-src/Makefile.in
===================================================================
(Binary files differ)
Modified: trunk/Build/source/utils/autosp/autosp-src/README
===================================================================
--- trunk/Build/source/utils/autosp/autosp-src/README 2020-02-06 20:54:06 UTC (rev 53701)
+++ trunk/Build/source/utils/autosp/autosp-src/README 2020-02-06 23:02:45 UTC (rev 53702)
@@ -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
Modified: trunk/Build/source/utils/autosp/autosp-src/autosp.1
===================================================================
--- trunk/Build/source/utils/autosp/autosp-src/autosp.1 2020-02-06 20:54:06 UTC (rev 53701)
+++ trunk/Build/source/utils/autosp/autosp-src/autosp.1 2020-02-06 23:02:45 UTC (rev 53702)
@@ -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
Modified: trunk/Build/source/utils/autosp/autosp-src/autosp.c
===================================================================
--- trunk/Build/source/utils/autosp/autosp-src/autosp.c 2020-02-06 20:54:06 UTC (rev 53701)
+++ trunk/Build/source/utils/autosp/autosp-src/autosp.c 2020-02-06 23:02:45 UTC (rev 53702)
@@ -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 at cs.queensu.ca
*
* This program is free software; you can redistribute it
@@ -80,9 +80,47 @@
*
*/
-# 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 @@
};
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 at 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" );
Modified: trunk/Build/source/utils/autosp/autosp-src/autosp.h
===================================================================
--- trunk/Build/source/utils/autosp/autosp-src/autosp.h 2020-02-06 20:54:06 UTC (rev 53701)
+++ trunk/Build/source/utils/autosp/autosp-src/autosp.h 2020-02-06 23:02:45 UTC (rev 53702)
@@ -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 ();
Modified: trunk/Build/source/utils/autosp/autosp-src/configure
===================================================================
(Binary files differ)
Modified: trunk/Build/source/utils/autosp/autosp-src/configure.ac
===================================================================
--- trunk/Build/source/utils/autosp/autosp-src/configure.ac 2020-02-06 20:54:06 UTC (rev 53701)
+++ trunk/Build/source/utils/autosp/autosp-src/configure.ac 2020-02-06 23:02:45 UTC (rev 53702)
@@ -1,5 +1,5 @@
AC_PREREQ(2.63)
-AC_INIT([autosp],[2019-12-22],[rdt at cs.queensu.ca])
+AC_INIT([autosp],[2020-02-06],[rdt at cs.queensu.ca])
AC_CONFIG_AUX_DIR([.])
AM_INIT_AUTOMAKE
AC_CONFIG_HEADERS([config.h])
Modified: trunk/Build/source/utils/autosp/autosp-src/process_command.c
===================================================================
--- trunk/Build/source/utils/autosp/autosp-src/process_command.c 2020-02-06 20:54:06 UTC (rev 53701)
+++ trunk/Build/source/utils/autosp/autosp-src/process_command.c 2020-02-06 23:02:45 UTC (rev 53702)
@@ -1,10 +1,78 @@
-# include "process_command.h"
+# include "process_score.h"
+# 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 */
+
+/* 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);
-int i;
-
PRIVATE
void analyze_notes (char **ln)
/* divide material from *ln to \en into notes[i] segments
Modified: trunk/Build/source/utils/autosp/autosp-src/process_command.h
===================================================================
--- trunk/Build/source/utils/autosp/autosp-src/process_command.h 2020-02-06 20:54:06 UTC (rev 53701)
+++ trunk/Build/source/utils/autosp/autosp-src/process_command.h 2020-02-06 23:02:45 UTC (rev 53702)
@@ -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);
Modified: trunk/Build/source/utils/autosp/autosp-src/process_score.c
===================================================================
--- trunk/Build/source/utils/autosp/autosp-src/process_score.c 2020-02-06 20:54:06 UTC (rev 53701)
+++ trunk/Build/source/utils/autosp/autosp-src/process_score.c 2020-02-06 23:02:45 UTC (rev 53702)
@@ -1,5 +1,37 @@
-# 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 ()
{
char *ln;
Modified: trunk/Build/source/utils/autosp/autosp-src/process_score.h
===================================================================
--- trunk/Build/source/utils/autosp/autosp-src/process_score.h 2020-02-06 20:54:06 UTC (rev 53701)
+++ trunk/Build/source/utils/autosp/autosp-src/process_score.h 2020-02-06 23:02:45 UTC (rev 53702)
@@ -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);
Modified: trunk/Build/source/utils/autosp/autosp-src/tests/quod2.tex
===================================================================
--- trunk/Build/source/utils/autosp/autosp-src/tests/quod2.tex 2020-02-06 20:54:06 UTC (rev 53701)
+++ trunk/Build/source/utils/autosp/autosp-src/tests/quod2.tex 2020-02-06 23:02:45 UTC (rev 53702)
@@ -1,4 +1,4 @@
-% Generated by autosp (2019-12-22).
+% Generated by autosp (2020-02-06).
\input musixtex
\input musixplt
\input soul.sty
Modified: trunk/Build/source/utils/autosp/autosp-src/utils.c
===================================================================
--- trunk/Build/source/utils/autosp/autosp-src/utils.c 2020-02-06 20:54:06 UTC (rev 53701)
+++ trunk/Build/source/utils/autosp/autosp-src/utils.c 2020-02-06 23:02:45 UTC (rev 53702)
@@ -22,8 +22,52 @@
/* 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 */
{
Modified: trunk/Build/source/utils/autosp/autosp-src/utils.h
===================================================================
--- trunk/Build/source/utils/autosp/autosp-src/utils.h 2020-02-06 20:54:06 UTC (rev 53701)
+++ trunk/Build/source/utils/autosp/autosp-src/utils.h 2020-02-06 23:02:45 UTC (rev 53702)
@@ -61,6 +61,6 @@
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 */
Modified: trunk/Build/source/utils/autosp/configure
===================================================================
(Binary files differ)
Modified: trunk/Build/source/utils/autosp/configure.ac
===================================================================
--- trunk/Build/source/utils/autosp/configure.ac 2020-02-06 20:54:06 UTC (rev 53701)
+++ trunk/Build/source/utils/autosp/configure.ac 2020-02-06 23:02:45 UTC (rev 53702)
@@ -7,7 +7,7 @@
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 at tug.org])
AC_PREREQ([2.65])
AC_CONFIG_SRCDIR([autosp-src/autosp.c])
More information about the tex-live-commits
mailing list.