From f35134ae9f4e96ecca9a295630496ca5e6b613be Mon Sep 17 00:00:00 2001 From: Akira Kakuto Date: Fri, 23 Feb 2018 23:21:58 +0000 Subject: autosp-2018-02-23 git-svn-id: svn://tug.org/texlive/trunk@46726 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/utils/autosp/ChangeLog | 5 +++++ Build/source/utils/autosp/TLpatches/ChangeLog | 5 +++++ .../utils/autosp/TLpatches/patch-01-binary-write | 22 +++++++++++----------- Build/source/utils/autosp/autosp-src/ChangeLog | 5 +++++ Build/source/utils/autosp/autosp-src/README | 9 +-------- Build/source/utils/autosp/autosp-src/autosp.c | 11 ++++++----- Build/source/utils/autosp/autosp-src/autosp.test | 2 +- Build/source/utils/autosp/autosp-src/configure | 20 ++++++++++---------- Build/source/utils/autosp/autosp-src/configure.ac | 2 +- .../source/utils/autosp/autosp-src/tests/quod2.tex | 2 +- .../utils/autosp/autosp-src/tests/quod4.aspc | 2 +- Build/source/utils/autosp/autosp-src/tex2aspc.test | 3 +++ Build/source/utils/autosp/autosp-src/utils.h | 2 +- Build/source/utils/autosp/configure | 20 ++++++++++---------- Build/source/utils/autosp/configure.ac | 2 +- 15 files changed, 62 insertions(+), 50 deletions(-) (limited to 'Build/source/utils/autosp') diff --git a/Build/source/utils/autosp/ChangeLog b/Build/source/utils/autosp/ChangeLog index 5120a1c2117..1e148d6ef5b 100644 --- a/Build/source/utils/autosp/ChangeLog +++ b/Build/source/utils/autosp/ChangeLog @@ -1,3 +1,8 @@ +2018-02-23 Akira Kakuto + + * Import autosp-2018-02-23. + configure.ac: Adapted. + 2018-02-21 Akira Kakuto * tex2aspc.test: Fix a bug. diff --git a/Build/source/utils/autosp/TLpatches/ChangeLog b/Build/source/utils/autosp/TLpatches/ChangeLog index a7dc56b8e04..c95ddf7fac0 100644 --- a/Build/source/utils/autosp/TLpatches/ChangeLog +++ b/Build/source/utils/autosp/TLpatches/ChangeLog @@ -1,3 +1,8 @@ +2018-02-23 Akira Kakuto + + Import autosp-2018-02-23. + * patch-01-binary-write: Adapt. + 2018-02-14 Akira Kakuto Import autosp-2018-02-14. diff --git a/Build/source/utils/autosp/TLpatches/patch-01-binary-write b/Build/source/utils/autosp/TLpatches/patch-01-binary-write index f07fe67ff14..ebe4b6c554b 100644 --- a/Build/source/utils/autosp/TLpatches/patch-01-binary-write +++ b/Build/source/utils/autosp/TLpatches/patch-01-binary-write @@ -1,6 +1,6 @@ -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 +diff -ur autosp-2018-02-23/autosp.c autosp-src/autosp.c +--- autosp-2018-02-23/autosp.c Fri Feb 23 23:55:07 2018 ++++ autosp-src/autosp.c Sat Feb 24 08:07:57 2018 @@ -510,7 +510,7 @@ update_global_skip (n); /* commas will be discarded by filter_output (i) */ @@ -28,7 +28,7 @@ diff -ur autosp-2018-02-14/autosp.c autosp-src/autosp.c t = strpbrk (s+1, "{\\&|$"); /* collective coding? */ if (*t == '{') /* {...} */ -@@ -2152,7 +2152,7 @@ +@@ -2153,7 +2153,7 @@ } else { @@ -37,7 +37,7 @@ diff -ur autosp-2018-02-14/autosp.c autosp-src/autosp.c if (outfile == NULL) { printf ("Can't open %s\n", outfilename); exit (EXIT_FAILURE); -@@ -2170,7 +2170,7 @@ +@@ -2171,7 +2171,7 @@ *logfilename_n = '\0'; append (logfilename, &logfilename_n, "alog", sizeof (logfilename)); if (debug) @@ -46,9 +46,9 @@ diff -ur autosp-2018-02-14/autosp.c autosp-src/autosp.c if (logfile == NULL) { printf ("Can't open %s\n", logfilename); exit (EXIT_FAILURE); -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 +diff -ur autosp-2018-02-23/rebar.c autosp-src/rebar.c +--- autosp-2018-02-23/rebar.c Thu Jun 15 03:08:12 2017 ++++ autosp-src/rebar.c Sat Feb 24 08:08:27 2018 @@ -262,7 +262,7 @@ else append (outfilename, &outfilename_n, ".aspc", sizeof (outfilename)); @@ -58,9 +58,9 @@ diff -ur autosp-2018-02-14/rebar.c autosp-src/rebar.c if (outfile == NULL) { fprintf (stderr,"Can't open %s\n", outfilename); exit (EXIT_FAILURE); -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 +diff -ur autosp-2018-02-23/tex2aspc.c autosp-src/tex2aspc.c +--- autosp-2018-02-23/tex2aspc.c Sat Dec 16 00:04:13 2017 ++++ autosp-src/tex2aspc.c Sat Feb 24 08:08:55 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 c3bf343787a..79aa95597a2 100644 --- a/Build/source/utils/autosp/autosp-src/ChangeLog +++ b/Build/source/utils/autosp/autosp-src/ChangeLog @@ -1,5 +1,10 @@ AUTOSP +2018-02-23 + + Avoid aborting for \endvolta... + Fix version output. + 2018-02-14 Allow for \end{...} in LaTeX-oriented inputs. diff --git a/Build/source/utils/autosp/autosp-src/README b/Build/source/utils/autosp/autosp-src/README index 32cdc77ed78..ea1b5218811 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 2018-02-14. +version 2018-02-23. autosp is a preprocessor that generates note-spacing commands for MusiXTeX scores. It simplifies the creation @@ -25,13 +25,6 @@ precede note segments, allowing more flexible source formatting; the line breaks and spaces will be elided from the output. -If applied to a file with .tex extension, 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 there is a single staff, consecutive whole-bar rest bars are merged into a multi-bar rest. Bar-centered rests can be coded using the standard \def\atnextbar notation but also diff --git a/Build/source/utils/autosp/autosp-src/autosp.c b/Build/source/utils/autosp/autosp-src/autosp.c index ed0d27327aa..4e9773e85d2 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] = "2018-01-17"; +char version[12] = "2018-02-23"; /* Copyright (C) 2014-18 R. D. Tennent School of Computing, * Queen's University, rdt@cs.queensu.ca @@ -2003,10 +2003,11 @@ void process_command (char **ln) *ln = *ln + strlen(*ln); } - else if ( prefix ("\\end", *ln) - && !prefix ("\\end{", *ln) ) + else if ( prefix ("\\end ", *ln) + || prefix ("\\end%", *ln) + || prefix ("\\end{document}", *ln) ) { - fprintf (outfile, "\\end\n"); + fprintf (outfile, *ln); exit(0); } @@ -2077,7 +2078,7 @@ int main (int argc, char *argv[]) time (&mytime); strftime (today, 11, "%Y-%m-%d", localtime (&mytime) ); printf ("This is autosp, version %s.\n", version); - printf ("Copyright (C) 2014-17 R. D. Tennent\n" ); + printf ("Copyright (C) 2014-18 R. D. Tennent\n" ); printf ("School of Computing, Queen's University, rdt@cs.queensu.ca\n" ); printf ("License GNU GPL version 2 or later .\n" ); printf ("There is NO WARRANTY, to the extent permitted by law.\n\n" ); diff --git a/Build/source/utils/autosp/autosp-src/autosp.test b/Build/source/utils/autosp/autosp-src/autosp.test index 07d7e8c2a12..7045194c46d 100755 --- a/Build/source/utils/autosp/autosp-src/autosp.test +++ b/Build/source/utils/autosp/autosp-src/autosp.test @@ -19,7 +19,7 @@ echo && echo "*** autosp --version" echo && echo "*** autosp -dd (missing infile)" ./autosp -dd && exit 1 -echo && echo "*** autosp tests/quod2.aspc quod2.aspc" +echo && echo "*** autosp tests/quod2.aspc quod2.tex" cp $test_srcdir/tests/quod2.aspc . rm -f quod2.tex ./autosp quod2.aspc || exit 1 diff --git a/Build/source/utils/autosp/autosp-src/configure b/Build/source/utils/autosp/autosp-src/configure index 31f2922de58..182a6b718ac 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 2018-02-14. +# Generated by GNU Autoconf 2.69 for autosp 2018-02-23. # # Report bugs to . # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='autosp' PACKAGE_TARNAME='autosp' -PACKAGE_VERSION='2018-02-14' -PACKAGE_STRING='autosp 2018-02-14' +PACKAGE_VERSION='2018-02-23' +PACKAGE_STRING='autosp 2018-02-23' 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 2018-02-14 to adapt to many kinds of systems. +\`configure' configures autosp 2018-02-23 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 2018-02-14:";; + short | recursive ) echo "Configuration of autosp 2018-02-23:";; 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 2018-02-14 +autosp configure 2018-02-23 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 2018-02-14, which was +It was created by autosp $as_me 2018-02-23, 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='2018-02-14' + VERSION='2018-02-23' 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 2018-02-14, which was +This file was extended by autosp $as_me 2018-02-23, 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 2018-02-14 +autosp config.status 2018-02-23 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 57d151f9f9b..0b7a9adf82d 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],[2018-02-14],[rdt@cs.queensu.ca]) +AC_INIT([autosp],[2018-02-23],[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/tests/quod2.tex b/Build/source/utils/autosp/autosp-src/tests/quod2.tex index 77dba9d1ef1..775ae9ee1a5 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 (2018-01-17). +% Generated by autosp (2018-02-23). \input musixtex \input musixplt \input soul.sty diff --git a/Build/source/utils/autosp/autosp-src/tests/quod4.aspc b/Build/source/utils/autosp/autosp-src/tests/quod4.aspc index 700d1660de9..7dbfa3c3afb 100644 --- a/Build/source/utils/autosp/autosp-src/tests/quod4.aspc +++ b/Build/source/utils/autosp/autosp-src/tests/quod4.aspc @@ -1,5 +1,5 @@ % Generated by tex2aspc (2017-12-15). -% Generated by autosp (2018-01-17). +% Generated by autosp (2018-02-23). \input musixtex \input musixplt \input soul.sty diff --git a/Build/source/utils/autosp/autosp-src/tex2aspc.test b/Build/source/utils/autosp/autosp-src/tex2aspc.test index 6ed04eb631b..76f28272cd4 100755 --- a/Build/source/utils/autosp/autosp-src/tex2aspc.test +++ b/Build/source/utils/autosp/autosp-src/tex2aspc.test @@ -1,5 +1,7 @@ #! /bin/sh -vx +#! /bin/sh -vx + # Copyright 2018 Karl Berry # You may freely use, modify and/or distribute this file. @@ -26,3 +28,4 @@ rm -f quod4.aspc echo && echo "*** diff quod4.aspc tests/quod4.aspc" diff quod4.aspc "$test_srcdir"/tests/quod4.aspc || exit 1 + diff --git a/Build/source/utils/autosp/autosp-src/utils.h b/Build/source/utils/autosp/autosp-src/utils.h index a6a728d6182..1bcb884b889 100644 --- a/Build/source/utils/autosp/autosp-src/utils.h +++ b/Build/source/utils/autosp/autosp-src/utils.h @@ -1,6 +1,6 @@ /* - utils.h -- header file for fixmsxpart.c and msxlint.c + utils.h -- header file for autosp, rebar and tex2aspc Copyright (c) 2005-15 R. D. Tennent School of Computing, Queen's University, rdt@cs.queensu.ca diff --git a/Build/source/utils/autosp/configure b/Build/source/utils/autosp/configure index d4228a2b0af..2f68680b017 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) 2018-02-14. +# Generated by GNU Autoconf 2.69 for autosp (TeX Live) 2018-02-23. # # Report bugs to . # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='autosp (TeX Live)' PACKAGE_TARNAME='autosp--tex-live-' -PACKAGE_VERSION='2018-02-14' -PACKAGE_STRING='autosp (TeX Live) 2018-02-14' +PACKAGE_VERSION='2018-02-23' +PACKAGE_STRING='autosp (TeX Live) 2018-02-23' 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) 2018-02-14 to adapt to many kinds of systems. +\`configure' configures autosp (TeX Live) 2018-02-23 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) 2018-02-14:";; + short | recursive ) echo "Configuration of autosp (TeX Live) 2018-02-23:";; 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 2018-02-14 +autosp (TeX Live) configure 2018-02-23 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 2018-02-14, which was +It was created by autosp (TeX Live) $as_me 2018-02-23, 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='2018-02-14' + VERSION='2018-02-23' 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 2018-02-14, which was +This file was extended by autosp (TeX Live) $as_me 2018-02-23, 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 2018-02-14 +autosp (TeX Live) config.status 2018-02-23 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 0269ca94de4..9cfac8c5a56 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], [2018-02-14])[]dnl using unmodified autosp source +m4_define([autosp_version], [2018-02-23])[]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]) -- cgit v1.2.3