summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-03-11 22:02:29 +0000
committerKarl Berry <karl@freefriends.org>2020-03-11 22:02:29 +0000
commitbfdff7ccd9a9c4682ee8de04cec1fe70ffb5afad (patch)
tree1a3b57494dbb012e93c04667dbb14c761235734c
parent931ada5c58411ec0d56bfe9bb4b9e91700cde18f (diff)
autosp 2020-03-11
git-svn-id: svn://tug.org/texlive/trunk@54243 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/utils/autosp/TLpatches/ChangeLog5
-rw-r--r--Build/source/utils/autosp/TLpatches/patch-01-binary-write75
-rw-r--r--Build/source/utils/autosp/autosp-src/ChangeLog4
-rw-r--r--Build/source/utils/autosp/autosp-src/README2
-rw-r--r--Build/source/utils/autosp/autosp-src/autosp.c6
-rwxr-xr-xBuild/source/utils/autosp/autosp-src/configure20
-rw-r--r--Build/source/utils/autosp/autosp-src/configure.ac2
-rw-r--r--Build/source/utils/autosp/autosp-src/process_command.c13
-rw-r--r--Build/source/utils/autosp/autosp-src/rebar.c2
-rw-r--r--Build/source/utils/autosp/autosp-src/spacing_note.c6
-rw-r--r--Build/source/utils/autosp/autosp-src/tests/quod2.tex2
-rw-r--r--Build/source/utils/autosp/autosp-src/tex2aspc.c2
-rwxr-xr-xBuild/source/utils/autosp/configure20
-rw-r--r--Build/source/utils/autosp/configure.ac4
14 files changed, 53 insertions, 110 deletions
diff --git a/Build/source/utils/autosp/TLpatches/ChangeLog b/Build/source/utils/autosp/TLpatches/ChangeLog
index 8a5398e5f7e..7633baa33aa 100644
--- a/Build/source/utils/autosp/TLpatches/ChangeLog
+++ b/Build/source/utils/autosp/TLpatches/ChangeLog
@@ -1,3 +1,8 @@
+2020-03-11 Karl Berry <karl@tug.org>
+
+ Import autosp-2020-03-11.
+ * patch-01-binary-write: Remove, now upstream
+
2020-02-07 Akira Kakuto <kakuto@w32tex.org>
Import autosp-2020-02-06.
diff --git a/Build/source/utils/autosp/TLpatches/patch-01-binary-write b/Build/source/utils/autosp/TLpatches/patch-01-binary-write
deleted file mode 100644
index b5a2d57f5e1..00000000000
--- a/Build/source/utils/autosp/TLpatches/patch-01-binary-write
+++ /dev/null
@@ -1,75 +0,0 @@
-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
- {
-- outfile = fopen (outfilename, "w");
-+ outfile = fopen (outfilename, "wb");
- if (outfile == NULL)
- { printf ("Can't open %s\n", outfilename);
- exit (EXIT_FAILURE);
-@@ -239,7 +239,7 @@
- *logfilename_n = '\0';
- append (logfilename, &logfilename_n, "alog", sizeof (logfilename));
- if (debug)
-- { logfile = fopen (logfilename, "w");
-+ { logfile = fopen (logfilename, "wb");
- if (logfile == NULL)
- { printf ("Can't open %s\n", logfilename);
- exit (EXIT_FAILURE);
-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));
- }
-- outfile = fopen (outfilename, "w");
-+ outfile = fopen (outfilename, "wb");
- if (outfile == NULL)
- { fprintf (stderr,"Can't open %s\n", outfilename);
- exit (EXIT_FAILURE);
-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) */
- if (*s == '.' && new_beaming == 0 && !dottedbeamnotes)
-- spacing = spacing * 1.50;
-+ spacing = (int)(spacing * 1.50);
- else if ( (*s == '^' || *s == '_' || *s == '=' || *s == '>')
- && !vspacing_active[i] /* is additional spacing needed? */
- )
-@@ -532,7 +532,7 @@
- || prefix ("\\qbpp", s)
- || prefix ("\\dspp", s)
- || doubledotted )
-- { spacing *= 1.75; doubledotted = false;}
-+ { spacing = (int)(spacing * 1.75); doubledotted = false;}
- else
- if (prefix ("\\whp", s)
- || prefix ("\\hup", s)
-@@ -556,7 +556,7 @@
- || prefix ("\\qbp", s)
- || prefix ("\\dsp", s)
- || dotted )
-- { spacing *= 1.5; dotted = false; }
-+ { spacing = (int)(spacing * 1.5); dotted = false; }
-
- t = strpbrk (s+1, "{\\&|$"); /* collective coding? */
- if (*t == '{') /* {...} */
-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));
- }
-
-- outfile = fopen (outfilename, "w");
-+ outfile = fopen (outfilename, "wb");
- if (outfile == NULL)
- { printf ("Can't open %s\n", outfilename);
- exit (EXIT_FAILURE);
diff --git a/Build/source/utils/autosp/autosp-src/ChangeLog b/Build/source/utils/autosp/autosp-src/ChangeLog
index 6c6367ccd34..722b2741e5f 100644
--- a/Build/source/utils/autosp/autosp-src/ChangeLog
+++ b/Build/source/utils/autosp/autosp-src/ChangeLog
@@ -1,5 +1,9 @@
AUTOSP
+2020-02-09
+
+ correct \Cpause handling at \alaligne when \TransformNotes is used
+
2019-12-22
correct \setsize note scaling using instr_numsize in generate_notes
diff --git a/Build/source/utils/autosp/autosp-src/README b/Build/source/utils/autosp/autosp-src/README
index 779d7a94459..c71416bf4c3 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-12-22.
+version 2020-02-06.
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.c b/Build/source/utils/autosp/autosp-src/autosp.c
index 77add3b53d5..c2606923eed 100644
--- a/Build/source/utils/autosp/autosp-src/autosp.c
+++ b/Build/source/utils/autosp/autosp-src/autosp.c
@@ -1,4 +1,4 @@
-char version[12] = "2020-02-06";
+char version[12] = "2020-03-11";
/* Copyright (C) 2014-20 R. D. Tennent School of Computing,
* Queen's University, rdt@cs.queensu.ca
@@ -221,7 +221,7 @@ int main (int argc, char *argv[])
}
else
{
- outfile = fopen (outfilename, "wb");
+ outfile = fopen (outfilename, "w");
if (outfile == NULL)
{ printf ("Can't open %s\n", outfilename);
exit (EXIT_FAILURE);
@@ -239,7 +239,7 @@ int main (int argc, char *argv[])
*logfilename_n = '\0';
append (logfilename, &logfilename_n, "alog", sizeof (logfilename));
if (debug)
- { logfile = fopen (logfilename, "wb");
+ { logfile = fopen (logfilename, "w");
if (logfile == NULL)
{ printf ("Can't open %s\n", logfilename);
exit (EXIT_FAILURE);
diff --git a/Build/source/utils/autosp/autosp-src/configure b/Build/source/utils/autosp/autosp-src/configure
index 470284c32b4..678659f85ca 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 2020-02-06.
+# Generated by GNU Autoconf 2.69 for autosp 2020-03-11.
#
# Report bugs to <rdt@cs.queensu.ca>.
#
@@ -580,8 +580,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='autosp'
PACKAGE_TARNAME='autosp'
-PACKAGE_VERSION='2020-02-06'
-PACKAGE_STRING='autosp 2020-02-06'
+PACKAGE_VERSION='2020-03-11'
+PACKAGE_STRING='autosp 2020-03-11'
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 2020-02-06 to adapt to many kinds of systems.
+\`configure' configures autosp 2020-03-11 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 2020-02-06:";;
+ short | recursive ) echo "Configuration of autosp 2020-03-11:";;
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 2020-02-06
+autosp configure 2020-03-11
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 2020-02-06, which was
+It was created by autosp $as_me 2020-03-11, 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='2020-02-06'
+ VERSION='2020-03-11'
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 2020-02-06, which was
+This file was extended by autosp $as_me 2020-03-11, 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 2020-02-06
+autosp config.status 2020-03-11
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 ae531df3441..bee28d2fc08 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],[2020-02-06],[rdt@cs.queensu.ca])
+AC_INIT([autosp],[2020-03-11],[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 154ac17eadc..29af63c3c13 100644
--- a/Build/source/utils/autosp/autosp-src/process_command.c
+++ b/Build/source/utils/autosp/autosp-src/process_command.c
@@ -1009,15 +1009,24 @@ void process_command (char **ln)
else if (atnextbar)
{
fprintf (outfile, "\\def\\atnextbar{\\znotes");
- for (i=1; i <= nstaffs; i++)
+ t = TransformNotes2;
+ while (true)
{
+ s = strchr (t, '#');
+ if (s == NULL)
+ break;
+ while (t < s) /* output any initial \transpose etc. */
+ { putc (*t, outfile); t++; }
+ t++; /* skip # */
+ i = atoi (t) -1; t++;
if (active[i])
{
if (bar_rest[i])
fprintf (outfile, "\\centerpause");
bar_rest[i] = false;
}
- if ( terminator[i] != '$') putc (terminator[i], outfile);
+ if (*t != '\0')
+ { putc (*t, outfile); t++; } /* terminator */
}
fprintf (outfile, "\\en}%%\n");
if (Changeclefs) /* \Changeclefs has to be output after \def\atnextbar... */
diff --git a/Build/source/utils/autosp/autosp-src/rebar.c b/Build/source/utils/autosp/autosp-src/rebar.c
index cd1f78520d3..2e625570116 100644
--- a/Build/source/utils/autosp/autosp-src/rebar.c
+++ b/Build/source/utils/autosp/autosp-src/rebar.c
@@ -264,7 +264,7 @@ main (int argc, char *argv[])
else
append (outfilename, &outfilename_n, ".aspc", sizeof (outfilename));
}
- outfile = fopen (outfilename, "wb");
+ outfile = fopen (outfilename, "w");
if (outfile == NULL)
{ fprintf (stderr,"Can't open %s\n", outfilename);
exit (EXIT_FAILURE);
diff --git a/Build/source/utils/autosp/autosp-src/spacing_note.c b/Build/source/utils/autosp/autosp-src/spacing_note.c
index 631ff1ba5ba..eaa377538fd 100644
--- a/Build/source/utils/autosp/autosp-src/spacing_note.c
+++ b/Build/source/utils/autosp/autosp-src/spacing_note.c
@@ -30,7 +30,7 @@ int collective_note (int i)
update_global_skip (n);
/* commas will be discarded by filter_output (i) */
if (*s == '.' && new_beaming == 0 && !dottedbeamnotes)
- spacing = (int)(spacing * 1.50);
+ spacing = spacing * 1.50;
else if ( (*s == '^' || *s == '_' || *s == '=' || *s == '>')
&& !vspacing_active[i] /* is additional spacing needed? */
)
@@ -532,7 +532,7 @@ int spacing_note (int i)
|| prefix ("\\qbpp", s)
|| prefix ("\\dspp", s)
|| doubledotted )
- { spacing = (int)(spacing * 1.75); doubledotted = false;}
+ { spacing *= 1.75; doubledotted = false;}
else
if (prefix ("\\whp", s)
|| prefix ("\\hup", s)
@@ -556,7 +556,7 @@ int spacing_note (int i)
|| prefix ("\\qbp", s)
|| prefix ("\\dsp", s)
|| dotted )
- { spacing = (int)(spacing * 1.5); dotted = false; }
+ { spacing *= 1.5; dotted = false; }
t = strpbrk (s+1, "{\\&|$"); /* collective coding? */
if (*t == '{') /* {...} */
diff --git a/Build/source/utils/autosp/autosp-src/tests/quod2.tex b/Build/source/utils/autosp/autosp-src/tests/quod2.tex
index 0bd05c040cd..e3006d56194 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 (2020-02-06).
+% Generated by autosp (2020-03-11).
\input musixtex
\input musixplt
\input soul.sty
diff --git a/Build/source/utils/autosp/autosp-src/tex2aspc.c b/Build/source/utils/autosp/autosp-src/tex2aspc.c
index 23fd0907641..d5ba3ff6a86 100644
--- a/Build/source/utils/autosp/autosp-src/tex2aspc.c
+++ b/Build/source/utils/autosp/autosp-src/tex2aspc.c
@@ -342,7 +342,7 @@ int main (int argc, char *argv[])
append (outfilename, &outfilename_n, ".aspc", sizeof (outfilename));
}
- outfile = fopen (outfilename, "wb");
+ outfile = fopen (outfilename, "w");
if (outfile == NULL)
{ printf ("Can't open %s\n", outfilename);
exit (EXIT_FAILURE);
diff --git a/Build/source/utils/autosp/configure b/Build/source/utils/autosp/configure
index 4dae76dad5a..2018c6a525f 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) 2020-02-06.
+# Generated by GNU Autoconf 2.69 for autosp (TeX Live) 2020-03-11.
#
# 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='2020-02-06'
-PACKAGE_STRING='autosp (TeX Live) 2020-02-06'
+PACKAGE_VERSION='2020-03-11'
+PACKAGE_STRING='autosp (TeX Live) 2020-03-11'
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) 2020-02-06 to adapt to many kinds of systems.
+\`configure' configures autosp (TeX Live) 2020-03-11 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) 2020-02-06:";;
+ short | recursive ) echo "Configuration of autosp (TeX Live) 2020-03-11:";;
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 2020-02-06
+autosp (TeX Live) configure 2020-03-11
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 2020-02-06, which was
+It was created by autosp (TeX Live) $as_me 2020-03-11, 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='2020-02-06'
+ VERSION='2020-03-11'
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 2020-02-06, which was
+This file was extended by autosp (TeX Live) $as_me 2020-03-11, 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 2020-02-06
+autosp (TeX Live) config.status 2020-03-11
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 9dc68c7d5bf..17252e2bfea 100644
--- a/Build/source/utils/autosp/configure.ac
+++ b/Build/source/utils/autosp/configure.ac
@@ -1,13 +1,13 @@
dnl $Id$
dnl Process this file with autoconf to produce a configure script.
dnl
-dnl Copyright 2016-2018 Karl Berry <tex-live@tug.org>
+dnl Copyright 2016-2020 Karl Berry <tex-live@tug.org>
dnl
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], [2020-02-06])[]dnl using unmodified autosp source
+m4_define([autosp_version], [2020-03-11])[]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])