texlive[46726] Build/source/utils: autosp-2018-02-23
commits+kakuto at tug.org
commits+kakuto at tug.org
Sat Feb 24 00:21:59 CET 2018
Revision: 46726
http://tug.org/svn/texlive?view=revision&revision=46726
Author: kakuto
Date: 2018-02-24 00:21:58 +0100 (Sat, 24 Feb 2018)
Log Message:
-----------
autosp-2018-02-23
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/ChangeLog
trunk/Build/source/utils/autosp/autosp-src/README
trunk/Build/source/utils/autosp/autosp-src/autosp.c
trunk/Build/source/utils/autosp/autosp-src/autosp.test
trunk/Build/source/utils/autosp/autosp-src/configure
trunk/Build/source/utils/autosp/autosp-src/configure.ac
trunk/Build/source/utils/autosp/autosp-src/tests/quod2.tex
trunk/Build/source/utils/autosp/autosp-src/tests/quod4.aspc
trunk/Build/source/utils/autosp/autosp-src/tex2aspc.test
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 2018-02-23 22:10:03 UTC (rev 46725)
+++ trunk/Build/source/utils/README 2018-02-23 23:21:58 UTC (rev 46726)
@@ -10,7 +10,7 @@
see http://tug.org/texlive/build.html#asymptote
and tlpkg/bin/tl-update-asy
-autosp 2018-02-14 - checked 14feb18
+autosp 2018-02-23 - checked 23feb18
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 2018-02-23 22:10:03 UTC (rev 46725)
+++ trunk/Build/source/utils/autosp/ChangeLog 2018-02-23 23:21:58 UTC (rev 46726)
@@ -1,3 +1,8 @@
+2018-02-23 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
+
+ * Import autosp-2018-02-23.
+ configure.ac: Adapted.
+
2018-02-21 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
* tex2aspc.test: Fix a bug.
Modified: trunk/Build/source/utils/autosp/TLpatches/ChangeLog
===================================================================
--- trunk/Build/source/utils/autosp/TLpatches/ChangeLog 2018-02-23 22:10:03 UTC (rev 46725)
+++ trunk/Build/source/utils/autosp/TLpatches/ChangeLog 2018-02-23 23:21:58 UTC (rev 46726)
@@ -1,3 +1,8 @@
+2018-02-23 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
+
+ Import autosp-2018-02-23.
+ * patch-01-binary-write: Adapt.
+
2018-02-14 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
Import autosp-2018-02-14.
Modified: trunk/Build/source/utils/autosp/TLpatches/patch-01-binary-write
===================================================================
--- trunk/Build/source/utils/autosp/TLpatches/patch-01-binary-write 2018-02-23 22:10:03 UTC (rev 46725)
+++ trunk/Build/source/utils/autosp/TLpatches/patch-01-binary-write 2018-02-23 23:21:58 UTC (rev 46726)
@@ -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 @@
t = strpbrk (s+1, "{\\&|$"); /* collective coding? */
if (*t == '{') /* {...} */
-@@ -2152,7 +2152,7 @@
+@@ -2153,7 +2153,7 @@
}
else
{
@@ -37,7 +37,7 @@
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 @@
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 @@
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));
}
Modified: trunk/Build/source/utils/autosp/autosp-src/ChangeLog
===================================================================
--- trunk/Build/source/utils/autosp/autosp-src/ChangeLog 2018-02-23 22:10:03 UTC (rev 46725)
+++ trunk/Build/source/utils/autosp/autosp-src/ChangeLog 2018-02-23 23:21:58 UTC (rev 46726)
@@ -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.
Modified: trunk/Build/source/utils/autosp/autosp-src/README
===================================================================
--- trunk/Build/source/utils/autosp/autosp-src/README 2018-02-23 22:10:03 UTC (rev 46725)
+++ trunk/Build/source/utils/autosp/autosp-src/README 2018-02-23 23:21:58 UTC (rev 46726)
@@ -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 @@
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
Modified: trunk/Build/source/utils/autosp/autosp-src/autosp.c
===================================================================
--- trunk/Build/source/utils/autosp/autosp-src/autosp.c 2018-02-23 22:10:03 UTC (rev 46725)
+++ trunk/Build/source/utils/autosp/autosp-src/autosp.c 2018-02-23 23:21:58 UTC (rev 46726)
@@ -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 at cs.queensu.ca
@@ -2003,10 +2003,11 @@
*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 @@
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 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.test
===================================================================
--- trunk/Build/source/utils/autosp/autosp-src/autosp.test 2018-02-23 22:10:03 UTC (rev 46725)
+++ trunk/Build/source/utils/autosp/autosp-src/autosp.test 2018-02-23 23:21:58 UTC (rev 46726)
@@ -19,7 +19,7 @@
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
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 2018-02-23 22:10:03 UTC (rev 46725)
+++ trunk/Build/source/utils/autosp/autosp-src/configure.ac 2018-02-23 23:21:58 UTC (rev 46726)
@@ -1,5 +1,5 @@
AC_PREREQ(2.63)
-AC_INIT([autosp],[2018-02-14],[rdt at cs.queensu.ca])
+AC_INIT([autosp],[2018-02-23],[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/tests/quod2.tex
===================================================================
--- trunk/Build/source/utils/autosp/autosp-src/tests/quod2.tex 2018-02-23 22:10:03 UTC (rev 46725)
+++ trunk/Build/source/utils/autosp/autosp-src/tests/quod2.tex 2018-02-23 23:21:58 UTC (rev 46726)
@@ -1,4 +1,4 @@
-% Generated by autosp (2018-01-17).
+% Generated by autosp (2018-02-23).
\input musixtex
\input musixplt
\input soul.sty
Modified: trunk/Build/source/utils/autosp/autosp-src/tests/quod4.aspc
===================================================================
--- trunk/Build/source/utils/autosp/autosp-src/tests/quod4.aspc 2018-02-23 22:10:03 UTC (rev 46725)
+++ trunk/Build/source/utils/autosp/autosp-src/tests/quod4.aspc 2018-02-23 23:21:58 UTC (rev 46726)
@@ -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
Modified: trunk/Build/source/utils/autosp/autosp-src/tex2aspc.test
===================================================================
--- trunk/Build/source/utils/autosp/autosp-src/tex2aspc.test 2018-02-23 22:10:03 UTC (rev 46725)
+++ trunk/Build/source/utils/autosp/autosp-src/tex2aspc.test 2018-02-23 23:21:58 UTC (rev 46726)
@@ -1,5 +1,7 @@
#! /bin/sh -vx
+#! /bin/sh -vx
+
# Copyright 2018 Karl Berry <tex-live at tug.org>
# You may freely use, modify and/or distribute this file.
@@ -26,3 +28,4 @@
echo && echo "*** diff quod4.aspc tests/quod4.aspc"
diff quod4.aspc "$test_srcdir"/tests/quod4.aspc || exit 1
+
Modified: trunk/Build/source/utils/autosp/autosp-src/utils.h
===================================================================
--- trunk/Build/source/utils/autosp/autosp-src/utils.h 2018-02-23 22:10:03 UTC (rev 46725)
+++ trunk/Build/source/utils/autosp/autosp-src/utils.h 2018-02-23 23:21:58 UTC (rev 46726)
@@ -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 at cs.queensu.ca
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 2018-02-23 22:10:03 UTC (rev 46725)
+++ trunk/Build/source/utils/autosp/configure.ac 2018-02-23 23:21:58 UTC (rev 46726)
@@ -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], [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 at tug.org])
AC_PREREQ([2.65])
AC_CONFIG_SRCDIR([autosp-src/autosp.c])
More information about the tex-live-commits
mailing list