texlive[46645] Build/source/utils: autosp-2018-02-14
commits+kakuto at tug.org
commits+kakuto at tug.org
Thu Feb 15 00:28:20 CET 2018
Revision: 46645
http://tug.org/svn/texlive?view=revision&revision=46645
Author: kakuto
Date: 2018-02-15 00:28:20 +0100 (Thu, 15 Feb 2018)
Log Message:
-----------
autosp-2018-02-14
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.1
trunk/Build/source/utils/autosp/autosp-src/autosp.c
trunk/Build/source/utils/autosp/autosp-src/compile
trunk/Build/source/utils/autosp/autosp-src/configure
trunk/Build/source/utils/autosp/autosp-src/configure.ac
trunk/Build/source/utils/autosp/autosp-src/depcomp
trunk/Build/source/utils/autosp/autosp-src/tex2aspc.1
trunk/Build/source/utils/autosp/autosp-src/tex2aspc.test
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-14 22:48:28 UTC (rev 46644)
+++ trunk/Build/source/utils/README 2018-02-14 23:28:20 UTC (rev 46645)
@@ -10,7 +10,7 @@
see http://tug.org/texlive/build.html#asymptote
and tlpkg/bin/tl-update-asy
-autosp 2017-12-26 - checked 29dec17
+autosp 2018-02-14 - checked 14feb18
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-14 22:48:28 UTC (rev 46644)
+++ trunk/Build/source/utils/autosp/ChangeLog 2018-02-14 23:28:20 UTC (rev 46645)
@@ -1,3 +1,8 @@
+2018-02-14 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
+
+ * Import autosp-2018-02-14
+ configure.ac: Adapted.
+
2017-12-30 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
* Import autosp-2017-12-26
Modified: trunk/Build/source/utils/autosp/TLpatches/ChangeLog
===================================================================
--- trunk/Build/source/utils/autosp/TLpatches/ChangeLog 2018-02-14 22:48:28 UTC (rev 46644)
+++ trunk/Build/source/utils/autosp/TLpatches/ChangeLog 2018-02-14 23:28:20 UTC (rev 46645)
@@ -1,3 +1,8 @@
+2018-02-14 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
+
+ Import autosp-2018-02-14.
+ * patch-01-binary-write: Adapt.
+
2018-01-01 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
* Add patch-01-binary-write to avoid errors in test on
Modified: trunk/Build/source/utils/autosp/TLpatches/patch-01-binary-write
===================================================================
--- trunk/Build/source/utils/autosp/TLpatches/patch-01-binary-write 2018-02-14 22:48:28 UTC (rev 46644)
+++ trunk/Build/source/utils/autosp/TLpatches/patch-01-binary-write 2018-02-14 23:28:20 UTC (rev 46645)
@@ -1,7 +1,7 @@
-diff -ur autosp-2017-12-26.orig/autosp.c autosp-2017-12-26/autosp.c
---- autosp-2017-12-26.orig/autosp.c Fri Dec 22 23:28:50 2017
-+++ autosp-2017-12-26/autosp.c Mon Jan 01 09:04:08 2018
-@@ -511,7 +511,7 @@
+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
+@@ -510,7 +510,7 @@
update_global_skip (n);
/* commas will be discarded by filter_output (i) */
if (*s == '.' && new_beaming == 0 && !dottedbeamnotes)
@@ -10,7 +10,7 @@
else if ( (*s == '^' || *s == '_' || *s == '=' || *s == '>')
&& !vspacing_active[i] /* is additional spacing needed? */
)
-@@ -985,7 +985,7 @@
+@@ -984,7 +984,7 @@
|| prefix ("\\qbpp", s)
|| prefix ("\\dspp", s)
|| doubledotted )
@@ -19,7 +19,7 @@
else
if (prefix ("\\whp", s)
|| prefix ("\\hup", s)
-@@ -1009,7 +1009,7 @@
+@@ -1008,7 +1008,7 @@
|| prefix ("\\qbp", s)
|| prefix ("\\dsp", s)
|| dotted )
@@ -28,16 +28,16 @@
t = strpbrk (s+1, "{\\&|$"); /* collective coding? */
if (*t == '{') /* {...} */
-@@ -2176,7 +2176,7 @@
- printf ("\n");
- error ("outfile same as infile.");
- }
+@@ -2152,7 +2152,7 @@
+ }
+ else
+ {
- outfile = fopen (outfilename, "w");
+ outfile = fopen (outfilename, "wb");
if (outfile == NULL)
{ printf ("Can't open %s\n", outfilename);
exit (EXIT_FAILURE);
-@@ -2194,7 +2194,7 @@
+@@ -2170,7 +2170,7 @@
*logfilename_n = '\0';
append (logfilename, &logfilename_n, "alog", sizeof (logfilename));
if (debug)
@@ -46,10 +46,9 @@
if (logfile == NULL)
{ printf ("Can't open %s\n", logfilename);
exit (EXIT_FAILURE);
-Only in autosp-2017-12-26: config.h
-diff -ur autosp-2017-12-26.orig/rebar.c autosp-2017-12-26/rebar.c
---- autosp-2017-12-26.orig/rebar.c Thu Jun 15 03:08:12 2017
-+++ autosp-2017-12-26/rebar.c Mon Jan 01 09:04:08 2018
+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
@@ -262,7 +262,7 @@
else
append (outfilename, &outfilename_n, ".aspc", sizeof (outfilename));
@@ -59,9 +58,9 @@
if (outfile == NULL)
{ fprintf (stderr,"Can't open %s\n", outfilename);
exit (EXIT_FAILURE);
-diff -ur autosp-2017-12-26.orig/tex2aspc.c autosp-2017-12-26/tex2aspc.c
---- autosp-2017-12-26.orig/tex2aspc.c Sat Dec 16 00:04:13 2017
-+++ autosp-2017-12-26/tex2aspc.c Mon Jan 01 09:04:08 2018
+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
@@ -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-14 22:48:28 UTC (rev 46644)
+++ trunk/Build/source/utils/autosp/autosp-src/ChangeLog 2018-02-14 23:28:20 UTC (rev 46645)
@@ -1,5 +1,10 @@
AUTOSP
+2018-02-14
+
+ Allow for \end{...} in LaTeX-oriented inputs.
+ Processing of .tex files not supported; users can use tex2aspc.
+
2017-12-21
Allow for new commands \nqq, \nqqq, \hap and \happ.
Modified: trunk/Build/source/utils/autosp/autosp-src/README
===================================================================
--- trunk/Build/source/utils/autosp/autosp-src/README 2018-02-14 22:48:28 UTC (rev 46644)
+++ trunk/Build/source/utils/autosp/autosp-src/README 2018-02-14 23:28:20 UTC (rev 46645)
@@ -1,5 +1,5 @@
This is the README for the autosp package,
-version 2017-07-14.
+version 2018-02-14.
autosp is a preprocessor that generates note-spacing
commands for MusiXTeX scores. It simplifies the creation
@@ -119,13 +119,18 @@
\bar, \alaligne, etc. replacing any existing comments.
Bar-numbering in the MusiXTeX output is not affected
+Also included is the program tex2aspc which re-factors
+conventional MusiXTeX scores to aspc format suitable for
+autosp pre-processing by merging every conventional notes
+commands in a measure into a single \anotes command.
+
To install the autosp package, unzip autosp.tds.zip
at the root of a local or personal texmf tree and
update the file-name database. This will install
documentation and examples.
-On Windows or MacOSX, install the relevant binaries on the
-PATH of executables. On Unix-like systems, unpack the
+On Windows or MacOSX, install the relevant binaries on
+the PATH of executables. On Unix-like systems, unpack the
.tar.gz archive, and compile and install using the sequence
./configure && make && sudo make install
Modified: trunk/Build/source/utils/autosp/autosp-src/autosp.1
===================================================================
--- trunk/Build/source/utils/autosp/autosp-src/autosp.1 2018-02-14 22:48:28 UTC (rev 46644)
+++ trunk/Build/source/utils/autosp/autosp-src/autosp.1 2018-02-14 23:28:20 UTC (rev 46645)
@@ -1,5 +1,5 @@
.\" This manpage is licensed under the GNU Public License
-.TH AUTOSP 1 2017-12-19 "" ""
+.TH AUTOSP 1 2018-02-14 "" ""
.SH NAME
autosp \- preprocessor to generate note-spacing commands for MusiXTeX scores
@@ -14,13 +14,7 @@
.IR infile [\fR.aspc\fP]
.RI [ outfile [ \fR.tex\fP ]]
-.B autosp
-.RB [ \-d\ |\ \-\-dotted ]
-.RB [ \-l\ |\ \-\-log ]
-.IR infile \fR.tex\fP\
-.IR outfile [ \fR.tex\fP ]
-
This program makes it easier to create MusiXTeX scores by converting (non-standard) commands of the
form \\anotes ... \\en into one or more conventional
note-spacing commands (\\notes \\Notes \\NOtes ...),
@@ -48,30 +42,18 @@
\\anotes command generates several conventional
note-spacing commands.
-If the
-.I infile
-argument
-has .tex extension,
-.B 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 the
.I infile
argument
-has neither .aspc nor .tex extension, input is taken from
+does not have an .aspc extension, input is taken from
.IR infile .aspc
-if that file exists, or from
-.IR infile .tex
-otherwise.
+if that file exists.
+
If the
-input is from a file
-.IR infile .aspc
-and no
+.I outfile
+argument does not have a .tex extension, output is sent to
+.IR outfile .tex.
+If no
.I outfile
argument is provided, output will go to
.IR infile .tex
@@ -78,14 +60,9 @@
(or to
.IR infile .ltx
if a \\documentclass declaration is encountered).
-If the input is from a file
-.IR infile .tex,
-an
-.I outfile
-argument must be provided.
For
-\\anotes commands (and, for a .tex file, all conventional note-spacing commands),
+\\anotes commands,
line breaks and spaces may precede note segments, allowing more flexible source formatting;
the line breaks and spaces will be elided from the output.
Modified: trunk/Build/source/utils/autosp/autosp-src/autosp.c
===================================================================
--- trunk/Build/source/utils/autosp/autosp-src/autosp.c 2018-02-14 22:48:28 UTC (rev 46644)
+++ trunk/Build/source/utils/autosp/autosp-src/autosp.c 2018-02-14 23:28:20 UTC (rev 46645)
@@ -1,6 +1,6 @@
-char version[12] = "2017-12-22";
+char version[12] = "2018-01-17";
-/* Copyright (C) 2014-17 R. D. Tennent School of Computing,
+/* Copyright (C) 2014-18 R. D. Tennent School of Computing,
* Queen's University, rdt at cs.queensu.ca
*
* This program is free software; you can redistribute it
@@ -24,7 +24,7 @@
/* autosp - preprocessor to generate note-spacing commands for MusiXTeX scores */
/* Usage: autosp [-v | --version | -h | --help]
- * autosp [-d | --dotted] [-l | --log] infile[.aspc | .tex] [outfile[.tex]]
+ * autosp [-d | --dotted] [-l | --log] infile[.aspc] [outfile[.tex]]
*
* Options
* --dotted (-d) suppresses extra spacing for dotted beam notes.
@@ -178,7 +178,6 @@
PRIVATE int xtuplet[MAX_STAFFS]; /* x for xtuplet in staff i */
PRIVATE bool appoggiatura;
-PRIVATE bool fixnotes = false; /* process \Notes etc. like \anotes? */
PRIVATE bool dottedbeamnotes = false; /* dotted beam notes ignored? */
PRIVATE bool bar_rest[MAX_STAFFS];
@@ -1718,15 +1717,7 @@
}
}
- else if ( prefix("\\anotes", *ln)
- || (fixnotes &&
- ( prefix("\\nnnotes", *ln) ||
- prefix("\\nnotes", *ln) ||
- prefix("\\notes", *ln) ||
- prefix("\\Notes", *ln) ||
- prefix("\\NOtes", *ln) ||
- prefix("\\NOTes", *ln) ||
- prefix("\\NOTEs", *ln) ) ) )
+ else if ( prefix("\\anotes", *ln) )
{ if (debug)
{ fprintf (logfile, "\nProcessing %s", *ln);
fprintf (logfile, "lineno=%d\n", lineno);
@@ -1916,6 +1907,7 @@
|| prefix ("\\alapage", *ln)
|| prefix ("\\changecontext", *ln)
|| prefix ("\\Changecontext", *ln)
+ || prefix ("\\zchangecontext", *ln)
|| prefix ("\\zalaligne", *ln)
|| prefix ("\\zalapage", *ln) )
{ int i;
@@ -2011,7 +2003,8 @@
*ln = *ln + strlen(*ln);
}
- else if ( prefix ("\\end", *ln))
+ else if ( prefix ("\\end", *ln)
+ && !prefix ("\\end{", *ln) )
{
fprintf (outfile, "\\end\n");
exit(0);
@@ -2120,7 +2113,7 @@
infilename_n = infilename;
if (optind < argc)
{ append (infilename, &infilename_n, argv[optind], sizeof (infilename));
- if (!suffix (".tex", infilename) && !suffix (".aspc", infilename))
+ if (!suffix (".aspc", infilename))
append (infilename, &infilename_n, ".aspc", sizeof (infilename));
}
else
@@ -2128,24 +2121,12 @@
exit (EXIT_FAILURE);
}
infile = fopen (infilename, "r");
- if (infile == NULL && suffix (".tex", infilename) )
+ if (infile == NULL )
{ printf ("Can't open %s\n", infilename);
exit (EXIT_FAILURE);
}
- else if (infile == NULL && suffix (".aspc", infilename) )
- { /* try infile.tex */
- infilename_n -= 4;
- *infilename_n = '\0';
- append (infilename, &infilename_n, "tex", sizeof (infilename));
- infile = fopen (infilename, "r");
- if (infile == NULL && suffix (".tex", infilename) )
- { printf ("Can't open %s\n", infilename);
- exit (EXIT_FAILURE);
- }
- }
+
printf ("Reading from %s.", infilename);
- if (suffix (".tex", infilename) )
- fixnotes = true;
optind++;
outfilename[0] = '\0';
@@ -2171,11 +2152,6 @@
}
else
{
- if (strcmp (outfilename, infilename) == 0)
- {
- printf ("\n");
- error ("outfile same as infile.");
- }
outfile = fopen (outfilename, "wb");
if (outfile == NULL)
{ printf ("Can't open %s\n", outfilename);
Modified: trunk/Build/source/utils/autosp/autosp-src/compile
===================================================================
(Binary files differ)
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-14 22:48:28 UTC (rev 46644)
+++ trunk/Build/source/utils/autosp/autosp-src/configure.ac 2018-02-14 23:28:20 UTC (rev 46645)
@@ -1,5 +1,5 @@
AC_PREREQ(2.63)
-AC_INIT([autosp],[2017-12-26],[rdt at cs.queensu.ca])
+AC_INIT([autosp],[2018-02-14],[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/depcomp
===================================================================
(Binary files differ)
Modified: trunk/Build/source/utils/autosp/autosp-src/tex2aspc.1
===================================================================
--- trunk/Build/source/utils/autosp/autosp-src/tex2aspc.1 2018-02-14 22:48:28 UTC (rev 46644)
+++ trunk/Build/source/utils/autosp/autosp-src/tex2aspc.1 2018-02-14 23:28:20 UTC (rev 46645)
@@ -1,5 +1,5 @@
.\" This manpage is licensed under the GNU Public License
-.TH TEX2ASPC 1 2017-12-13 "" ""
+.TH TEX2ASPC 1 2018-02-14 "" ""
.SH NAME
@@ -18,14 +18,23 @@
This program re-factors (sequences of) conventional
note-spacing commands (\\notes \\Notes \\NOtes ...)
+in a measure
into
-\\anotes commands.
+a single \\anotes command.
This is intended for "legacy" scores in order to take advantage of
features
only provided by
.BR autosp (1),
-such as "global" skips.
+such as "global" skips and processing of \TransformNotes commands.
+.SH LIMITATIONS
+
+
+.B tex2aspc
+assumes that & and | (rather than \\nextinstrument and \\nextstaff) are used to separate instruments and staffs.
+
+User-defined macros are not processed or expanded.
+
.SH SEE ALSO
.BR autosp (1)
.PP
Modified: trunk/Build/source/utils/autosp/autosp-src/tex2aspc.test
===================================================================
--- trunk/Build/source/utils/autosp/autosp-src/tex2aspc.test 2018-02-14 22:48:28 UTC (rev 46644)
+++ trunk/Build/source/utils/autosp/autosp-src/tex2aspc.test 2018-02-14 23:28:20 UTC (rev 46645)
@@ -13,7 +13,7 @@
./tex2aspc && exit 1
echo && echo "*** tex2aspc quod2.tex quod4.aspc"
-cp tests/quod2.tex .
+cp tests/quod2.aspc .
rm -f quod4.aspc
./tex2aspc quod2.tex quod4.aspc || exit 1
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-14 22:48:28 UTC (rev 46644)
+++ trunk/Build/source/utils/autosp/configure.ac 2018-02-14 23:28:20 UTC (rev 46645)
@@ -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], [2017-12-26])[]dnl using unmodified autosp source
+m4_define([autosp_version], [2018-02-14])[]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