texlive[43363] Build/source/utils: autosp 2016-11-02
commits+kakuto at tug.org
commits+kakuto at tug.org
Wed Mar 1 00:06:34 CET 2017
Revision: 43363
http://tug.org/svn/texlive?view=revision&revision=43363
Author: kakuto
Date: 2017-03-01 00:06:34 +0100 (Wed, 01 Mar 2017)
Log Message:
-----------
autosp 2016-11-02
Modified Paths:
--------------
trunk/Build/source/utils/README
trunk/Build/source/utils/autosp/ChangeLog
trunk/Build/source/utils/autosp/autosp-src/ChangeLog
trunk/Build/source/utils/autosp/autosp-src/Makefile.in
trunk/Build/source/utils/autosp/autosp-src/README
trunk/Build/source/utils/autosp/autosp-src/aclocal.m4
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/config.h.in
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/tests/quod2.tex
trunk/Build/source/utils/autosp/configure
trunk/Build/source/utils/autosp/configure.ac
Modified: trunk/Build/source/utils/README
===================================================================
--- trunk/Build/source/utils/README 2017-02-28 21:57:26 UTC (rev 43362)
+++ trunk/Build/source/utils/README 2017-02-28 23:06:34 UTC (rev 43363)
@@ -11,9 +11,9 @@
see http://tug.org/texlive/build.html#asymptote
and tlpkg/bin/tl-update-asy
-autosp 2016-01-30 - checked 7mar16
+autosp 2016-11-02 - checked 28feb17
http://ctan.org/pkg/autosp
-
+
devnag - from devanagari package installed in texmf-dist.
lacheck - maintained here, by us
Modified: trunk/Build/source/utils/autosp/ChangeLog
===================================================================
--- trunk/Build/source/utils/autosp/ChangeLog 2017-02-28 21:57:26 UTC (rev 43362)
+++ trunk/Build/source/utils/autosp/ChangeLog 2017-02-28 23:06:34 UTC (rev 43363)
@@ -1,7 +1,12 @@
+2017-02-28 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
+
+ * Import autosp-2016-11-02.
+ configure.ac: Adapted.
+
2016-03-07 Karl Berry <karl at tug.org>
* Initial import of autosp-2016-01-30 to TL.
-Copyright 2016 Karl Berry <tex-live at tug.org>
+Copyright 2016-2017 Karl Berry <tex-live at tug.org>
You may freely use, modify and/or distribute this file.
Modified: trunk/Build/source/utils/autosp/autosp-src/ChangeLog
===================================================================
--- trunk/Build/source/utils/autosp/autosp-src/ChangeLog 2017-02-28 21:57:26 UTC (rev 43362)
+++ trunk/Build/source/utils/autosp/autosp-src/ChangeLog 2017-02-28 23:06:34 UTC (rev 43363)
@@ -1,5 +1,24 @@
AUTOSP
+2016-11-02
+
+ support xtuples in more than one staff (provided x and note durations are
+ consistent)
+
+2016-10-26
+
+ \ptr distinguished from \pt
+
+2016-10-20
+
+ BARREST_SPACING replaced by MAX_SPACING
+
+2016-03-02
+
+ Process \rlap{...} as non-spacing.
+ Process numeric notes in collective coding.
+ Process transposition characters ('`!) after a collective note.
+
2016-01-30
Correct coding for \tqq and \tqqq.
@@ -6,8 +25,7 @@
ps(0) outputs "0" rather than "MAX_SPACING"
Allow for \wq.
Defer \Changeclefs until after \def\atnextbar ...
- Corrected bracketing for 8 and 9-bar rests.
- Modern noatation for multi-bar rests.
+ Modern notation for multi-bar rests.
Initial output to stdout.
2015-07-23
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 2017-02-28 21:57:26 UTC (rev 43362)
+++ trunk/Build/source/utils/autosp/autosp-src/README 2017-02-28 23:06:34 UTC (rev 43363)
@@ -1,5 +1,5 @@
This is the README for the autosp package,
-version 2016-01-30.
+version 2016-11-02.
autosp is a preprocessor that generates note-spacing
commands for MusiXTeX scores. It simplifies the creation
Modified: trunk/Build/source/utils/autosp/autosp-src/aclocal.m4
===================================================================
--- trunk/Build/source/utils/autosp/autosp-src/aclocal.m4 2017-02-28 21:57:26 UTC (rev 43362)
+++ trunk/Build/source/utils/autosp/autosp-src/aclocal.m4 2017-02-28 23:06:34 UTC (rev 43363)
@@ -13,8 +13,8 @@
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],,
-[m4_warning([this file was generated for autoconf 2.63.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
+[m4_warning([this file was generated for autoconf 2.69.
You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically `autoreconf'.])])
Modified: trunk/Build/source/utils/autosp/autosp-src/autosp.1
===================================================================
--- trunk/Build/source/utils/autosp/autosp-src/autosp.1 2017-02-28 21:57:26 UTC (rev 43362)
+++ trunk/Build/source/utils/autosp/autosp-src/autosp.1 2017-02-28 23:06:34 UTC (rev 43363)
@@ -1,5 +1,5 @@
.\" This manpage is licensed under the GNU Public License
-.TH AUTOSP 1 2016-01-30 "" ""
+.TH AUTOSP 1 2016-10-31 "" ""
.SH NAME
autosp \- preprocessor to generate note-spacing commands for MusiXTeX scores
@@ -199,7 +199,7 @@
(\fIx\fP\-1)/\fIx\fP
of the apparent x-tuplet duration.
So, for example, a triplet in eighths is assumed to be played in the time of one quarter note.
-If these assumptions
+If this assumption
isn't valid, the x-tuplet must
be coded explicitly using a \\vnotes command; see the first
measure of barsant2.aspc for an example of a non-standard x-tuplet: a 5-tuple
@@ -207,8 +207,10 @@
of
.I six
64ths.
+.B autosp
+cannot deal with simultaneous x-tuplets in multiple staffs unless the x values and
+note durations are identical.
-
User-defined macros are not processed or expanded.
All staffs are assumed to have the same meter; see kinder2.aspc for
@@ -215,8 +217,9 @@
an example of how to work around this.
.B autosp
-will not be effective for music with more than one voice in a single staff. It might be
-advisable to use a separate staff for each voice, or to omit certain voices
+may not be effective for music with more than one voice in a single staff. It might be
+advisable to use a separate staff for each voice, to avoid \\anotes when necessary,
+or to omit certain voices
initially and add them into the resulting TeX file.
.SH EXAMPLES
Modified: trunk/Build/source/utils/autosp/autosp-src/autosp.c
===================================================================
--- trunk/Build/source/utils/autosp/autosp-src/autosp.c 2017-02-28 21:57:26 UTC (rev 43362)
+++ trunk/Build/source/utils/autosp/autosp-src/autosp.c 2017-02-28 23:06:34 UTC (rev 43363)
@@ -1,4 +1,4 @@
-char version[12] = "2016-01-30";
+char version[12] = "2016-11-02";
/* Copyright (C) 2014-16 R. D. Tennent School of Computing,
* Queen's University, rdt at cs.queensu.ca
@@ -99,12 +99,11 @@
# define SHORT_LEN 256
# define MAX_STAFFS 9
-# define SMALL_NOTE 256
+# 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)
# define APPOGG_SPACING SP(64)+SP(256) /* not a legitimate spacing */
-# define BARREST_SPACING SP(1)+SP(2)+SP(16) /* not a legitimate spacing */
# define notespp "\\vnotes2.95\\elemskip"
# define Notespp "\\vnotes3.95\\elemskip"
# define NOtespp "\\vnotes4.95\\elemskip"
@@ -112,7 +111,7 @@
# define NOTEsp "\\vnotes9.52\\elemskip"
# define APPOGG_NOTES "\\vnotes1.45\\elemskip"
-PRIVATE bool debug = false;
+PRIVATE bool debug = true;
PRIVATE char infilename[SHORT_LEN];
PRIVATE char *infilename_n = infilename;
PRIVATE char outfilename[SHORT_LEN];
@@ -164,8 +163,7 @@
PRIVATE char collectivei[SHORT_LEN];
PRIVATE bool first_collectivei;
-PRIVATE int xtuplet; /* x for xtuplet */
-PRIVATE int xi; /* xi'th staff is the xtuplet staff */
+PRIVATE int xtuplet[MAX_STAFFS]; /* x for xtuplet in staff i */
PRIVATE bool appoggiatura;
PRIVATE bool fixnotes = false; /* process \Notes etc. like \anotes? */
@@ -189,7 +187,9 @@
char *ps(int spacing)
/* convert spacing value to note value(s) */
{ char *s = malloc(SHORT_LEN);
- char *s_n = s;
+ char *s_n;
+ if (s == NULL) error ("Not enough memory");
+ s_n = s;
*s = '\0';
if (spacing == MAX_SPACING)
sprintf(s, "MAX_SPACING");
@@ -230,6 +230,9 @@
fprintf (logfile, "spacings[%d]=%s\n", i, ps(spacings[i]));
fprintf (logfile, "vspacing[%d]=%s\n", i, ps(vspacing[i]));
fprintf (logfile, "outstrings[%d]=%s\n", i, outstrings[i]);
+ if (xtuplet[i] > 1)
+ fprintf (logfile, "xtuplet[%d]=%d\n", i, xtuplet[i]);
+
}
}
@@ -275,6 +278,10 @@
int i; char *s; char *t;
int newlines = 0;
s = strpbrk (*ln+1, "|&\\\n"); /* skip initial command */
+ if (s == NULL)
+ {
+ error ("Can''t find end of command");
+ }
while (true)
{ /* look for \en */
t = strstr(s, "\\en");
@@ -327,7 +334,8 @@
}
spacing = MAX_SPACING;
old_spacing = MAX_SPACING;
- xtuplet = 1;
+ for (i=1; i <= nstaffs; i++)
+ xtuplet[i] = 1;
appoggiatura = false;
if (debug)
{ fprintf (logfile, "\nAfter analyze_notes:\n");
@@ -447,13 +455,15 @@
status (i);
status_collective (i);
}
- while (true) /* search for alphabetic note (or asterisk) */
+ while (true) /* search for alphabetic or numeric note (or asterisk) */
{
if (*s == '.' && new_beaming == 0 && !dottedbeamnotes)
spacing = spacing * 1.50;
- else if (isalpha (*s) || *s == '*')
+ else if (isalnum (*s) || *s == '*')
{
s++;
+ while (*s == '\'' || *s == '`' || *s == '!') /* transposition character */
+ s++;
current[i] = s;
if (debug)
{ fprintf (logfile, "\nAfter collective_note:\n");
@@ -686,7 +696,7 @@
if ( prefix ("\\Cpause", s) )
{ /* bar-centered rest */
bar_rest[i] = true;
- spacing = BARREST_SPACING;
+ spacing = MAX_SPACING;
break;
}
@@ -696,7 +706,7 @@
new_beaming = 0;
if (debug)
{ fprintf (logfile, "\nAfter beam completion:\n");
- status (i);
+ status (i);
status_beam (i);
}
break;
@@ -747,8 +757,7 @@
else if ( prefix("\\xtuplet", s))
{ char *t = s+1;
while (!isdigit(*t)) t++;
- xi = i;
- xtuplet = atoi(t);
+ xtuplet[i] = atoi(t);
}
else
if ( prefix("\\triolet", s)
@@ -757,8 +766,7 @@
|| prefix("\\uptuplet", s)
|| prefix("\\downtuplet", s) )
{
- xi = i;
- xtuplet = 3;
+ xtuplet[i] = 3;
}
else if ( prefix("\\zchar", s)
@@ -784,8 +792,8 @@
else if (prefix("\\ppt", s)
|| prefix("\\pppt", s) )
doubledotted = true; /* triple-dotted spaced as double-dotted */
-
- else if (prefix("\\pt", s))
+
+ else if (prefix("\\pt", s) && !prefix("\\ptr", s))
dotted = true;
else if ( prefix ("\\Dqbb", s) )
@@ -832,6 +840,16 @@
nonvirtual_notes = true;
return beaming[i];
}
+ else if (prefix ("\\rlap", s) )
+ /* skip the argument, as it must be regarded as non-spacing */
+ { char *t;
+ t = strpbrk (s+1, " {\\");
+ if (t == NULL) error ("Argument expected");
+ if (*t == '\\')
+ s = t+1;
+ else
+ s = skip_arg(t);
+ }
/* Command is non-spacing. */
/* Skip ahead to the next command. */
@@ -1023,7 +1041,9 @@
{ fprintf (logfile, "\nEntering initialize_notes\n");
status_all ();
}
- if (spacing == SP(1)+SP(2) || spacing == SP(1)+SP(2)+SP(4))
+ if (spacing == MAX_SPACING)
+ fprintf (outfile, "\\znotes");
+ else if (spacing == SP(1)+SP(2) || spacing == SP(1)+SP(2)+SP(4))
fprintf (outfile, NOTEsp);
else if (spacing == SP(1))
fprintf (outfile, "\\NOTEs");
@@ -1057,8 +1077,6 @@
fprintf (outfile, "\\nnnotes");
else if (spacing == APPOGG_SPACING)
fprintf (outfile, "%s", APPOGG_NOTES);
- else if (spacing == BARREST_SPACING)
- fprintf (outfile, "\\znotes");
else
{ fprintf (stderr, "Error on line %d: spacing %s not recognized.\n", lineno, ps(spacing));
exit (EXIT_FAILURE);
@@ -1200,7 +1218,7 @@
PRIVATE
void process_xtuplet (void)
{
- int i;
+ int i, xi=0;
int xspacing = MAX_SPACING; /* xtuplet total spacing */
int normalized_xspacing; /* (xspacing / xtuplet) * (xtuplet - 1); */
int xsp;
@@ -1208,9 +1226,8 @@
if (debug)
{ fprintf (logfile, "\nEntering process_xtuplet:\n");
- fprintf (logfile, "xtuplet=%d\n", xtuplet);
- fprintf (logfile, "xi=%d\n\n", xi);
- status (xi);
+ for (i=1; i <= nstaffs; i++)
+ fprintf (logfile, "i=%d xtuplet[i]=%d\n", i, xtuplet[i]);
}
if (old_spacing < MAX_SPACING)
@@ -1234,29 +1251,37 @@
}
if (debug) fprintf (logfile, "\nDetermine xtuplet duration:\n");
- {
- save_state (xi);
- pseudo_output_notes (xi);
- xspacing = spacings[xi];
- do
- {
- xspacing += spacing_note (xi);
+ for (i=1; i <= nstaffs; i++)
+ if (xtuplet[i] > 1)
+ {
+ xi = i;
+ save_state (xi);
pseudo_output_notes (xi);
- if (xspacing >= MAX_SPACING)
- error ("Can't determine xtuplet duration.");
+ xspacing = spacings[xi];
+ do
+ {
+ xspacing += spacing_note (xi);
+ pseudo_output_notes (xi);
+ if (xspacing >= MAX_SPACING)
+ error ("Can't determine xtuplet duration.");
+ }
+ while (xspacing % xtuplet[xi] != 0);
+ restore_state (xi);
+ break;
}
- while (xspacing % xtuplet != 0);
- restore_state (xi);
- }
if (debug) fprintf (logfile, "\nxspacing=%s\n", ps(xspacing));
- normalized_xspacing = (xspacing / xtuplet) * (xtuplet - 1);
+ if (debug) fprintf (logfile, "xi=%d xtuplet[xi]=%d\n", xi, xtuplet[xi]);
+ normalized_xspacing = (xspacing / xtuplet[xi]) * (xtuplet[xi] - 1);
if (debug)
{ fprintf (logfile, "normalized_xspacing=%s\n", ps(normalized_xspacing));
+ }
+ spacing = xspacing / xtuplet[xi];
+ if (debug)
+ {
fprintf (logfile, "\nDetermine minimal spacing over all active staffs:\n");
}
- spacing = xspacing / xtuplet;
for (i=1; i <= nstaffs; i++)
- if (active[i] && i != xi)
+ if (active[i] && xtuplet[i] == 1)
{ save_state (i);
pseudo_output_notes (i);
xsp = spacings[i];
@@ -1277,12 +1302,6 @@
if (debug) fprintf (logfile, "\nCreate a new notes command for the xtuplet:\n");
initialize_notes ();
- multnoteskip = (double) (xtuplet - 1) / xtuplet;
- n_outstrings[xi] += sprintf (n_outstrings[xi], "\\multnoteskip{%5.3f}", multnoteskip);
- if (debug)
- { fprintf (logfile, "\noutstrings[%d]=", xi);
- note_segment (outstrings[xi]);
- }
if (debug) fprintf (logfile, "\nProcess non-xtuplet staffs:\n");
for (i=1; i <= nstaffs; i++)
@@ -1291,13 +1310,13 @@
while (true)
{
for (i=1; i <= nstaffs; i++)
- if (active[i] && i != xi)
+ if (active[i] && xtuplet[i] == 1)
output_notes (i);
xsp += spacing;
for (i=1; i <= nstaffs; i++)
{
/* virtual notes needed? */
- if (active[i] && i != xi && spacings[i] != 0 && spacings[i] != spacing && vspacing[i] == 0)
+ if (active[i] && xtuplet[i] == 1 && spacings[i] != 0 && spacings[i] != spacing && vspacing[i] == 0)
{
vspacing[i] = spacings[i] - spacing;
}
@@ -1304,7 +1323,7 @@
}
if (xsp >= normalized_xspacing) break;
for (i=1; i <= nstaffs; i++)
- if (active[i] && i != xi)
+ if (active[i] && xtuplet[i] == 1)
spacings[i] = spacing_note(i);
}
if (debug)
@@ -1311,21 +1330,49 @@
{ fprintf (logfile, "\nAfter processing non-xtuplet staffs:\n");
status_all ();
}
- if (debug) fprintf (logfile, "\nRe-process xtuplet staff:\n");
- xsp = 0;
- while (true)
- { output_notes (xi);
- xsp += spacing;
- if (spacings[xi] != spacing && vspacing[xi] == 0)
- vspacing[xi] = spacings[xi] - spacing;
- if (xsp >= xspacing) break;
- spacings[xi] = spacing_note (xi);
+ if (debug)
+ {
+ fprintf (logfile, "Generate \\multnoteskip factors.\n");
+ fprintf (logfile, "xi=%d xtuplet[xi]=%d\n", xi, xtuplet[xi]);
}
+ multnoteskip = (double) (xtuplet[xi] - 1) / xtuplet[xi];
+ for (i=1; i <= nstaffs; i++)
+ if (xtuplet[i] > 1)
+ {
+ n_outstrings[i] += sprintf (n_outstrings[i], "\\multnoteskip{%5.3f}", multnoteskip);
+ if (debug)
+ { fprintf (logfile, "\noutstrings[%d]=", i);
+ note_segment (outstrings[i]);
+ }
+ }
+ if (debug) fprintf (logfile, "\nRe-process xtuplet staffs:\n");
+ for (i=1; i <= nstaffs; i++)
+ if (xtuplet[i] > 1)
+ {
+ xsp = 0;
+ while (true)
+ { output_notes (i);
+ xsp += spacing;
+ if (spacings[i] != spacing && vspacing[i] == 0)
+ vspacing[i] = spacings[i] - spacing;
+ if (xsp >= xspacing) break;
+ spacings[i] = spacing_note (i);
+ }
+ }
- /* Restore normal \noteskip in the xtuplet staff. */
- multnoteskip = (double) (xtuplet) / (xtuplet-1);
- n_outstrings[xi] += sprintf (n_outstrings[xi], "\\multnoteskip{%5.3f}", multnoteskip);
- xtuplet = 1;
+ /* Restore normal \noteskip in the xtuplet staffs. */
+ if (debug)
+ {
+ fprintf (logfile, "Restore \\multnoteskip factors.\n");
+ fprintf (logfile, "xi=%d xtuplet[xi]=%d\n", xi, xtuplet[xi]);
+ }
+ multnoteskip = (double) xtuplet[xi] / (xtuplet[xi]-1);
+ for (i=1; i <= nstaffs; i++)
+ if (xtuplet[i] > 1)
+ {
+ n_outstrings[i] += sprintf (n_outstrings[i], "\\multnoteskip{%5.3f}", multnoteskip);
+ xtuplet[i] = 1;
+ }
nonvirtual_notes = true;
if (debug)
{ fprintf (logfile, "\nAfter process_xtuplet:\n");
@@ -1342,6 +1389,7 @@
* and initialize a new one.
*/
{ int i;
+ bool xtuplet_flag;
while (true)
{ old_spacing = spacing;
spacing = MAX_SPACING;
@@ -1361,7 +1409,10 @@
{
process_appogg ();
}
- if (xtuplet > 1)
+ xtuplet_flag = false;
+ for (i=1; i <= nstaffs; i++)
+ if (xtuplet[i] > 1) xtuplet_flag = true;
+ if (xtuplet_flag)
{
process_xtuplet ();
continue;
@@ -1378,7 +1429,7 @@
return;
}
if (old_spacing < MAX_SPACING) putc ('\n', outfile);
- if ( nastaffs == 1 && spacing != BARREST_SPACING && restbars > 0)
+ if ( nastaffs == 1 && spacing != MAX_SPACING && restbars > 0)
output_rests ();
initialize_notes ();
}
Modified: trunk/Build/source/utils/autosp/autosp-src/compile
===================================================================
(Binary files differ)
Modified: trunk/Build/source/utils/autosp/autosp-src/config.h.in
===================================================================
--- trunk/Build/source/utils/autosp/autosp-src/config.h.in 2017-02-28 21:57:26 UTC (rev 43362)
+++ trunk/Build/source/utils/autosp/autosp-src/config.h.in 2017-02-28 23:06:34 UTC (rev 43363)
@@ -69,6 +69,9 @@
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
/* Define to the version of this package. */
#undef PACKAGE_VERSION
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 2017-02-28 21:57:26 UTC (rev 43362)
+++ trunk/Build/source/utils/autosp/autosp-src/configure.ac 2017-02-28 23:06:34 UTC (rev 43363)
@@ -1,5 +1,5 @@
AC_PREREQ(2.63)
-AC_INIT([autosp],[2016-01-30],[rdt at cs.queensu.ca])
+AC_INIT([autosp],[2016-11-02],[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/tests/quod2.tex
===================================================================
--- trunk/Build/source/utils/autosp/autosp-src/tests/quod2.tex 2017-02-28 21:57:26 UTC (rev 43362)
+++ trunk/Build/source/utils/autosp/autosp-src/tests/quod2.tex 2017-02-28 23:06:34 UTC (rev 43363)
@@ -1,4 +1,4 @@
-% Generated by autosp (2016-01-30).
+% Generated by autosp (2016-11-02).
\input musixtex
\input musixplt
\input soul.sty
@@ -44,7 +44,7 @@
\systemnumbers%
\Notes\ds&\cu d&\ds&\ds\en%
\bar%1
-\Notes\ha N\sk\sk\sk\hqsk&\ibu1g2\qb1{g}\qb1{h}\qb1{i}\tqh1j\hqsk&\sk\sk\sk\hqsk&\hp\sk\sk\sk\hqsk\en%
+\Notes\ha N\sk\sk\sk&\ibu1g2\qb1{g}\qb1{h}\qb1{i}\tqh1j&&\hp\sk\sk\sk\en%
\Notes\ha M&\ibl1k{-2}\qb1k&&\qp\en
\notes\sk\sk&\nbbl1\qb1j\tqb1i&&\sk\sk\en
\Notes\sk&\ibu1h0\qb1h&&\ds\en
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 2017-02-28 21:57:26 UTC (rev 43362)
+++ trunk/Build/source/utils/autosp/configure.ac 2017-02-28 23:06:34 UTC (rev 43363)
@@ -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], [2016-01-30])[]dnl using unmodified autosp source
+m4_define([autosp_version], [2016-11-02])[]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