diff options
Diffstat (limited to 'Build/source/utils')
-rw-r--r-- | Build/source/utils/README | 2 | ||||
-rw-r--r-- | Build/source/utils/autosp/ChangeLog | 5 | ||||
-rw-r--r-- | Build/source/utils/autosp/autosp-src/ChangeLog | 8 | ||||
-rw-r--r-- | Build/source/utils/autosp/autosp-src/autosp.1 | 40 | ||||
-rw-r--r-- | Build/source/utils/autosp/autosp-src/autosp.c | 100 | ||||
-rwxr-xr-x | Build/source/utils/autosp/autosp-src/configure | 20 | ||||
-rw-r--r-- | Build/source/utils/autosp/autosp-src/configure.ac | 2 | ||||
-rw-r--r-- | Build/source/utils/autosp/autosp-src/tests/quod2.tex | 46 | ||||
-rwxr-xr-x | Build/source/utils/autosp/configure | 20 | ||||
-rw-r--r-- | Build/source/utils/autosp/configure.ac | 2 |
10 files changed, 138 insertions, 107 deletions
diff --git a/Build/source/utils/README b/Build/source/utils/README index 11ef8983e17..6b3a7752691 100644 --- a/Build/source/utils/README +++ b/Build/source/utils/README @@ -10,7 +10,7 @@ asymptote 2.41 - checked 23mar17 see http://tug.org/texlive/build.html#asymptote and tlpkg/bin/tl-update-asy -autosp 2017-06-21 - checked 01jul17 +autosp 2017-07-14 - checked 26jul17 http://ctan.org/pkg/autosp devnag - from devanagari package installed in texmf-dist. diff --git a/Build/source/utils/autosp/ChangeLog b/Build/source/utils/autosp/ChangeLog index 5f48cba5223..e3e6e2e5d41 100644 --- a/Build/source/utils/autosp/ChangeLog +++ b/Build/source/utils/autosp/ChangeLog @@ -1,3 +1,8 @@ +2017-07-26 Akira Kakuto <kakuto@fuk.kindai.ac.jp> + + * Import autosp-2017-07-14 + configure.ac: Adapted. + 2017-07-01 Akira Kakuto <kakuto@fuk.kindai.ac.jp> * Import autosp-2017-06-21 diff --git a/Build/source/utils/autosp/autosp-src/ChangeLog b/Build/source/utils/autosp/autosp-src/ChangeLog index 245685cd920..0f821cfe795 100644 --- a/Build/source/utils/autosp/autosp-src/ChangeLog +++ b/Build/source/utils/autosp/autosp-src/ChangeLog @@ -1,9 +1,13 @@ AUTOSP + Determination of automatic spacing for accidentals simplified + Many comments corrected and expanded + +2017-06-21 + Support for global skips within collective-coding sequences by using commas between notes. - Automatic added spacing for accidentals on beamed sixteenth notes - and smaller. + Automatic added spacing for accidentals on beamed notes 2017-06-14 diff --git a/Build/source/utils/autosp/autosp-src/autosp.1 b/Build/source/utils/autosp/autosp-src/autosp.1 index f6e7e789ad7..38750769ab6 100644 --- a/Build/source/utils/autosp/autosp-src/autosp.1 +++ b/Build/source/utils/autosp/autosp-src/autosp.1 @@ -1,5 +1,5 @@ .\" This manpage is licensed under the GNU Public License -.TH AUTOSP 1 2017-06-21 "" "" +.TH AUTOSP 1 2017-07-140 "" "" .SH NAME autosp \- preprocessor to generate note-spacing commands for MusiXTeX scores @@ -11,9 +11,15 @@ autosp \- preprocessor to generate note-spacing commands for MusiXTeX scores .B autosp .RB [ \-d\ |\ \-\-dotted ] .RB [ \-l\ |\ \-\-log ] -.IR infile [\ \fR.aspc\fP\ |\ \fR.tex\fP\ ] +.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 @@ -126,25 +132,31 @@ as indicated. 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 -the non-standard command \\Cpause in a note segment generates a +coded using the standard \\def\\atnextbar notation but +the non-standard command \\Cpause in a note segment also generates a bar-centered rest. -Spacing commands \\sk and \\hsk in the source are discarded, -but not \\qsk, \\tqsk, \\hqsk or \\qqsk; -moreover +Spacing commands \\sk and \\hsk in the source are discarded +(but not \\qsk, \\tqsk, \\hqsk or \\qqsk); +however, non-standard commands \\QQsk, \\HQsk \\TQsk and \\Qsk in the source generate "global" skips; i.e., the effect of \\qqsk, \\hqsk, \\tqsk or \\qsk, respectively, in .I every -staff. These ensure that staffs remain synchronized if additional spacing is needed in one staff. +staff. These ensure that staffs remain synchronized if additional spacing is needed in any staff(s). Global skips may also be obtained within collective-coding sequences by using -one, two, three or four successive commas -to get the effects of \\QQsk, \\HQsk, \\TQsk or \\Qsk, respectively. -Global skips (equivalent to one, two or three commas, depending on the beaming and the accidental) are -automatically inserted before accidentals ('^', '_', '=', '<', '>') on beamed collective-coding notes. -The spacing can be increased by adding sufficient commas or locally re-defining -the relevant skip commands (\\qqsk, \\hqsk, \\tqsk, \\qsk). +up to four successive commas +to get the effects of \\qqsk, \\hqsk, \\tqsk or \\qsk, respectively, +as global skips. +Global skips are +automatically inserted before accidentals ('^', '_', '=', '<', '>') on collective-coding notes. +If the automatic spacing is insufficient, the spacing may be increased by adding sufficient commas or +using a conventional notes command instead of \\anotes. Automatic skips are +.I not +inserted +for any of the +.I explicit +accidental commands: \\sh, \\fl, \\na, \\smallsh, \\bigsh, etc. A note segment can be completely empty, but if a note segment should start diff --git a/Build/source/utils/autosp/autosp-src/autosp.c b/Build/source/utils/autosp/autosp-src/autosp.c index 78dc4761a38..5cf413f72c2 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] = "2017-06-21"; +char version[12] = "2017-07-14"; /* Copyright (C) 2014-17 R. D. Tennent School of Computing, * Queen's University, rdt@cs.queensu.ca @@ -50,18 +50,28 @@ char version[12] = "2017-06-21"; * characters terminator[i] for each staff; '$' is used * as the terminator for the last staff. * - * generate_notes, which repeatedly uses spacing_note to + * generate_notes, which repeatedly uses spacing_note (i) to * determine spacings[i] of the next spacing note in * each staff; the current spacing is then the smallest * of these. If necessary, the current notes command - * is terminated and a new notes command initiated. - * Then one note (or skip) is generated for each staff. - * When necessary, vspacing[i] is set to generate subsequent - * skips. Appoggiaturas and xtuplets are treated separately. + * is terminated by terminate_notes() and a new notes + * command initiated by initialize_notes(). The current global + * skip and note commands for each staff are then copied to + * outstrings[i] using output_notes (i). When necessary, + * vspacing[i] is set to generate subsequent skips. + * Appoggiaturas and xtuplets are treated separately. * * spacing_note (i), which searches for the next spacing note * in the i'th staff, unless a "virtual note" (skip) is * needed. + * + * output_notes (i), which copies a global_skip string and + * outstrings[i] to output, using filter_output (i) to discard + * commas and global and large skips, and insert collective-coding + * prefixes and closing braces. + * + * terminate_notes, which copies outstrings[i] to output, + * in the order determined by TransformNotes2. * * Spacing values are expressed as sums of binary multiples of * SMALL_NOTE (by default, 1/256th); for example, half-note @@ -176,9 +186,12 @@ PRIVATE char outstrings[MAX_STAFFS][LINE_LEN]; PRIVATE char *n_outstrings[MAX_STAFFS]; PRIVATE int global_skip; - /* = 1, 2, 3 or 4, for (non-standard) commands \QQsk \HQsk TQsk \Qsk */ -PRIVATE char global_skip_str[5][8] = - { "", "\\qqsk", "\\hqsk", "\\tqsk", "\\qsk"}; + /* = 1, 2, 3, or 4 for (non-standard) commands \QQsk \HQsk \TQsk \Qsk */ + /* = 5 for five commas and double-flat accidental spacing */ + /* = 6 for six commas */ +PRIVATE char global_skip_str[7][16] += { "","\\qqsk","\\hqsk","\\tqsk","\\qsk","\\qsk\\qqsk","\\qsk\\hqsk" }; + /* all based on \elemskip, not \noteskip */ PRIVATE char TransformNotes2[SHORT_LEN] = {'\0'}; /* 2nd argument of \TransformNotes */ @@ -188,7 +201,8 @@ PRIVATE void usage () { printf ("Usage: autosp [-v | --version | -h | --help]\n"); - printf (" autosp [-d | --dotted] [-l | --log] infile[.aspc | .tex] [outfile[.tex]]\n"); + printf (" autosp [-d | --dotted] [-l | --log] infile[.aspc] [outfile[.tex]]\n"); + printf (" autosp [-d | --dotted] [-l | --log] infile.tex outfile[.tex]\n"); } @@ -278,7 +292,6 @@ status_beam (int i) { fprintf (logfile, "beaming[%d]=%s\n", i, ps(beaming[i])); } } - PRIVATE void analyze_notes (char **ln) /* divide material from *ln to \en into notes[i] segments @@ -370,7 +383,7 @@ void checkn (char *s) } PRIVATE -void output_filtered (int i) +void filter_output (int i) { /* discard , \sk \hsk \Qsk \TQsk \HQsk \QQsk and \Cpause */ char *s = notes[i]; while (s < current[i]) @@ -404,6 +417,11 @@ void output_notes (int i) { fprintf (logfile, "\nEntering output_notes:\n"); status (i); } + if (debug) + { + fprintf (logfile, "\nAppending %s for global_skip=%i\n", global_skip_str[global_skip], global_skip); + } + append (outstrings[i], &(n_outstrings[i]), global_skip_str[global_skip], LINE_LEN); if (vspacing[i] > 0) { if (nonvirtual_notes) @@ -420,7 +438,7 @@ void output_notes (int i) if (!first_collective[i]) append (outstrings[i], &(n_outstrings[i]), collective[i], LINE_LEN); first_collective[i] = false; - output_filtered (i); + filter_output (i); append (outstrings[i], &(n_outstrings[i]), "}", LINE_LEN); if (*notes[i] == '}') { collective[i][0] = '\0'; @@ -437,7 +455,7 @@ void output_notes (int i) } } else - output_filtered (i); + filter_output (i); if (debug) { fprintf (logfile, "\nAfter output_notes:\n"); status (i); @@ -463,7 +481,11 @@ void pseudo_output_notes (int i) PRIVATE void update_global_skip (int n) /* global skips may be used in more than one staff */ -{ if (global_skip < n) global_skip = n; } +{ + if (n>6) + { warning ("Too many commas."); n = 6; } + if (global_skip < n) global_skip = n; +} PRIVATE int collective_note (int i) @@ -479,27 +501,27 @@ int collective_note (int i) while (*s == ',') { n++; s++; } /* global skips */ update_global_skip (n); - /* commas will be discarded by output_filtered (i) */ + /* commas will be discarded by filter_output (i) */ if (*s == '.' && new_beaming == 0 && !dottedbeamnotes) spacing = spacing * 1.50; - else if ( beaming[i] > 0 && (*s == '^' || *s == '_' || *s == '=' || *s == '>')) - /* leave space for accidentals */ + else if ( (*s == '^' || *s == '_' || *s == '=' || *s == '>') ) + /* leave space for normal accidentals */ { if (debug) { fprintf (logfile, "\nLeave space for accidental\n"); status (i); status_beam (i); status_collective (i); } - if (spacings[i] <= SP(16) ) /* spacing for the preceding note */ - update_global_skip (2); - else if (spacings[i] <= SP(8)+SP(16) ) /* allow for dotted eighth */ - update_global_skip (1) ; + update_global_skip (3) ; } - else if ( beaming[i] > 0 && (*s == '<')) /* double flat */ - { if (spacings[i] <= SP(16) ) - update_global_skip (3); - else if (spacings[i] <= SP(8)+SP(16) ) - update_global_skip (2) ; + else if ( (*s == '<') /* double-flat */ ) + { if (debug) + { fprintf (logfile, "\nLeave space for double-flat\n"); + status (i); + status_beam (i); + status_collective (i); + } + update_global_skip (5); } else if (isalnum (*s) || *s == '*') { @@ -896,8 +918,9 @@ int spacing_note (int i) else s = skip_arg(t); } + else if (prefix ("\\Hsk", s) ) + update_global_skip (5); else if (prefix ("\\Qsk", s) ) - /* may have global skips in more than one staff */ update_global_skip (4); else if (prefix ("\\TQsk", s) ) update_global_skip (3); @@ -1093,7 +1116,7 @@ void terminate_notes () i = atoi (t) -1; t++; if (spacing == MAX_SPACING) { /* output any commands left in notes[i] */ - output_filtered (i); + filter_output (i); } fprintf (outfile, "%s", outstrings[i]); if (debug) fprintf (logfile, "\noutputting %s from outstrings[%d].\n", outstrings[i], i); @@ -1101,7 +1124,7 @@ void terminate_notes () n_outstrings[i] = outstrings[i]; if (spacing < MAX_SPACING && spacing > 2 * old_spacing) { /* add extra space *before* much longer notes */ - fprintf (outfile, "\\off{0.5\\elemskip}"); + fprintf (outfile, "\\hqsk"); if (debug) fprintf (logfile, "\nExtra half-notehead space before longer notes.\n"); } if (*t != '\0') @@ -1109,7 +1132,7 @@ void terminate_notes () } if (spacing == MAX_SPACING && old_spacing < SP(8) ) { /* add extra space before \en */ - fprintf (outfile, "\\off{0.5\\elemskip}"); + fprintf (outfile, "\\hqsk"); if (debug) fprintf (logfile, "\nExtra half-notehead space before \\en.\n"); } fprintf (outfile, "\\en"); @@ -1309,10 +1332,7 @@ void process_xtuplet (void) { for (i=1; i <= nstaffs; i++) if (active[i] && xtuplet[i] == 1) - { - append (outstrings[i], &(n_outstrings[i]), global_skip_str[global_skip], LINE_LEN); output_notes (i); - } xsp += spacing; for (i=1; i <= nstaffs; i++) { @@ -1353,9 +1373,7 @@ void process_xtuplet (void) { xsp = 0; while (true) - { - append (outstrings[i], &(n_outstrings[i]), global_skip_str[global_skip], LINE_LEN); - output_notes (i); + { output_notes (i); xsp += spacing; if (spacings[i] != spacing && vspacing[i] == 0) vspacing[i] = spacings[i] - spacing; @@ -1388,11 +1406,6 @@ void process_xtuplet (void) PRIVATE void generate_notes () -/* Repeatedly call output_notes for each (active) staff - * and, if necessary, set up for subsequent "virtual" notes (skips). - * If spacing has changed, terminate an existing notes command - * and initialize a new one. - */ { int i; bool xtuplet_flag; while (true) @@ -1442,10 +1455,7 @@ void generate_notes () for (i=1; i <= nstaffs; i++) /* append current notes to outstrings */ if (active[i]) - { - append (outstrings[i], &(n_outstrings[i]), global_skip_str[global_skip], LINE_LEN); output_notes (i); - } for (i=1; i <= nstaffs; i++) { /* virtual notes needed? */ diff --git a/Build/source/utils/autosp/autosp-src/configure b/Build/source/utils/autosp/autosp-src/configure index 4868cd356e1..ae24877edfa 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 2017-06-21. +# Generated by GNU Autoconf 2.69 for autosp 2017-07-14. # # Report bugs to <rdt@cs.queensu.ca>. # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='autosp' PACKAGE_TARNAME='autosp' -PACKAGE_VERSION='2017-06-21' -PACKAGE_STRING='autosp 2017-06-21' +PACKAGE_VERSION='2017-07-14' +PACKAGE_STRING='autosp 2017-07-14' 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 2017-06-21 to adapt to many kinds of systems. +\`configure' configures autosp 2017-07-14 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 2017-06-21:";; + short | recursive ) echo "Configuration of autosp 2017-07-14:";; 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 2017-06-21 +autosp configure 2017-07-14 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 2017-06-21, which was +It was created by autosp $as_me 2017-07-14, 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='2017-06-21' + VERSION='2017-07-14' 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 2017-06-21, which was +This file was extended by autosp $as_me 2017-07-14, 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 2017-06-21 +autosp config.status 2017-07-14 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 1e59ce3760b..b027bd6d027 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],[2017-06-21],[rdt@cs.queensu.ca]) +AC_INIT([autosp],[2017-07-14],[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 41a5828db5f..10f3205b4fd 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 (2017-06-21). +% Generated by autosp (2017-07-14). \input musixtex \input musixplt \input soul.sty @@ -48,44 +48,44 @@ \Notes\ha M&\ibl1k{-2}\qb1k&&\qp\en \notes\sk\sk&\nbbl1\qb1j\tqb1i&&\sk\sk\en \Notes\sk&\ibu1h0\qb1h&&\ds\en -\notes\sk\sk&\nbbu1\qb1g\tqh1h&&\cu d\sk\off{0.5\elemskip}\en% +\notes\sk\sk&\nbbu1\qb1g\tqh1h&&\cu d\sk\hqsk\en% \def\atnextbar{\znotes&&\centerpause&\en}% \bar%2 \Notes\ha L\sk\sk\sk&\ibu1i{-2}\qb1i\tqh1h\itied1g\qa g\sk&\qa{n}\sk\qa{n}\sk&\ibu3g2\qb3{g}\qb3{h}\qb3{i}\tqh3j\en% \Notes\qa{.K}&\ttie1\qa g&\qa o&\ibl3k{-2}\qb3k\en \notes\sk\sk&\sk\sk&\sk\sk&\nbbl3\qb3j\tqb3i\en \Notes\sk&\ibu1f0\shake{n}\qb1f&\cl o&\cu h\en -\notes\cu J\sk&\nbbu1\qb1e\tqh1f&\ds\sk&\ds\sk\off{0.5\elemskip}\en% +\notes\cu J\sk&\nbbu1\qb1e\tqh1f&\ds\sk&\ds\sk\hqsk\en% \bar%3 -\Notes\hu I\sk\sk\qqsk\sk&\qa g\sk\ds\qqsk\cl k&\ibl2n{-1}\qb2{n}\qb2{o}\qb2{n}\qqsk\tqb2{=m}&\qa{k}\sk\qa{k}\qqsk\sk\en% +\Notes\hu I\sk\sk\tqsk\sk&\qa g\sk\ds\tqsk\cl k&\ibl2n{-1}\qb2{n}\qb2{o}\qb2{n}\tqsk\tqb2{=m}&\qa{k}\sk\qa{k}\tqsk\sk\en% \Notes\hu J\sk\sk\sk&\ibu1j{-2}\qb1{j}\qb1{i}\qb1h\tqh1g&\ibl2j{0}\qb2{l}\qb2{k}\qb2j\tqb2p&\qa{l}\sk\qa{l}\sk\en% \bar%4 \Notes\ha K\sk&\itied1f\shake{n}\qa f\sk&\ibl2o{-1}\qb2{o}\qb2{n}&\ibl3k{-1}\qb3{k}\qb3{l}\en \notes\sk\sk&\ttie1\ibbu1e{-2}\qb1f\tbbu1\qb1e&\qb2{o}\sk&\qb3{k}\sk\en \Notes\sk&\itied1d\tqh1d&\tqb2m&\tqb3j\en% \Notes\qa G\sk\ds&\ttie1\qa d\sk\qp&\ibl2n{-2}\qb2n\tqb2m\ibl2n{-5}\qb2n&\ibu3h{-2}\shake{p}\qb3i\tqh3h\qa g\en -\notes\ibbl0b{-1}\qb0b\tqb0a&\sk\sk&\tqb2k\sk&\sk\sk\off{0.5\elemskip}\en% +\notes\ibbl0b{-1}\qb0b\tqb0a&\sk\sk&\tqb2k\sk&\sk\sk\hqsk\en% \bar%5 \Notes\ibl0M0\qb0N&\qa{n}&\ibl2n2\qb2{n}&\hp\en \notes\nbbl0\qb0M\tqb0N&\sk\sk&\qb2{o}\sk&\sk\sk\en \Notes\ibl0K0\qb0L&\qa{n}&\qb2{p}&\sk\en -\notes\nbbl0\qb0K\tqb0L&\sk\sk&\tqb2q\sk&\sk\sk\off{0.5\elemskip}\en% +\notes\nbbl0\qb0K\tqb0L&\sk\sk&\tqb2q\sk&\sk\sk\hqsk\en% \Notes\qa{.M}&\qa{o}&\ibl2r{-2}\qb2r&\qp\en \notes\sk\sk&\sk\sk&\nbbl2\qb2q\tqb2p&\sk\sk\en \Notes\sk\cu I&\qa{o}\sk&\ibl2o6\qb2o\itieu2r\tqb2r&\ds\cl k\en% \bar%6 \Notes\qa{.L}\sk\sk&\ibl1n{-1}\qb1{n}\qb1{o}\qb1{n}&\ttie2\ibl2r{-2}\qb2r\tqb2q\qa p&\ibl3n{-2}\qb3{n}\qb3{m}\qb3{l}\en -\notes\ibbl0M2\qb0M\tqb0N&\tqb1m\sk&\sk\sk&\tqb3k\sk\off{0.5\elemskip}\en% -\Notes\itieu0a\qa a&\ibl1l{-2}\qb1l&\qa{.o}&\shake{n}\ibl3i0\qb3{^j}\en -\notes\sk\sk\hqsk\ttie0\ibbl0a{-2}\qb0{a}\qb0{N}\qb0{M}\hqsk\tqb0L&\tqb1k\sk\hqsk\cl{^j}\sk\ds\hqsk\sk&\sk\sk\hqsk\sk\sk\ibbl2i2\qb2i\hqsk\tqb2{^j}&\nbbl3\qb3i\tqb3j\hqsk\cu h\sk\ds\hqsk\sk\off{0.5\elemskip}\en% +\notes\ibbl0M2\qb0M\tqb0N&\tqb1m\sk&\sk\sk&\tqb3k\sk\hqsk\en% +\Notes\tqsk\itieu0a\qa a&\tqsk\ibl1l{-2}\qb1l&\tqsk\qa{.o}&\tqsk\shake{n}\ibl3i0\qb3{^j}\en +\notes\sk\sk\tqsk\ttie0\ibbl0a{-2}\qb0{a}\qb0{N}\qb0{M}\tqsk\tqb0L&\tqb1k\sk\tqsk\cl{^j}\sk\ds\tqsk\sk&\sk\sk\tqsk\sk\sk\ibbl2i2\qb2i\tqsk\tqb2{^j}&\nbbl3\qb3i\tqb3j\tqsk\cu h\sk\ds\tqsk\sk\hqsk\en% \bar%7 \Notes\qa{M}\sk\qa{K}\sk&\ibu1g0\qb1{f}\qb1{g}\qb1{h}\tqh1f&\ibl2k0\qb2{k}\qb2{l}\qb2{m}\tqb2k&\qa{h}\sk\qa{h}\sk\en% \Notes\qa{N}\sk\qa{G}\sk&\ibu1g{-2}\qb1{g}\qb1{f}\qb1{e}\tqh1d&\ibl2i4\qb2{i}\qb2{k}\qb2{n}\tqb2m&\qa{i}\sk\qa{i}\sk\en% \bar%8 \nspace -\Notes\qu{.H}&\ibu1c4\qb1{^c}&\ibl2l{-1}\qb2{.l}&\ibu3h{0}\qb3{h}\en +\Notes\tqsk\qu{.H}&\tqsk\ibu1c4\qb1{^c}&\tqsk\ibl2l{-1}\qb2{.l}&\tqsk\ibu3h{0}\qb3{h}\en \notes\sk\sk\sk\tqsk\sk&\qb1{d}\sk\qb1{e}\tqsk\sk&\sk\itieu2k\tbbl2\tqb2k\ttie2\ibbl2j0\qb2k\tqsk\tbbl2\qb2{^j}&\qb3{i}\sk\qb3{h}\tqsk\sk\en -\Notes\hqsk\cu{^J}&\hqsk\itied1h\tqh1h&\hqsk\itieu2l\tqb2l&\hqsk\tqh3g\en% +\Notes\tqsk\cu{^J}&\tqsk\itied1h\tqh1h&\tqsk\itieu2l\tqb2l&\tqsk\tqh3g\en% \notes\ql K\sk\sk\sk&\ttie1\ibu1h{-2}\qb1h\sk\tqh1g\sk&\ttie2\ibbl2l{-1}\qb2{l}\qb2{k}\qb2{l}\tqb2j&\ibu3f{-1}\qb3f\sk\tqh3e\sk\en \Notes\cl K&\cu f&\cl k&\cu d\en% \leftrightrepeat @@ -98,44 +98,44 @@ \Notes\qa{N}\sk&\qb1{k}\tqb1n&\qa{p}\sk&\ibl3n{-4}\qb3n\tqb3l\en% \bar%10 \Notes\ibl0b{-1}\qb0{c}\qb0{b}\qb0{c}\tqb0a&\cl l\ds\qp\sk&\ibl2o{-1}\qb2{o}\qb2{p}\qb2{o}\tqb2n&\ibl3o{-2}\qb3{o}\qb3{n}\qb3{m}\tqb3l\en% -\Notes\qa{.b}&\qa{m}&\ibl2m{-2}\qb2m&\ibl3j0\shake n\qb3{^k}\en -\notes\qqsk\sk\sk&\qqsk\sk\sk&\qqsk\tqb2l\sk&\qqsk\nbbl3\qb3{^j}\tqb3k\en -\Notes\hqsk\sk\qqsk\cl{^a}&\hqsk\qa{m}\qqsk\sk&\hqsk\cl{^k}\qqsk\ds&\hqsk\ibl3i8\qb3i\qqsk\tqb3{p}\en% +\Notes\tqsk\qa{.b}&\tqsk\qa{m}&\tqsk\ibl2m{-2}\qb2m&\tqsk\ibl3j0\shake n\qb3{^k}\en +\notes\tqsk\sk\sk&\tqsk\sk\sk&\tqsk\tqb2l\sk&\tqsk\nbbl3\qb3{^j}\tqb3k\en +\Notes\tqsk\sk\tqsk\cl{^a}&\tqsk\qa{m}\tqsk\sk&\tqsk\cl{^k}\tqsk\ds&\tqsk\ibl3i8\qb3i\tqsk\tqb3{p}\en% \bar%11 \Notes\qa{N}\sk\qa{N}\sk&\ibl1l0\qb1{n}\qb1{l}\qb1{n}\tqb1l&\qa{p}\sk\qa{p}\sk&\ibl3m0\qb3{l}\qb3{p}\qb3{l}\tqb3{p}\en% -\notes\qa{.a}\sk\sk\sk&\ibl1m{-1}\qb1{m}\sk\qb1{n}\sk&\qa{q}\sk\sk\sk&\ibbl3k2\qb3{^k}\qb3{l}\qb3{m}\tqb3n\en +\notes\tqsk\qa{.a}\sk\sk\sk&\tqsk\ibl1m{-1}\qb1{m}\sk\qb1{n}\sk&\tqsk\qa{q}\sk\sk\sk&\tqsk\ibbl3k2\qb3{^k}\qb3{l}\qb3{m}\tqb3n\en \Notes\sk&\qb1{m}&\qa{q}&\ibl3o{-2}\qb3o\en -\notes\qqsk\cl{^a}\sk&\qqsk\tqb1l\sk&\qqsk\sk\sk&\qqsk\nbbl3\qb3n\tqb3m\off{0.5\elemskip}\en% +\notes\tqsk\cl{^a}\sk&\tqsk\tqb1l\sk&\tqsk\sk\sk&\tqsk\nbbl3\qb3n\tqb3m\hqsk\en% \bar%12 \nspace -\Notes\qa b&\ibl1k2\qb1{^k}&\ibl2o{-1}\qb2p&\ibl3n{-2}\qb3n\en -\notes\sk\sk\tqsk\qa I\sk\sk\sk&\nbbl1\qb1l\tqb1m\tqsk\itied1i\qu i\sk\sk\sk&\qb2q\sk\tqsk\qb2p\sk\tqb2o\sk&\nbbl3\qb3m\tqb3l\tqsk\ibbl3k0\qb3{^k}\qb3{l}\qb3m\tqb3k\off{0.5\elemskip}\en% +\Notes\tqsk\qa b&\tqsk\ibl1k2\qb1{^k}&\tqsk\ibl2o{-1}\qb2p&\tqsk\ibl3n{-2}\qb3n\en +\notes\sk\sk\tqsk\qa I\sk\sk\sk&\nbbl1\qb1l\tqb1m\tqsk\itied1i\qu i\sk\sk\sk&\qb2q\sk\tqsk\qb2p\sk\tqb2o\sk&\nbbl3\qb3m\tqb3l\tqsk\ibbl3k0\qb3{^k}\qb3{l}\qb3m\tqb3k\hqsk\en% \Notes\qa{.L}&\ttie1\ibu1i0\qb1i&\ibl2n0\qb2n&\itieu3l\ha l\en \notes\sk\sk&\nbbu1\qb1h\tqh1i&\nbbl2\qb2m\tqb2n&\sk\sk\en \Notes\sk&\ibu1g2\qb1g&\cl l&\sk\en -\notes\qqsk\cl{=K}\sk&\qqsk\nbbu1\qb1h\tqh1i&\qqsk\ds\sk&\qqsk\sk\sk\off{0.5\elemskip}\en% +\notes\tqsk\cl{=K}\sk&\tqsk\nbbu1\qb1h\tqh1i&\tqsk\ds\sk&\tqsk\sk\sk\hqsk\en% \bar%13 \notes\qa{J}\sk\sk\sk\qa{c}\sk&\ibl1j2\qb1{j}\sk\qb1{k}\sk\qb1{l}\sk&\hp\sk\sk\sk\sk\sk&\ttie3\ibbl3k1\slur lku1\qb3{l}\qb3{k}\slur mlu1\qb3m\tqb3l\ibbl3m1\isluru3n\qb3n\tbbl3\tslur3m\qb3m\en \Notes\sk&\tqb1m&\sk&\tqb3o\en% \Notes\qa{.b}&\ibl1n{-1}\qb1n&\qa n&\qa{.k}\en \notes\sk\sk&\nbbl1\qb1m\tqb1l&\sk\sk&\sk\sk\en \Notes\sk&\cl k&\ibl2i{-5}\qb2n&\sk\en -\notes\ibbu0J{-2}\qb0J\tqh0I&\ds\sk&\tqb2g\sk&\ibbl3j2\qb3j\tqb3k\off{0.5\elemskip}\en% +\notes\ibbu0J{-2}\qb0J\tqh0I&\ds\sk&\tqb2g\sk&\ibbl3j2\qb3j\tqb3k\hqsk\en% \bar%14 \Notes\qa{.H}&\ds&\ibl2j1\qb2{.j}&\ibl3l2\qb3l\en \notes\sk\sk&\cu h\sk&\sk\tbbl2\tqb2k&\nbbl3\qb3m\tqb3n\en \Notes\sk&\ibu1e0\qb1e&\ibl2j{-2}\qb2j&\ibl3o{-2}\qb3o\en -\notes\ibbu0I2\qb0I\tqh0J&\nbbu1\qb1d\tqh1e&\tqb2i\sk&\tqb3n\sk\off{0.5\elemskip}\en% +\notes\ibbu0I2\qb0I\tqh0J&\nbbu1\qb1d\tqh1e&\tqb2i\sk&\tqb3n\sk\hqsk\en% \notes\qa{.K}\sk&\ibu1g1\qb1f\sk&\ibu2h1\qb2h\sk&\ibbl3m{-2}\shake{o}\qb3m\tbbl3\qb3l\en \Notes\sk\sk&\itied1g\tqh1g\ttie1\ibu1g{-1}\qb1g&\tqh2i\ibl2j2\qb2j&\tqb3k\ibu3i{-6}\qb3j\en -\notes\ibbu0J2\qb0J\tqh0K&\tqh1f\sk&\tqb2k\sk&\tqh3d\sk\off{0.5\elemskip}\en% +\notes\ibbu0J2\qb0J\tqh0K&\tqh1f\sk&\tqb2k\sk&\tqh3d\sk\hqsk\en% \bar%15 \Notes\ibu0I0\qb0{G}&\qa{d}&\ibu2i0\qb2i&\ibl3i0\qb3{i}\en \notes\qb0{H}\sk&\sk\sk&\nbbu2\qb2h\tqh2i&\qb3{j}\sk\en \Notes\qb0{I}\tqh0G&\qa{d}\sk&\cu g\ds&\qb3{k}\tqb3i\en% \Notes\qa{.J}&\qa{e}&\ds&\ibu3j{-2}\qb3{j}\en \notes\sk\sk&\sk\sk&\ibbl2l{-2}\qb2l\tqb2k&\qb3{i}\sk\en -\Notes\sk\qqsk\cu{^J}&\qa{e}\qqsk\sk&\ibl2j4\qb2j\qqsk\tqb2l&\qb3{h}\qqsk\tqh3g\en% +\Notes\sk\tqsk\cu{^J}&\qa{e}\tqsk\sk&\ibl2j4\qb2j\tqsk\tqb2l&\qb3{h}\tqsk\tqh3g\en% \bar%16 \notes\qa{K}\sk\sk\sk\qa{K}\sk&\ibu1g{1}\qb1{d}\sk\qb1{e}\sk\qb1{d}\sk&\ibbl2h1\qb2{h}\qb2{k}\qb2{j}\tqb2i\ibbl2j0\qb2j\tbbl2\qb2h&\ibu3f2\qb3f\sk\tqh3g\sk\ibu3h{-4}\qb3h\sk\en \Notes\sk&\tqh1j&\itieu2k\tqb2k&\tqh3f\en% diff --git a/Build/source/utils/autosp/configure b/Build/source/utils/autosp/configure index e6bb85ccaab..58bbd155777 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) 2017-06-21. +# Generated by GNU Autoconf 2.69 for autosp (TeX Live) 2017-07-14. # # 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='2017-06-21' -PACKAGE_STRING='autosp (TeX Live) 2017-06-21' +PACKAGE_VERSION='2017-07-14' +PACKAGE_STRING='autosp (TeX Live) 2017-07-14' 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) 2017-06-21 to adapt to many kinds of systems. +\`configure' configures autosp (TeX Live) 2017-07-14 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) 2017-06-21:";; + short | recursive ) echo "Configuration of autosp (TeX Live) 2017-07-14:";; 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 2017-06-21 +autosp (TeX Live) configure 2017-07-14 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 2017-06-21, which was +It was created by autosp (TeX Live) $as_me 2017-07-14, 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='2017-06-21' + VERSION='2017-07-14' 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 2017-06-21, which was +This file was extended by autosp (TeX Live) $as_me 2017-07-14, 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 2017-06-21 +autosp (TeX Live) config.status 2017-07-14 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 043deab40fc..d3e91db538a 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], [2017-06-21])[]dnl using unmodified autosp source +m4_define([autosp_version], [2017-07-14])[]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]) |