texlive[53498] Build/source/utils: autosp 2019-12-22
commits+kakuto at tug.org
commits+kakuto at tug.org
Thu Jan 23 04:53:58 CET 2020
Revision: 53498
http://tug.org/svn/texlive?view=revision&revision=53498
Author: kakuto
Date: 2020-01-23 04:53:58 +0100 (Thu, 23 Jan 2020)
Log Message:
-----------
autosp 2019-12-22
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/install-sh
trunk/Build/source/utils/autosp/autosp-src/process_command.c
trunk/Build/source/utils/autosp/autosp-src/process_score.c
trunk/Build/source/utils/autosp/autosp-src/process_score.h
trunk/Build/source/utils/autosp/autosp-src/spacing_note.c
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/tests/quod4.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 2020-01-23 00:54:24 UTC (rev 53497)
+++ trunk/Build/source/utils/README 2020-01-23 03:53:58 UTC (rev 53498)
@@ -9,7 +9,7 @@
see http://tug.org/texlive/build.html#asymptote
and tlpkg/bin/tl-update-asy
-autosp 2019-08-26 - checked 29aug19
+autosp 2019-12-22 - checked 23jan20
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 2020-01-23 00:54:24 UTC (rev 53497)
+++ trunk/Build/source/utils/autosp/ChangeLog 2020-01-23 03:53:58 UTC (rev 53498)
@@ -1,3 +1,8 @@
+2020-01-23 Akira Kakuto <kakuto at w32tex.org>
+
+ * Import autosp-2019-12-22.
+ configure.ac: Adapted.
+
2019-08-29 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
* Import autosp-2019-08-26.
Modified: trunk/Build/source/utils/autosp/TLpatches/ChangeLog
===================================================================
--- trunk/Build/source/utils/autosp/TLpatches/ChangeLog 2020-01-23 00:54:24 UTC (rev 53497)
+++ trunk/Build/source/utils/autosp/TLpatches/ChangeLog 2020-01-23 03:53:58 UTC (rev 53498)
@@ -1,3 +1,8 @@
+2020-01-23 Akira Kakuto <kakuto at w32tex.org>
+
+ Import autosp-2019-12-22.
+ * patch-01-binary-write: Adapt.
+
2019-08-29 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
Import autosp-2019-08-26.
Modified: trunk/Build/source/utils/autosp/TLpatches/patch-01-binary-write
===================================================================
--- trunk/Build/source/utils/autosp/TLpatches/patch-01-binary-write 2020-01-23 00:54:24 UTC (rev 53497)
+++ trunk/Build/source/utils/autosp/TLpatches/patch-01-binary-write 2020-01-23 03:53:58 UTC (rev 53498)
@@ -1,6 +1,6 @@
-diff -ur autosp-2019-08-26/autosp.c autosp-src/autosp.c
---- autosp-2019-08-26/autosp.c Mon Aug 26 20:33:06 2019
-+++ autosp-src/autosp.c Thu Aug 29 08:52:49 2019
+diff -ur autosp-2019-12-22/autosp.c autosp-src/autosp.c
+--- autosp-2019-12-22/autosp.c Mon Dec 23 05:43:59 2019
++++ autosp-src/autosp.c Thu Jan 23 12:32:48 2020
@@ -183,7 +183,7 @@
}
else
@@ -19,9 +19,9 @@
if (logfile == NULL)
{ printf ("Can't open %s\n", logfilename);
exit (EXIT_FAILURE);
-diff -ur autosp-2019-08-26/rebar.c autosp-src/rebar.c
---- autosp-2019-08-26/rebar.c Tue Jan 08 22:28:27 2019
-+++ autosp-src/rebar.c Thu Aug 29 08:53:39 2019
+diff -ur autosp-2019-12-22/rebar.c autosp-src/rebar.c
+--- autosp-2019-12-22/rebar.c Tue Jan 08 22:28:27 2019
++++ autosp-src/rebar.c Thu Jan 23 12:33:20 2020
@@ -264,7 +264,7 @@
else
append (outfilename, &outfilename_n, ".aspc", sizeof (outfilename));
@@ -31,15 +31,15 @@
if (outfile == NULL)
{ fprintf (stderr,"Can't open %s\n", outfilename);
exit (EXIT_FAILURE);
-diff -ur autosp-2019-08-26/spacing_note.c autosp-src/spacing_note.c
---- autosp-2019-08-26/spacing_note.c Wed May 16 22:35:31 2018
-+++ autosp-src/spacing_note.c Thu Aug 29 08:56:07 2019
+diff -ur autosp-2019-12-22/spacing_note.c autosp-src/spacing_note.c
+--- autosp-2019-12-22/spacing_note.c Wed May 16 22:35:31 2018
++++ autosp-src/spacing_note.c Thu Jan 23 12:35:52 2020
@@ -30,7 +30,7 @@
update_global_skip (n);
/* commas will be discarded by filter_output (i) */
if (*s == '.' && new_beaming == 0 && !dottedbeamnotes)
- spacing = spacing * 1.50;
-+ spacing = (int)(spacing * 1.50);
++ spacing = (int)(spacing * 1.50);
else if ( (*s == '^' || *s == '_' || *s == '=' || *s == '>')
&& !vspacing_active[i] /* is additional spacing needed? */
)
@@ -61,230 +61,9 @@
t = strpbrk (s+1, "{\\&|$"); /* collective coding? */
if (*t == '{') /* {...} */
-diff -ur autosp-2019-08-26/tests/quod2.tex autosp-src/tests/quod2.tex
---- autosp-2019-08-26/tests/quod2.tex Tue Jan 08 22:33:02 2019
-+++ autosp-src/tests/quod2.tex Thu Aug 29 10:11:18 2019
-@@ -1,4 +1,4 @@
--% Generated by autosp (2019-01-08).
-+% Generated by autosp (2019-08-26).
- \input musixtex
- \input musixplt
- \input soul.sty
-@@ -42,105 +42,202 @@
- \staffbotmarg=3.0\Interligne%
- \startpiece\addspace\afterruleskip%
- \systemnumbers%
-+\scale\normalvalue
- \Notes\ds&\cu d&\ds&\ds\en%
- \bar%1
-+\scale\normalvalue
- \Notes\ha N\sk\sk\sk&\ibu1g2\qb1{g}\qb1{h}\qb1{i}\tqh1j&&\hp\sk\sk\sk\en%
-+\scale\normalvalue
- \Notes\ha M&\ibl1k{-2}\qb1k&&\qp\en
-+\scale\normalvalue
- \notes\sk\sk&\nbbl1\qb1j\tqb1i&&\sk\sk\en
-+\scale\normalvalue
- \Notes\sk&\ibu1h0\qb1h&&\ds\en
-+\scale\normalvalue
- \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%
-+\scale\normalvalue
-+\Notes\ha L\sk&\ibu1i{-2}\qb1i\tqh1h&\qa{n}\sk&\ibu3g2\qb3{g}\qb3{h}\en
-+\scale\normalvalue
-+\Notes\sk\sk&\itied1g\qa g\sk&\qa{n}\sk&\qb3{i}\tqh3j\en%
-+\scale\normalvalue
- \Notes\qa{.K}&\ttie1\qa g&\qa o&\ibl3k{-2}\qb3k\en
-+\scale\normalvalue
- \notes\sk\sk&\sk\sk&\sk\sk&\nbbl3\qb3j\tqb3i\en
-+\scale\normalvalue
- \Notes\sk&\ibu1f0\shake{n}\qb1f&\cl o&\cu h\en
-+\scale\normalvalue
- \notes\cu J\sk&\nbbu1\qb1e\tqh1f&\ds\sk&\ds\sk\hqsk\en%
- \bar%3
--\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%
-+\scale\normalvalue
-+\Notes\hu I\sk&\qa g\sk&\ibl2n{-1}\qb2{n}\qb2{o}&\qa{k}\sk\en
-+\scale\normalvalue
-+\Notes\sk\tqsk\sk&\ds\tqsk\cl k&\qb2{n}\tqsk\tqb2{=m}&\qa{k}\tqsk\sk\en%
-+\scale\normalvalue
- \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
-+\scale\normalvalue
- \Notes\ha K\sk&\itied1f\shake{n}\qa f\sk&\ibl2o{-1}\qb2{o}\qb2{n}&\ibl3k{-1}\qb3{k}\qb3{l}\en
-+\scale\normalvalue
- \notes\sk\sk&\ttie1\ibbu1e{-2}\qb1f\tbbu1\qb1e&\qb2{o}\sk&\qb3{k}\sk\en
-+\scale\normalvalue
- \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
-+\scale\normalvalue
-+\Notes\qa G\sk&\ttie1\qa d\sk&\ibl2n{-2}\qb2n\tqb2m&\ibu3h{-2}\shake{p}\qb3i\tqh3h\en
-+\scale\normalvalue
-+\Notes\ds&\qp&\ibl2n{-5}\qb2n&\qa g\en
-+\scale\normalvalue
- \notes\ibbl0b{-1}\qb0b\tqb0a&\sk\sk&\tqb2k\sk&\sk\sk\hqsk\en%
- \bar%5
-+\scale\normalvalue
- \Notes\ibl0M0\qb0N&\qa{n}&\ibl2n2\qb2{n}&\hp\en
-+\scale\normalvalue
- \notes\nbbl0\qb0M\tqb0N&\sk\sk&\qb2{o}\sk&\sk\sk\en
-+\scale\normalvalue
- \Notes\ibl0K0\qb0L&\qa{n}&\qb2{p}&\sk\en
-+\scale\normalvalue
- \notes\nbbl0\qb0K\tqb0L&\sk\sk&\tqb2q\sk&\sk\sk\hqsk\en%
-+\scale\normalvalue
- \Notes\qa{.M}&\qa{o}&\ibl2r{-2}\qb2r&\qp\en
-+\scale\normalvalue
- \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%
-+\scale\normalvalue
-+\Notes\sk&\qa{o}&\ibl2o6\qb2o&\ds\en
-+\scale\normalvalue
-+\Notes\cu I&\sk&\itieu2r\tqb2r&\cl k\en%
- \bar%6
-+\scale\normalvalue
- \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
-+\scale\normalvalue
- \notes\ibbl0M2\qb0M\tqb0N&\tqb1m\sk&\sk\sk&\tqb3k\sk\hqsk\en%
-+\scale\normalvalue
- \Notes\tqsk\itieu0a\qa a&\tqsk\ibl1l{-2}\qb1l&\tqsk\qa{.o}&\tqsk\shake{n}\ibl3i0\qb3{^j}\en
--\notes\sk\sk\ttie0\ibbl0a{-2}\qb0{a}\qb0{N}\qb0{M}\tqsk\tqb0L&\tqb1k\sk\cl{^j}\sk\ds\tqsk\sk&\sk\sk\sk\sk\ibbl2i2\qb2i\tqsk\tqb2{^j}&\nbbl3\qb3i\tqb3j\cu h\sk\ds\tqsk\sk\hqsk\en%
-+\scale\normalvalue
-+\notes\sk\sk&\tqb1k\sk&\sk\sk&\nbbl3\qb3i\tqb3j\en
-+\scale\normalvalue
-+\notes\ttie0\ibbl0a{-2}\qb0{a}\qb0{N}\qb0{M}\tqsk\tqb0L&\cl{^j}\sk\ds\tqsk\sk&\sk\sk\ibbl2i2\qb2i\tqsk\tqb2{^j}&\cu h\sk\ds\tqsk\sk\hqsk\en%
- \bar%7
-+\scale\normalvalue
- \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%
-+\scale\normalvalue
- \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
-+\scale\normalvalue
- \Notes\tqsk\qu{.H}&\tqsk\ibu1c4\qb1{^c}&\tqsk\ibl2l{-1}\qb2{.l}&\tqsk\ibu3h{0}\qb3{h}\en
-+\scale\normalvalue
- \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
-+\scale\normalvalue
- \Notes\cu{^J}&\itied1h\tqh1h&\itieu2l\tqb2l&\tqh3g\en%
-+\scale\normalvalue
- \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
-+\scale\normalvalue
- \Notes\cl K&\cu f&\cl k&\cu d\en%
- \leftrightrepeat
- \advance\barno-1%
-+\scale\normalvalue
- \Notes\ds&\cl m&\ds&\cl o\en%
- \bar%9
-+\scale\normalvalue
- \Notes\qa{d}\sk\qa{c}\sk&\ibl1k0\qb1{k}\qb1{m}\qb1{k}\tqb1{m}&\qa{o}\sk\qa{o}\sk&\ibl3m0\qb3{m}\qb3{o}\qb3{m}\tqb3o\en%
-+\scale\normalvalue
- \Notes\qa{b}&\ibl1k0\qb1{n}&\qa{p}&\ibl3k2\qb3k\en
-+\scale\normalvalue
- \notes\sk\sk&\qb1{k}\sk&\sk\sk&\nbbl3\qb3l\tqb3m\en
-+\scale\normalvalue
- \Notes\qa{N}\sk&\qb1{k}\tqb1n&\qa{p}\sk&\ibl3n{-4}\qb3n\tqb3l\en%
- \bar%10
-+\scale\normalvalue
- \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%
-+\scale\normalvalue
- \Notes\tqsk\qa{.b}&\tqsk\qa{m}&\tqsk\ibl2m{-2}\qb2m&\tqsk\ibl3j0\shake n\qb3{^k}\en
-+\scale\normalvalue
- \notes\tqsk\sk\sk&\tqsk\sk\sk&\tqsk\tqb2l\sk&\tqsk\nbbl3\qb3{^j}\tqb3k\en
--\Notes\sk\cl{^a}&\qa{m}\sk&\cl{^k}\ds&\ibl3i8\qb3i\tqb3{p}\en%
-+\scale\normalvalue
-+\Notes\sk&\qa{m}&\cl{^k}&\ibl3i8\qb3i\en
-+\scale\normalvalue
-+\Notes\cl{^a}&\sk&\ds&\tqb3{p}\en%
- \bar%11
-+\scale\normalvalue
- \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%
-+\scale\normalvalue
- \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
-+\scale\normalvalue
- \Notes\sk&\qb1{m}&\qa{q}&\ibl3o{-2}\qb3o\en
-+\scale\normalvalue
- \notes\cl{^a}\sk&\tqb1l\sk&\sk\sk&\nbbl3\qb3n\tqb3m\hqsk\en%
- \bar%12
- \nspace
-+\scale\normalvalue
- \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%
-+\scale\normalvalue
-+\notes\sk\sk&\nbbl1\qb1l\tqb1m&\qb2q\sk&\nbbl3\qb3m\tqb3l\en
-+\scale\normalvalue
-+\notes\tqsk\qa I\sk\sk\sk&\tqsk\itied1i\qu i\sk\sk\sk&\tqsk\qb2p\sk\tqb2o\sk&\tqsk\ibbl3k0\qb3{^k}\qb3{l}\qb3m\tqb3k\hqsk\en%
-+\scale\normalvalue
- \Notes\qa{.L}&\ttie1\ibu1i0\qb1i&\ibl2n0\qb2n&\itieu3l\ha l\en
-+\scale\normalvalue
- \notes\sk\sk&\nbbu1\qb1h\tqh1i&\nbbl2\qb2m\tqb2n&\sk\sk\en
-+\scale\normalvalue
- \Notes\sk&\ibu1g2\qb1g&\cl l&\sk\en
-+\scale\normalvalue
- \notes\cl{=K}\sk&\nbbu1\qb1h\tqh1i&\ds\sk&\sk\sk\hqsk\en%
- \bar%13
-+\scale\normalvalue
- \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
-+\scale\normalvalue
- \Notes\sk&\tqb1m&\sk&\tqb3o\en%
-+\scale\normalvalue
- \Notes\qa{.b}&\ibl1n{-1}\qb1n&\qa n&\qa{.k}\en
-+\scale\normalvalue
- \notes\sk\sk&\nbbl1\qb1m\tqb1l&\sk\sk&\sk\sk\en
-+\scale\normalvalue
- \Notes\sk&\cl k&\ibl2i{-5}\qb2n&\sk\en
-+\scale\normalvalue
- \notes\ibbu0J{-2}\qb0J\tqh0I&\ds\sk&\tqb2g\sk&\ibbl3j2\qb3j\tqb3k\hqsk\en%
- \bar%14
-+\scale\normalvalue
- \Notes\qa{.H}&\ds&\ibl2j1\qb2{.j}&\ibl3l2\qb3l\en
--\notes\sk\sk&\cu h\sk&\sk\tbbl2\tqb2k&\nbbl3\qb3m\tqb3n\en
-+\scale\normalvalue
-+\notes\sk&\cu h&\sk&\nbbl3\qb3m\en
-+\scale\normalvalue
-+\notes\sk&\sk&\tbbl2\tqb2k&\tqb3n\en
-+\scale\normalvalue
- \Notes\sk&\ibu1e0\qb1e&\ibl2j{-2}\qb2j&\ibl3o{-2}\qb3o\en
-+\scale\normalvalue
- \notes\ibbu0I2\qb0I\tqh0J&\nbbu1\qb1d\tqh1e&\tqb2i\sk&\tqb3n\sk\hqsk\en%
-+\scale\normalvalue
- \notes\qa{.K}\sk&\ibu1g1\qb1f\sk&\ibu2h1\qb2h\sk&\ibbl3m{-2}\shake{o}\qb3m\tbbl3\qb3l\en
-+\scale\normalvalue
- \Notes\sk\sk&\itied1g\tqh1g\ttie1\ibu1g{-1}\qb1g&\tqh2i\ibl2j2\qb2j&\tqb3k\ibu3i{-6}\qb3j\en
-+\scale\normalvalue
- \notes\ibbu0J2\qb0J\tqh0K&\tqh1f\sk&\tqb2k\sk&\tqh3d\sk\hqsk\en%
- \bar%15
-+\scale\normalvalue
- \Notes\ibu0I0\qb0{G}&\qa{d}&\ibu2i0\qb2i&\ibl3i0\qb3{i}\en
-+\scale\normalvalue
- \notes\qb0{H}\sk&\sk\sk&\nbbu2\qb2h\tqh2i&\qb3{j}\sk\en
-+\scale\normalvalue
- \Notes\qb0{I}\tqh0G&\qa{d}\sk&\cu g\ds&\qb3{k}\tqb3i\en%
-+\scale\normalvalue
- \Notes\qa{.J}&\qa{e}&\ds&\ibu3j{-2}\qb3{j}\en
-+\scale\normalvalue
- \notes\sk\sk&\sk\sk&\ibbl2l{-2}\qb2l\tqb2k&\qb3{i}\sk\en
--\Notes\sk\cu{^J}&\qa{e}\sk&\ibl2j4\qb2j\tqb2l&\qb3{h}\tqh3g\en%
-+\scale\normalvalue
-+\Notes\sk&\qa{e}&\ibl2j4\qb2j&\qb3{h}\en
-+\scale\normalvalue
-+\Notes\cu{^J}&\sk&\tqb2l&\tqh3g\en%
- \bar%16
-+\scale\normalvalue
- \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
-+\scale\normalvalue
- \Notes\sk&\tqh1j&\itieu2k\tqb2k&\tqh3f\en%
-+\scale\normalvalue
- \Notes\qa N&\ibu1i{-2}\qb1i&\ttie2\ibl2j0\qb2k&\qa g\en
-+\scale\normalvalue
- \notes\sk\sk&\tqh1h\sk&\nbbl2\qb2j\tqb2k&\sk\sk\en
-+\scale\normalvalue
- \Notes\cu G&\cu g&\cl i&\cu g\en%
- \setrightrepeat
- \endpiece%
-diff -ur autosp-2019-08-26/tex2aspc.c autosp-src/tex2aspc.c
---- autosp-2019-08-26/tex2aspc.c Wed Feb 13 07:13:26 2019
-+++ autosp-src/tex2aspc.c Thu Aug 29 08:56:48 2019
+diff -ur autosp-2019-12-22/tex2aspc.c autosp-src/tex2aspc.c
+--- autosp-2019-12-22/tex2aspc.c Wed Aug 28 20:34:53 2019
++++ autosp-src/tex2aspc.c Thu Jan 23 12:38:10 2020
@@ -342,7 +342,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 2020-01-23 00:54:24 UTC (rev 53497)
+++ trunk/Build/source/utils/autosp/autosp-src/ChangeLog 2020-01-23 03:53:58 UTC (rev 53498)
@@ -1,5 +1,9 @@
AUTOSP
+2019-12-22
+
+ correct \setsize note scaling using instr_numsize in generate_notes
+
2019-08-26
scale notes when \setsize instrument has the spacing staff
Modified: trunk/Build/source/utils/autosp/autosp-src/README
===================================================================
--- trunk/Build/source/utils/autosp/autosp-src/README 2020-01-23 00:54:24 UTC (rev 53497)
+++ trunk/Build/source/utils/autosp/autosp-src/README 2020-01-23 03:53:58 UTC (rev 53498)
@@ -1,5 +1,5 @@
This is the README for the autosp package,
-version 2019-01-08.
+version 2019-08-27.
autosp is a preprocessor that generates note-spacing
commands for MusiXTeX scores. It simplifies the creation
@@ -64,6 +64,8 @@
and dots) is handled by expanding the sequence into a
sequence of individual note commands.
+autosp scales notes by the relevant instrument-size value.
+
Limitations
Appoggiaturas and grace notes are recognized by the use of
Modified: trunk/Build/source/utils/autosp/autosp-src/autosp.1
===================================================================
--- trunk/Build/source/utils/autosp/autosp-src/autosp.1 2020-01-23 00:54:24 UTC (rev 53497)
+++ trunk/Build/source/utils/autosp/autosp-src/autosp.1 2020-01-23 03:53:58 UTC (rev 53498)
@@ -1,5 +1,5 @@
.\" This manpage is licensed under the GNU Public License
-.TH AUTOSP 1 2018-02-14 "" ""
+.TH AUTOSP 1 2019-08-27 "" ""
.SH NAME
autosp \- preprocessor to generate note-spacing commands for MusiXTeX scores
@@ -185,6 +185,9 @@
by expanding the sequence
into a sequence of individual note commands.
+
+.B autosp
+scales notes by the relevant instrument-size value.
.SH LIMITATIONS
Modified: trunk/Build/source/utils/autosp/autosp-src/autosp.c
===================================================================
--- trunk/Build/source/utils/autosp/autosp-src/autosp.c 2020-01-23 00:54:24 UTC (rev 53497)
+++ trunk/Build/source/utils/autosp/autosp-src/autosp.c 2020-01-23 03:53:58 UTC (rev 53498)
@@ -1,4 +1,4 @@
-char version[12] = "2019-08-26";
+char version[12] = "2019-12-22";
/* Copyright (C) 2014-19 R. D. Tennent School of Computing,
* Queen's University, rdt at cs.queensu.ca
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 2020-01-23 00:54:24 UTC (rev 53497)
+++ trunk/Build/source/utils/autosp/autosp-src/configure.ac 2020-01-23 03:53:58 UTC (rev 53498)
@@ -1,5 +1,5 @@
AC_PREREQ(2.63)
-AC_INIT([autosp],[2019-08-26],[rdt at cs.queensu.ca])
+AC_INIT([autosp],[2019-12-22],[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/install-sh
===================================================================
(Binary files differ)
Modified: trunk/Build/source/utils/autosp/autosp-src/process_command.c
===================================================================
--- trunk/Build/source/utils/autosp/autosp-src/process_command.c 2020-01-23 00:54:24 UTC (rev 53497)
+++ trunk/Build/source/utils/autosp/autosp-src/process_command.c 2020-01-23 03:53:58 UTC (rev 53498)
@@ -11,6 +11,7 @@
and initialize terminator[i] etc. */
{
int i; char *s; char *t;
+ int instr=1;
int newlines = 0;
s = *ln+1; /* skip "/" */
while (isalpha(*s)) {s++;} /* skip rest of the initial command */
@@ -52,6 +53,8 @@
if (tt == NULL) error ("can't parse note-spacing command.");
s = tt;
terminator[i] = *s;
+ staff_instr[i] = instr;
+ if (terminator[i] == '&') instr++;
if (*s != '$') s++;
}
lineno = lineno + newlines;
@@ -212,7 +215,7 @@
}
void initialize_notes ()
-{ int i; int instrument = 0; int staff = 0;
+{ int i;
if (debug)
{ fprintf (logfile, "\nEntering initialize_notes\n");
status_all ();
@@ -221,13 +224,10 @@
output_rests ();
fprintf (outfile, "\\scale");
- do /* determine instrument for spacing_staff */
- {
- instrument++;
- staff = staff + staffs[instrument];
- }
- while (staff < spacing_staff );
- fprintf (outfile, "%s\n", instrument_size[instrument]);
+ if (debug)
+ fprintf (logfile, "spacing_staff = %i, staff_instr[spacing_staff] = %i, instrument_size[staff_instr[spacing_staff]] = %s\n",
+ spacing_staff, staff_instr[spacing_staff], instrument_size[staff_instr[spacing_staff]]);
+ fprintf (outfile, "%s\n", instrument_size[staff_instr[spacing_staff]]);
oldspacing_staff = spacing_staff;
if (spacing == MAX_SPACING)
@@ -411,7 +411,10 @@
spacing = spacings[i];
spacing_staff = i;
}
- else if (spacings[i] == spacing && vspacing[spacing_staff] > 0)
+ else if (spacings[i] == spacing &&
+ (vspacing[spacing_staff] > 0 ||
+ /* for staffs with equal spacing, use the one with larger instrument size */
+ instr_numsize[staff_instr[i]] > instr_numsize[staff_instr[spacing_staff]]))
spacing_staff = i;
}
if (appoggiatura)
@@ -519,7 +522,28 @@
}
*p = '\0';
if (debug)
+ {
fprintf (logfile, "instrument_size[%d] = %s\n", n, instrument_size[n]);
+ fflush (logfile);
+ }
+ /* determine numerical instrument size to allow numerical comparison */
+ if (prefix ("\\normalvalue", instrument_size[n]))
+ instr_numsize[n] = 1.0;
+ else if (prefix ("\\smallvalue", instrument_size[n]))
+ instr_numsize[n] = 0.8;
+ else if (prefix ("\\tinyvalue", instrument_size[n]))
+ instr_numsize[n] = 0.64;
+ else if (prefix ("\\largevalue", instrument_size[n]))
+ instr_numsize[n] = 1.2;
+ else if (prefix ("\\Largevalue", instrument_size[n]))
+ instr_numsize[n] = 1.44;
+ else
+ error ("\\setsize argument unreadable.");
+ if (debug)
+ {
+ fprintf (logfile, "instr_numsize[%d] = %f\n", n, instr_numsize[n]);
+ fflush (logfile);
+ }
while (*ln <= s) { putc (**ln, outfile); (*ln)++;}
}
Modified: trunk/Build/source/utils/autosp/autosp-src/process_score.c
===================================================================
--- trunk/Build/source/utils/autosp/autosp-src/process_score.c 2020-01-23 00:54:24 UTC (rev 53497)
+++ trunk/Build/source/utils/autosp/autosp-src/process_score.c 2020-01-23 03:53:58 UTC (rev 53498)
@@ -25,6 +25,7 @@
active[i] = true;
bar_rest[i] = false;
append (instrument_size[i], NULL, "\\normalvalue", SHORT_LEN);
+ instr_numsize[i] = 1.0;
}
spacing = MAX_SPACING;
restbars = 0;
Modified: trunk/Build/source/utils/autosp/autosp-src/process_score.h
===================================================================
--- trunk/Build/source/utils/autosp/autosp-src/process_score.h 2020-01-23 00:54:24 UTC (rev 53497)
+++ trunk/Build/source/utils/autosp/autosp-src/process_score.h 2020-01-23 03:53:58 UTC (rev 53498)
@@ -22,6 +22,9 @@
bool TransformNotesDefined;
char instrument_size[MAX_STAFFS][SHORT_LEN];
/* instrument size as set by setsize or by default ("\\@one") */
+float instr_numsize[MAX_STAFFS];
+ /* nummerical intrument size */
+int staff_instr[MAX_STAFFS]; /* instrument for each staff */
char line[LINE_LEN]; /* line of input */
Modified: trunk/Build/source/utils/autosp/autosp-src/spacing_note.c
===================================================================
--- trunk/Build/source/utils/autosp/autosp-src/spacing_note.c 2020-01-23 00:54:24 UTC (rev 53497)
+++ trunk/Build/source/utils/autosp/autosp-src/spacing_note.c 2020-01-23 03:53:58 UTC (rev 53498)
@@ -30,7 +30,7 @@
update_global_skip (n);
/* commas will be discarded by filter_output (i) */
if (*s == '.' && new_beaming == 0 && !dottedbeamnotes)
- spacing = (int)(spacing * 1.50);
+ spacing = (int)(spacing * 1.50);
else if ( (*s == '^' || *s == '_' || *s == '=' || *s == '>')
&& !vspacing_active[i] /* is additional spacing needed? */
)
Modified: trunk/Build/source/utils/autosp/autosp-src/tests/quod2.tex
===================================================================
--- trunk/Build/source/utils/autosp/autosp-src/tests/quod2.tex 2020-01-23 00:54:24 UTC (rev 53497)
+++ trunk/Build/source/utils/autosp/autosp-src/tests/quod2.tex 2020-01-23 03:53:58 UTC (rev 53498)
@@ -1,4 +1,4 @@
-% Generated by autosp (2019-08-26).
+% Generated by autosp (2019-12-22).
\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 2020-01-23 00:54:24 UTC (rev 53497)
+++ trunk/Build/source/utils/autosp/autosp-src/tests/quod4.aspc 2020-01-23 03:53:58 UTC (rev 53498)
@@ -42,6 +42,7 @@
\staffbotmarg=3.0\Interligne%
\startpiece\addspace\afterruleskip%
\systemnumbers%
+\scale\normalvalue
\anotes
\ds&
\cu d&
@@ -48,43 +49,195 @@
\ds&
\ds\en
\bar%1
+\scale\normalvalue
\anotes
- \ha N\sk\sk\sk\ha M\sk\sk\sk\sk\sk&
- \ibu1g2\qb1{g}\qb1{h}\qb1{i}\tqh1j\ibl1k{-2}\qb1k\nbbl1\qb1j\tqb1i\ibu1h0\qb1h\nbbu1\qb1g\tqh1h&
+ \ha N\sk\sk\sk\ha M&
+ \ibu1g2\qb1{g}\qb1{h}\qb1{i}\tqh1j\ibl1k{-2}\qb1k&
&
- \hp\sk\sk\sk\qp\sk\sk\ds\cu d\sk\hqsk\en
+ \hp\sk\sk\sk\qp\en
+\scale\normalvalue
+\anotes
+ \sk\sk&
+ \nbbl1\qb1j\tqb1i&
+ &
+ \sk\sk\en
+\scale\normalvalue
+\anotes
+ \sk&
+ \ibu1h0\qb1h&
+ &
+ \ds\en
+\scale\normalvalue
+\anotes
+ \sk\sk&
+ \nbbu1\qb1g\tqh1h&
+ &
+ \cu d\sk\hqsk\hqsk\en
\def\atnextbar{\znotes&&\centerpause&\en}%
+%
\bar%2
+\scale\normalvalue
\anotes
- \ha L\sk\sk\sk\qa{.K}\sk\sk\sk\cu J\sk&
- \ibu1i{-2}\qb1i\tqh1h\itied1g\qa g\sk\ttie1\qa g\sk\sk\ibu1f0\shake{n}\qb1f\nbbu1\qb1e\tqh1f&
- \qa{n}\sk\qa{n}\sk\qa o\sk\sk\cl o\ds\sk&
- \ibu3g2\qb3{g}\qb3{h}\qb3{i}\tqh3j\ibl3k{-2}\qb3k\nbbl3\qb3j\tqb3i\cu h\ds\sk\hqsk\en
+ \ha L\sk&
+ \ibu1i{-2}\qb1i\tqh1h&
+ \qa{n}\sk&
+ \ibu3g2\qb3{g}\qb3{h}\en
+\scale\normalvalue
+\anotes
+ \sk\sk\qa{.K}&
+ \itied1g\qa g\sk\ttie1\qa g&
+ \qa{n}\sk\qa o&
+ \qb3{i}\tqh3j\ibl3k{-2}\qb3k\en
+\scale\normalvalue
+\anotes
+ \sk\sk&
+ \sk\sk&
+ \sk\sk&
+ \nbbl3\qb3j\tqb3i\en
+\scale\normalvalue
+\anotes
+ \sk&
+ \ibu1f0\shake{n}\qb1f&
+ \cl o&
+ \cu h\en
+\scale\normalvalue
+\anotes
+ \cu J\sk&
+ \nbbu1\qb1e\tqh1f&
+ \ds\sk&
+ \ds\sk\hqsk\hqsk\en
\bar%3
+\scale\normalvalue
\anotes
- \hu I\sk\sk\tqsk\sk\hu J\sk\sk\sk&
- \qa g\sk\ds\tqsk\cl k\ibu1j{-2}\qb1{j}\qb1{i}\qb1h\tqh1g&
- \ibl2n{-1}\qb2{n}\qb2{o}\qb2{n}\tqsk\tqb2{=m}\ibl2j{0}\qb2{l}\qb2{k}\qb2j\tqb2p&
- \qa{k}\sk\qa{k}\tqsk\sk\qa{l}\sk\qa{l}\sk\en
+ \hu I\sk&
+ \qa g\sk&
+ \ibl2n{-1}\qb2{n}\qb2{o}&
+ \qa{k}\sk\en
+\scale\normalvalue
+\anotes
+ \sk\tqsk\sk\tqsk\hu J\sk\sk\sk&
+ \ds\tqsk\tqsk\cl k\ibu1j{-2}\qb1{j}\qb1{i}\qb1h\tqh1g&
+ \qb2{n}\tqsk\tqsk\tqb2{=m}\ibl2j{0}\qb2{l}\qb2{k}\qb2j\tqb2p&
+ \qa{k}\tqsk\sk\tqsk\qa{l}\sk\qa{l}\sk\en
\bar%4
+\scale\normalvalue
\anotes
- \ha K\sk\sk\sk\sk\qa G\sk\ds\ibbl0b{-1}\qb0b\tqb0a&
- \itied1f\shake{n}\qa f\sk\ttie1\ibbu1e{-2}\qb1f\tbbu1\qb1e\itied1d\tqh1d\ttie1\qa d\sk\qp\sk\sk&
- \ibl2o{-1}\qb2{o}\qb2{n}\qb2{o}\sk\tqb2m\ibl2n{-2}\qb2n\tqb2m\ibl2n{-5}\qb2n\tqb2k\sk&
- \ibl3k{-1}\qb3{k}\qb3{l}\qb3{k}\sk\tqb3j\ibu3h{-2}\shake{p}\qb3i\tqh3h\qa g\sk\sk\hqsk\en
+ \ha K\sk&
+ \itied1f\shake{n}\qa f\sk&
+ \ibl2o{-1}\qb2{o}\qb2{n}&
+ \ibl3k{-1}\qb3{k}\qb3{l}\en
+\scale\normalvalue
+\anotes
+ \sk\sk&
+ \ttie1\ibbu1e{-2}\qb1f\tbbu1\qb1e&
+ \qb2{o}\sk&
+ \qb3{k}\sk\en
+\scale\normalvalue
+\anotes
+ \sk&
+ \itied1d\tqh1d&
+ \tqb2m&
+ \tqb3j\en
+\scale\normalvalue
+\anotes
+ \qa G\sk&
+ \ttie1\qa d\sk&
+ \ibl2n{-2}\qb2n\tqb2m&
+ \ibu3h{-2}\shake{p}\qb3i\tqh3h\en
+\scale\normalvalue
+\anotes
+ \ds&
+ \qp&
+ \ibl2n{-5}\qb2n&
+ \qa g\en
+\scale\normalvalue
+\anotes
+ \ibbl0b{-1}\qb0b\tqb0a&
+ \sk\sk&
+ \tqb2k\sk&
+ \sk\sk\hqsk\hqsk\en
\bar%5
+\scale\normalvalue
\anotes
- \ibl0M0\qb0N\nbbl0\qb0M\tqb0N\ibl0K0\qb0L\nbbl0\qb0K\tqb0L\qa{.M}\sk\sk\sk\cu I&
- \qa{n}\sk\sk\qa{n}\sk\sk\qa{o}\sk\sk\qa{o}\sk&
- \ibl2n2\qb2{n}\qb2{o}\sk\qb2{p}\tqb2q\sk\ibl2r{-2}\qb2r\nbbl2\qb2q\tqb2p\ibl2o6\qb2o\itieu2r\tqb2r&
- \hp\sk\sk\sk\sk\sk\hqsk\qp\sk\sk\ds\cl k\en
+ \ibl0M0\qb0N&
+ \qa{n}&
+ \ibl2n2\qb2{n}&
+ \hp\en
+\scale\normalvalue
+\anotes
+ \nbbl0\qb0M\tqb0N&
+ \sk\sk&
+ \qb2{o}\sk&
+ \sk\sk\en
+\scale\normalvalue
+\anotes
+ \ibl0K0\qb0L&
+ \qa{n}&
+ \qb2{p}&
+ \sk\en
+\scale\normalvalue
+\anotes
+ \nbbl0\qb0K\tqb0L&
+ \sk\sk&
+ \tqb2q\sk&
+ \sk\sk\en
+\scale\normalvalue
+\anotes
+ \qa{.M}&
+ \qa{o}&
+ \ibl2r{-2}\qb2r&
+ \hqsk\qp\en
+\scale\normalvalue
+\anotes
+ \sk\sk&
+ \sk\sk&
+ \nbbl2\qb2q\tqb2p&
+ \sk\sk\en
+\scale\normalvalue
+\anotes
+ \sk&
+ \qa{o}&
+ \ibl2o6\qb2o&
+ \ds\en
+\scale\normalvalue
+\anotes
+ \cu I&
+ \sk&
+ \itieu2r\tqb2r&
+ \cl k\en
\bar%6
+\scale\normalvalue
\anotes
- \qa{.L}\sk\sk\ibbl0M2\qb0M\tqb0N\tqsk\itieu0a\qa a\sk\sk\ttie0\ibbl0a{-2}\qb0{a}\qb0{N}\qb0{M}\tqsk\tqb0L&
- \ibl1n{-1}\qb1{n}\qb1{o}\qb1{n}\tqb1m\sk\tqsk\ibl1l{-2}\qb1l\tqb1k\sk\cl{^j}\sk\ds\tqsk\sk&
- \ttie2\ibl2r{-2}\qb2r\tqb2q\qa p\sk\sk\tqsk\qa{.o}\sk\sk\sk\sk\ibbl2i2\qb2i\tqsk\tqb2{^j}&
- \ibl3n{-2}\qb3{n}\qb3{m}\qb3{l}\tqb3k\sk\hqsk\tqsk\shake{n}\ibl3i0\qb3{^j}\nbbl3\qb3i\tqb3j\cu h\sk\ds\tqsk\sk\hqsk\en
+ \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
+\scale\normalvalue
+\anotes
+ \ibbl0M2\qb0M\tqb0N&
+ \tqb1m\sk&
+ \sk\sk&
+ \tqb3k\sk\en
+\scale\normalvalue
+\anotes
+ \tqsk\itieu0a\qa a&
+ \tqsk\ibl1l{-2}\qb1l&
+ \tqsk\qa{.o}&
+ \hqsk\tqsk\shake{n}\ibl3i0\qb3{^j}\en
+\scale\normalvalue
+\anotes
+ \sk\sk&
+ \tqb1k\sk&
+ \sk\sk&
+ \nbbl3\qb3i\tqb3j\en
+\scale\normalvalue
+\anotes
+ \ttie0\ibbl0a{-2}\qb0{a}\qb0{N}\qb0{M}\tqsk\tqsk\tqb0L&
+ \cl{^j}\sk\ds\tqsk\sk\tqsk&
+ \sk\sk\ibbl2i2\qb2i\tqsk\tqsk\tqb2{^j}&
+ \cu h\sk\ds\tqsk\sk\tqsk\hqsk\hqsk\en
\bar%7
+\scale\normalvalue
\anotes
\qa{M}\sk\qa{K}\sk\qa{N}\sk\qa{G}\sk&
\ibu1g0\qb1{f}\qb1{g}\qb1{h}\tqh1f\ibu1g{-2}\qb1{g}\qb1{f}\qb1{e}\tqh1d&
@@ -92,13 +245,39 @@
\qa{h}\sk\qa{h}\sk\qa{i}\sk\qa{i}\sk\en
\bar%8
\nspace
+\scale\normalvalue
\anotes
- \tqsk\qu{.H}\sk\sk\sk\tqsk\sk\cu{^J}\ql K\sk\sk\sk\cl K&
- \tqsk\ibu1c4\qb1{^c}\qb1{d}\sk\qb1{e}\tqsk\sk\itied1h\tqh1h\ttie1\ibu1h{-2}\qb1h\sk\tqh1g\sk\cu f&
- \tqsk\ibl2l{-1}\qb2{.l}\sk\itieu2k\tbbl2\tqb2k\ttie2\ibbl2j0\qb2k\tqsk\tbbl2\qb2{^j}\itieu2l\tqb2l\ttie2\ibbl2l{-1}\qb2{l}\qb2{k}\qb2{l}\tqb2j\cl k&
- \tqsk\ibu3h{0}\qb3{h}\qb3{i}\sk\qb3{h}\tqsk\sk\tqh3g\ibu3f{-1}\qb3f\sk\tqh3e\sk\cu d\en
+ \tqsk\tqsk\qu{.H}&
+ \tqsk\tqsk\ibu1c4\qb1{^c}&
+ \tqsk\tqsk\ibl2l{-1}\qb2{.l}&
+ \tqsk\tqsk\ibu3h{0}\qb3{h}\en
+\scale\normalvalue
+\anotes
+ \sk\sk\sk\tqsk\sk&
+ \qb1{d}\sk\qb1{e}\tqsk\sk&
+ \sk\itieu2k\tbbl2\tqb2k\ttie2\ibbl2j0\qb2k\tqsk\tqsk\tbbl2\qb2{^j}&
+ \qb3{i}\sk\qb3{h}\tqsk\sk\en
+\scale\normalvalue
+\anotes
+ \tqsk\cu{^J}&
+ \tqsk\itied1h\tqh1h&
+ \itieu2l\tqb2l&
+ \tqsk\tqh3g\en
+\scale\normalvalue
+\anotes
+ \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
+\scale\normalvalue
+\anotes
+ \cl K&
+ \cu f&
+ \cl k&
+ \cu d\en
\leftrightrepeat
\advance\barno-1%
+\scale\normalvalue
\anotes
\ds&
\cl m&
@@ -105,54 +284,272 @@
\ds&
\cl o\en
\bar%9
+\scale\normalvalue
\anotes
- \qa{d}\sk\qa{c}\sk\qa{b}\sk\sk\qa{N}\sk&
- \ibl1k0\qb1{k}\qb1{m}\qb1{k}\tqb1{m}\ibl1k0\qb1{n}\qb1{k}\sk\qb1{k}\tqb1n&
- \qa{o}\sk\qa{o}\sk\qa{p}\sk\sk\qa{p}\sk&
- \ibl3m0\qb3{m}\qb3{o}\qb3{m}\tqb3o\ibl3k2\qb3k\nbbl3\qb3l\tqb3m\ibl3n{-4}\qb3n\tqb3l\en
+ \qa{d}\sk\qa{c}\sk\qa{b}&
+ \ibl1k0\qb1{k}\qb1{m}\qb1{k}\tqb1{m}\ibl1k0\qb1{n}&
+ \qa{o}\sk\qa{o}\sk\qa{p}&
+ \ibl3m0\qb3{m}\qb3{o}\qb3{m}\tqb3o\ibl3k2\qb3k\en
+\scale\normalvalue
+\anotes
+ \sk\sk&
+ \qb1{k}\sk&
+ \sk\sk&
+ \nbbl3\qb3l\tqb3m\en
+\scale\normalvalue
+\anotes
+ \qa{N}\sk&
+ \qb1{k}\tqb1n&
+ \qa{p}\sk&
+ \ibl3n{-4}\qb3n\tqb3l\en
\bar%10
+\scale\normalvalue
\anotes
- \ibl0b{-1}\qb0{c}\qb0{b}\qb0{c}\tqb0a\tqsk\qa{.b}\tqsk\sk\sk\sk\cl{^a}&
- \cl l\ds\qp\sk\tqsk\qa{m}\tqsk\sk\sk\qa{m}\sk&
- \ibl2o{-1}\qb2{o}\qb2{p}\qb2{o}\tqb2n\tqsk\ibl2m{-2}\qb2m\tqsk\tqb2l\sk\cl{^k}\ds&
- \ibl3o{-2}\qb3{o}\qb3{n}\qb3{m}\tqb3l\tqsk\ibl3j0\shake n\qb3{^k}\tqsk\nbbl3\qb3{^j}\tqb3k\ibl3i8\qb3i\tqb3{p}\en
+ \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
+\scale\normalvalue
+\anotes
+ \tqsk\tqsk\qa{.b}&
+ \tqsk\tqsk\qa{m}&
+ \tqsk\tqsk\ibl2m{-2}\qb2m&
+ \tqsk\tqsk\ibl3j0\shake n\qb3{^k}\en
+\scale\normalvalue
+\anotes
+ \tqsk\sk\sk&
+ \tqsk\sk\sk&
+ \tqsk\tqsk\tqb2l\sk&
+ \tqsk\tqsk\nbbl3\qb3{^j}\tqb3k\en
+\scale\normalvalue
+\anotes
+ \sk&
+ \tqsk\qa{m}&
+ \cl{^k}&
+ \ibl3i8\qb3i\en
+\scale\normalvalue
+\anotes
+ \tqsk\cl{^a}&
+ \sk&
+ \ds&
+ \tqb3{p}\en
\bar%11
+\scale\normalvalue
\anotes
- \qa{N}\sk\qa{N}\sk\tqsk\qa{.a}\sk\sk\sk\sk\cl{^a}\sk&
- \ibl1l0\qb1{n}\qb1{l}\qb1{n}\tqb1l\tqsk\ibl1m{-1}\qb1{m}\sk\qb1{n}\sk\qb1{m}\tqb1l\sk&
- \qa{p}\sk\qa{p}\sk\tqsk\qa{q}\sk\sk\sk\qa{q}\sk\sk&
- \ibl3m0\qb3{l}\qb3{p}\qb3{l}\tqb3{p}\tqsk\ibbl3k2\qb3{^k}\qb3{l}\qb3{m}\tqb3n\ibl3o{-2}\qb3o\nbbl3\qb3n\tqb3m\hqsk\en
+ \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
+\scale\normalvalue
+\anotes
+ \tqsk\tqsk\qa{.a}\sk\sk\sk&
+ \tqsk\tqsk\ibl1m{-1}\qb1{m}\sk\qb1{n}\sk&
+ \tqsk\tqsk\qa{q}\sk\sk\sk&
+ \tqsk\tqsk\ibbl3k2\qb3{^k}\qb3{l}\qb3{m}\tqb3n\en
+\scale\normalvalue
+\anotes
+ \sk&
+ \qb1{m}&
+ \qa{q}&
+ \ibl3o{-2}\qb3o\en
+\scale\normalvalue
+\anotes
+ \cl{^a}\sk&
+ \tqb1l\sk&
+ \sk\sk&
+ \nbbl3\qb3n\tqb3m\hqsk\hqsk\en
\bar%12
\nspace
+\scale\normalvalue
\anotes
- \tqsk\qa b\sk\sk\tqsk\qa I\sk\sk\sk\qa{.L}\sk\sk\sk\cl{=K}\sk&
- \tqsk\ibl1k2\qb1{^k}\nbbl1\qb1l\tqb1m\tqsk\itied1i\qu i\sk\sk\sk\ttie1\ibu1i0\qb1i\nbbu1\qb1h\tqh1i\ibu1g2\qb1g\nbbu1\qb1h\tqh1i&
- \tqsk\ibl2o{-1}\qb2p\qb2q\sk\tqsk\qb2p\sk\tqb2o\sk\ibl2n0\qb2n\nbbl2\qb2m\tqb2n\cl l\ds\sk&
- \tqsk\ibl3n{-2}\qb3n\nbbl3\qb3m\tqb3l\tqsk\ibbl3k0\qb3{^k}\qb3{l}\qb3m\tqb3k\hqsk\itieu3l\ha l\sk\sk\sk\sk\sk\hqsk\en
+ \tqsk\tqsk\qa b&
+ \tqsk\tqsk\ibl1k2\qb1{^k}&
+ \tqsk\tqsk\ibl2o{-1}\qb2p&
+ \tqsk\tqsk\ibl3n{-2}\qb3n\en
+\scale\normalvalue
+\anotes
+ \sk\sk&
+ \nbbl1\qb1l\tqb1m&
+ \qb2q\sk&
+ \nbbl3\qb3m\tqb3l\en
+\scale\normalvalue
+\anotes
+ \tqsk\tqsk\qa I\sk\sk\sk&
+ \tqsk\tqsk\itied1i\qu i\sk\sk\sk&
+ \tqsk\tqsk\qb2p\sk\tqb2o\sk&
+ \tqsk\tqsk\ibbl3k0\qb3{^k}\qb3{l}\qb3m\tqb3k\en
+\scale\normalvalue
+\anotes
+ \qa{.L}&
+ \ttie1\ibu1i0\qb1i&
+ \ibl2n0\qb2n&
+ \hqsk\itieu3l\ha l\en
+\scale\normalvalue
+\anotes
+ \sk\sk&
+ \nbbu1\qb1h\tqh1i&
+ \nbbl2\qb2m\tqb2n&
+ \sk\sk\en
+\scale\normalvalue
+\anotes
+ \sk&
+ \ibu1g2\qb1g&
+ \cl l&
+ \sk\en
+\scale\normalvalue
+\anotes
+ \cl{=K}\sk&
+ \nbbu1\qb1h\tqh1i&
+ \ds\sk&
+ \sk\sk\hqsk\hqsk\en
\bar%13
+\scale\normalvalue
\anotes
- \qa{J}\sk\sk\sk\qa{c}\sk\sk\qa{.b}\sk\sk\sk\ibbu0J{-2}\qb0J\tqh0I&
- \ibl1j2\qb1{j}\sk\qb1{k}\sk\qb1{l}\sk\tqb1m\ibl1n{-1}\qb1n\nbbl1\qb1m\tqb1l\cl k\ds\sk&
- \hp\sk\sk\sk\sk\sk\sk\qa n\sk\sk\ibl2i{-5}\qb2n\tqb2g\sk&
- \ttie3\ibbl3k1\slur lku1\qb3{l}\qb3{k}\slur mlu1\qb3m\tqb3l\ibbl3m1\isluru3n\qb3n\tbbl3\tslur3m\qb3m\tqb3o\qa{.k}\sk\sk\sk\ibbl3j2\qb3j\tqb3k\hqsk\en
+ \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
+\scale\normalvalue
+\anotes
+ \sk\qa{.b}&
+ \tqb1m\ibl1n{-1}\qb1n&
+ \sk\qa n&
+ \tqb3o\qa{.k}\en
+\scale\normalvalue
+\anotes
+ \sk\sk&
+ \nbbl1\qb1m\tqb1l&
+ \sk\sk&
+ \sk\sk\en
+\scale\normalvalue
+\anotes
+ \sk&
+ \cl k&
+ \ibl2i{-5}\qb2n&
+ \sk\en
+\scale\normalvalue
+\anotes
+ \ibbu0J{-2}\qb0J\tqh0I&
+ \ds\sk&
+ \tqb2g\sk&
+ \ibbl3j2\qb3j\tqb3k\hqsk\hqsk\en
\bar%14
+\scale\normalvalue
\anotes
- \qa{.H}\sk\sk\sk\ibbu0I2\qb0I\tqh0J\qa{.K}\sk\sk\sk\ibbu0J2\qb0J\tqh0K&
- \ds\cu h\sk\ibu1e0\qb1e\nbbu1\qb1d\tqh1e\ibu1g1\qb1f\sk\itied1g\tqh1g\ttie1\ibu1g{-1}\qb1g\tqh1f\sk&
- \ibl2j1\qb2{.j}\sk\tbbl2\tqb2k\ibl2j{-2}\qb2j\tqb2i\sk\ibu2h1\qb2h\sk\tqh2i\ibl2j2\qb2j\tqb2k\sk&
- \ibl3l2\qb3l\nbbl3\qb3m\tqb3n\ibl3o{-2}\qb3o\tqb3n\sk\hqsk\ibbl3m{-2}\shake{o}\qb3m\tbbl3\qb3l\tqb3k\ibu3i{-6}\qb3j\tqh3d\sk\hqsk\en
+ \qa{.H}&
+ \ds&
+ \ibl2j1\qb2{.j}&
+ \ibl3l2\qb3l\en
+\scale\normalvalue
+\anotes
+ \sk&
+ \cu h&
+ \sk&
+ \nbbl3\qb3m\en
+\scale\normalvalue
+\anotes
+ \sk&
+ \sk&
+ \tbbl2\tqb2k&
+ \tqb3n\en
+\scale\normalvalue
+\anotes
+ \sk&
+ \ibu1e0\qb1e&
+ \ibl2j{-2}\qb2j&
+ \ibl3o{-2}\qb3o\en
+\scale\normalvalue
+\anotes
+ \ibbu0I2\qb0I\tqh0J&
+ \nbbu1\qb1d\tqh1e&
+ \tqb2i\sk&
+ \tqb3n\sk\en
+\scale\normalvalue
+\anotes
+ \qa{.K}\sk&
+ \ibu1g1\qb1f\sk&
+ \ibu2h1\qb2h\sk&
+ \hqsk\ibbl3m{-2}\shake{o}\qb3m\tbbl3\qb3l\en
+\scale\normalvalue
+\anotes
+ \sk\sk&
+ \itied1g\tqh1g\ttie1\ibu1g{-1}\qb1g&
+ \tqh2i\ibl2j2\qb2j&
+ \tqb3k\ibu3i{-6}\qb3j\en
+\scale\normalvalue
+\anotes
+ \ibbu0J2\qb0J\tqh0K&
+ \tqh1f\sk&
+ \tqb2k\sk&
+ \tqh3d\sk\hqsk\hqsk\en
\bar%15
+\scale\normalvalue
\anotes
- \ibu0I0\qb0{G}\qb0{H}\sk\qb0{I}\tqh0G\qa{.J}\sk\sk\sk\cu{^J}&
- \qa{d}\sk\sk\qa{d}\sk\qa{e}\sk\sk\qa{e}\sk&
- \ibu2i0\qb2i\nbbu2\qb2h\tqh2i\cu g\ds\ds\ibbl2l{-2}\qb2l\tqb2k\ibl2j4\qb2j\tqb2l&
- \ibl3i0\qb3{i}\qb3{j}\sk\qb3{k}\tqb3i\ibu3j{-2}\qb3{j}\qb3{i}\sk\qb3{h}\tqh3g\en
+ \ibu0I0\qb0{G}&
+ \qa{d}&
+ \ibu2i0\qb2i&
+ \ibl3i0\qb3{i}\en
+\scale\normalvalue
+\anotes
+ \qb0{H}\sk&
+ \sk\sk&
+ \nbbu2\qb2h\tqh2i&
+ \qb3{j}\sk\en
+\scale\normalvalue
+\anotes
+ \qb0{I}\tqh0G&
+ \qa{d}\sk&
+ \cu g\ds&
+ \qb3{k}\tqb3i\en
+\scale\normalvalue
+\anotes
+ \qa{.J}&
+ \qa{e}&
+ \ds&
+ \ibu3j{-2}\qb3{j}\en
+\scale\normalvalue
+\anotes
+ \sk\sk&
+ \sk\sk&
+ \ibbl2l{-2}\qb2l\tqb2k&
+ \qb3{i}\sk\en
+\scale\normalvalue
+\anotes
+ \sk&
+ \qa{e}&
+ \ibl2j4\qb2j&
+ \qb3{h}\en
+\scale\normalvalue
+\anotes
+ \cu{^J}&
+ \sk&
+ \tqb2l&
+ \tqh3g\en
\bar%16
+\scale\normalvalue
\anotes
- \qa{K}\sk\sk\sk\qa{K}\sk\sk\qa N\sk\sk\cu G&
- \ibu1g{1}\qb1{d}\sk\qb1{e}\sk\qb1{d}\sk\tqh1j\ibu1i{-2}\qb1i\tqh1h\sk\cu g&
- \ibbl2h1\qb2{h}\qb2{k}\qb2{j}\tqb2i\ibbl2j0\qb2j\tbbl2\qb2h\itieu2k\tqb2k\ttie2\ibl2j0\qb2k\nbbl2\qb2j\tqb2k\cl i&
- \ibu3f2\qb3f\sk\tqh3g\sk\ibu3h{-4}\qb3h\sk\tqh3f\qa g\sk\sk\cu g\en
+ \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
+\scale\normalvalue
+\anotes
+ \sk\qa N&
+ \tqh1j\ibu1i{-2}\qb1i&
+ \itieu2k\tqb2k\ttie2\ibl2j0\qb2k&
+ \tqh3f\qa g\en
+\scale\normalvalue
+\anotes
+ \sk\sk&
+ \tqh1h\sk&
+ \nbbl2\qb2j\tqb2k&
+ \sk\sk\en
+\scale\normalvalue
+\anotes
+ \cu G&
+ \cu g&
+ \cl i&
+ \cu g\en
\setrightrepeat
\endpiece%
\eject
Modified: trunk/Build/source/utils/autosp/autosp-src/tests/quod4.tex
===================================================================
--- trunk/Build/source/utils/autosp/autosp-src/tests/quod4.tex 2020-01-23 00:54:24 UTC (rev 53497)
+++ trunk/Build/source/utils/autosp/autosp-src/tests/quod4.tex 2020-01-23 03:53:58 UTC (rev 53498)
@@ -41,105 +41,189 @@
\staffbotmarg=3.0\Interligne%
\startpiece\addspace\afterruleskip%
\systemnumbers%
+\scale\normalvalue
\Notes\ds&\cu d&\ds&\ds\en%
\bar%1
-\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
+\scale\normalvalue
+\Notes\ha N\sk\sk\sk\ha M&\ibu1g2\qb1{g}\qb1{h}\qb1{i}\tqh1j\ibl1k{-2}\qb1k&&\hp\sk\sk\sk\qp\en
+\scale\normalvalue
\notes\sk\sk&\nbbl1\qb1j\tqb1i&&\sk\sk\en
+\scale\normalvalue
\Notes\sk&\ibu1h0\qb1h&&\ds\en
-\notes\sk\sk&\nbbu1\qb1g\tqh1h&&\cu d\sk\hqsk\en%
+\scale\normalvalue
+\notes\sk\sk&\nbbu1\qb1g\tqh1h&&\cu d\sk\hqsk\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
+\scale\normalvalue
+\Notes\ha L\sk&\ibu1i{-2}\qb1i\tqh1h&\qa{n}\sk&\ibu3g2\qb3{g}\qb3{h}\en
+\scale\normalvalue
+\Notes\sk\sk\qa{.K}&\itied1g\qa g\sk\ttie1\qa g&\qa{n}\sk\qa o&\qb3{i}\tqh3j\ibl3k{-2}\qb3k\en
+\scale\normalvalue
\notes\sk\sk&\sk\sk&\sk\sk&\nbbl3\qb3j\tqb3i\en
+\scale\normalvalue
\Notes\sk&\ibu1f0\shake{n}\qb1f&\cl o&\cu h\en
-\notes\cu J\sk&\nbbu1\qb1e\tqh1f&\ds\sk&\ds\sk\hqsk\en%
+\scale\normalvalue
+\notes\cu J\sk&\nbbu1\qb1e\tqh1f&\ds\sk&\ds\sk\hqsk\hqsk\en%
\bar%3
-\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%
+\scale\normalvalue
+\Notes\hu I\sk&\qa g\sk&\ibl2n{-1}\qb2{n}\qb2{o}&\qa{k}\sk\en
+\scale\normalvalue
+\Notes\sk\tqsk\sk\tqsk\hu J\sk\sk\sk&\ds\tqsk\tqsk\cl k\ibu1j{-2}\qb1{j}\qb1{i}\qb1h\tqh1g&\qb2{n}\tqsk\tqsk\tqb2{=m}\ibl2j{0}\qb2{l}\qb2{k}\qb2j\tqb2p&\qa{k}\tqsk\sk\tqsk\qa{l}\sk\qa{l}\sk\en%
\bar%4
+\scale\normalvalue
\Notes\ha K\sk&\itied1f\shake{n}\qa f\sk&\ibl2o{-1}\qb2{o}\qb2{n}&\ibl3k{-1}\qb3{k}\qb3{l}\en
+\scale\normalvalue
\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\hqsk\en%
+\scale\normalvalue
+\Notes\sk&\itied1d\tqh1d&\tqb2m&\tqb3j\en
+\scale\normalvalue
+\Notes\qa G\sk&\ttie1\qa d\sk&\ibl2n{-2}\qb2n\tqb2m&\ibu3h{-2}\shake{p}\qb3i\tqh3h\en
+\scale\normalvalue
+\Notes\ds&\qp&\ibl2n{-5}\qb2n&\qa g\en
+\scale\normalvalue
+\notes\ibbl0b{-1}\qb0b\tqb0a&\sk\sk&\tqb2k\sk&\sk\sk\hqsk\hqsk\en%
\bar%5
+\scale\normalvalue
\Notes\ibl0M0\qb0N&\qa{n}&\ibl2n2\qb2{n}&\hp\en
+\scale\normalvalue
\notes\nbbl0\qb0M\tqb0N&\sk\sk&\qb2{o}\sk&\sk\sk\en
+\scale\normalvalue
\Notes\ibl0K0\qb0L&\qa{n}&\qb2{p}&\sk\en
-\notes\nbbl0\qb0K\tqb0L&\sk\sk&\tqb2q\sk&\sk\sk\hqsk\en%
-\Notes\qa{.M}&\qa{o}&\ibl2r{-2}\qb2r&\qp\en
+\scale\normalvalue
+\notes\nbbl0\qb0K\tqb0L&\sk\sk&\tqb2q\sk&\sk\sk\en
+\scale\normalvalue
+\Notes\qa{.M}&\qa{o}&\ibl2r{-2}\qb2r&\hqsk\qp\en
+\scale\normalvalue
\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%
+\scale\normalvalue
+\Notes\sk&\qa{o}&\ibl2o6\qb2o&\ds\en
+\scale\normalvalue
+\Notes\cu I&\sk&\itieu2r\tqb2r&\cl k\en%
\bar%6
+\scale\normalvalue
\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\hqsk\en%
-\Notes\tqsk\itieu0a\qa a&\tqsk\ibl1l{-2}\qb1l&\tqsk\qa{.o}&\tqsk\shake{n}\ibl3i0\qb3{^j}\en
-\notes\sk\sk\ttie0\ibbl0a{-2}\qb0{a}\qb0{N}\qb0{M}\tqsk\tqb0L&\tqb1k\sk\cl{^j}\sk\ds\tqsk\sk&\sk\sk\sk\sk\ibbl2i2\qb2i\tqsk\tqb2{^j}&\nbbl3\qb3i\tqb3j\cu h\sk\ds\tqsk\sk\hqsk\en%
+\scale\normalvalue
+\notes\ibbl0M2\qb0M\tqb0N&\tqb1m\sk&\sk\sk&\tqb3k\sk\en
+\scale\normalvalue
+\Notes\tqsk\itieu0a\qa a&\tqsk\ibl1l{-2}\qb1l&\tqsk\qa{.o}&\hqsk\tqsk\shake{n}\ibl3i0\qb3{^j}\en
+\scale\normalvalue
+\notes\sk\sk&\tqb1k\sk&\sk\sk&\nbbl3\qb3i\tqb3j\en
+\scale\normalvalue
+\notes\ttie0\ibbl0a{-2}\qb0{a}\qb0{N}\qb0{M}\tqsk\tqsk\tqb0L&\cl{^j}\sk\ds\tqsk\sk\tqsk&\sk\sk\ibbl2i2\qb2i\tqsk\tqsk\tqb2{^j}&\cu h\sk\ds\tqsk\sk\tqsk\hqsk\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%
+\scale\normalvalue
+\Notes\qa{M}\sk\qa{K}\sk\qa{N}\sk\qa{G}\sk&\ibu1g0\qb1{f}\qb1{g}\qb1{h}\tqh1f\ibu1g{-2}\qb1{g}\qb1{f}\qb1{e}\tqh1d&\ibl2k0\qb2{k}\qb2{l}\qb2{m}\tqb2k\ibl2i4\qb2{i}\qb2{k}\qb2{n}\tqb2m&\qa{h}\sk\qa{h}\sk\qa{i}\sk\qa{i}\sk\en%
\bar%8
\nspace
-\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\cu{^J}&\itied1h\tqh1h&\itieu2l\tqb2l&\tqh3g\en%
+\scale\normalvalue
+\Notes\tqsk\tqsk\qu{.H}&\tqsk\tqsk\ibu1c4\qb1{^c}&\tqsk\tqsk\ibl2l{-1}\qb2{.l}&\tqsk\tqsk\ibu3h{0}\qb3{h}\en
+\scale\normalvalue
+\notes\sk\sk\sk\tqsk\sk&\qb1{d}\sk\qb1{e}\tqsk\sk&\sk\itieu2k\tbbl2\tqb2k\ttie2\ibbl2j0\qb2k\tqsk\tqsk\tbbl2\qb2{^j}&\qb3{i}\sk\qb3{h}\tqsk\sk\en
+\scale\normalvalue
+\Notes\tqsk\cu{^J}&\tqsk\itied1h\tqh1h&\itieu2l\tqb2l&\tqsk\tqh3g\en
+\scale\normalvalue
\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
+\scale\normalvalue
\Notes\cl K&\cu f&\cl k&\cu d\en%
\leftrightrepeat
\advance\barno-1%
+\scale\normalvalue
\Notes\ds&\cl m&\ds&\cl o\en%
\bar%9
-\Notes\qa{d}\sk\qa{c}\sk&\ibl1k0\qb1{k}\qb1{m}\qb1{k}\tqb1{m}&\qa{o}\sk\qa{o}\sk&\ibl3m0\qb3{m}\qb3{o}\qb3{m}\tqb3o\en%
-\Notes\qa{b}&\ibl1k0\qb1{n}&\qa{p}&\ibl3k2\qb3k\en
+\scale\normalvalue
+\Notes\qa{d}\sk\qa{c}\sk\qa{b}&\ibl1k0\qb1{k}\qb1{m}\qb1{k}\tqb1{m}\ibl1k0\qb1{n}&\qa{o}\sk\qa{o}\sk\qa{p}&\ibl3m0\qb3{m}\qb3{o}\qb3{m}\tqb3o\ibl3k2\qb3k\en
+\scale\normalvalue
\notes\sk\sk&\qb1{k}\sk&\sk\sk&\nbbl3\qb3l\tqb3m\en
+\scale\normalvalue
\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\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\sk\cl{^a}&\qa{m}\sk&\cl{^k}\ds&\ibl3i8\qb3i\tqb3{p}\en%
+\scale\normalvalue
+\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
+\scale\normalvalue
+\Notes\tqsk\tqsk\qa{.b}&\tqsk\tqsk\qa{m}&\tqsk\tqsk\ibl2m{-2}\qb2m&\tqsk\tqsk\ibl3j0\shake n\qb3{^k}\en
+\scale\normalvalue
+\notes\tqsk\sk\sk&\tqsk\sk\sk&\tqsk\tqsk\tqb2l\sk&\tqsk\tqsk\nbbl3\qb3{^j}\tqb3k\en
+\scale\normalvalue
+\Notes\sk&\tqsk\qa{m}&\cl{^k}&\ibl3i8\qb3i\en
+\scale\normalvalue
+\Notes\tqsk\cl{^a}&\sk&\ds&\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\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
+\scale\normalvalue
+\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
+\scale\normalvalue
+\notes\tqsk\tqsk\qa{.a}\sk\sk\sk&\tqsk\tqsk\ibl1m{-1}\qb1{m}\sk\qb1{n}\sk&\tqsk\tqsk\qa{q}\sk\sk\sk&\tqsk\tqsk\ibbl3k2\qb3{^k}\qb3{l}\qb3{m}\tqb3n\en
+\scale\normalvalue
\Notes\sk&\qb1{m}&\qa{q}&\ibl3o{-2}\qb3o\en
-\notes\cl{^a}\sk&\tqb1l\sk&\sk\sk&\nbbl3\qb3n\tqb3m\hqsk\en%
+\scale\normalvalue
+\notes\cl{^a}\sk&\tqb1l\sk&\sk\sk&\nbbl3\qb3n\tqb3m\hqsk\hqsk\en%
\bar%12
\nspace
-\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
+\scale\normalvalue
+\Notes\tqsk\tqsk\qa b&\tqsk\tqsk\ibl1k2\qb1{^k}&\tqsk\tqsk\ibl2o{-1}\qb2p&\tqsk\tqsk\ibl3n{-2}\qb3n\en
+\scale\normalvalue
+\notes\sk\sk&\nbbl1\qb1l\tqb1m&\qb2q\sk&\nbbl3\qb3m\tqb3l\en
+\scale\normalvalue
+\notes\tqsk\tqsk\qa I\sk\sk\sk&\tqsk\tqsk\itied1i\qu i\sk\sk\sk&\tqsk\tqsk\qb2p\sk\tqb2o\sk&\tqsk\tqsk\ibbl3k0\qb3{^k}\qb3{l}\qb3m\tqb3k\en
+\scale\normalvalue
+\Notes\qa{.L}&\ttie1\ibu1i0\qb1i&\ibl2n0\qb2n&\hqsk\itieu3l\ha l\en
+\scale\normalvalue
\notes\sk\sk&\nbbu1\qb1h\tqh1i&\nbbl2\qb2m\tqb2n&\sk\sk\en
+\scale\normalvalue
\Notes\sk&\ibu1g2\qb1g&\cl l&\sk\en
-\notes\cl{=K}\sk&\nbbu1\qb1h\tqh1i&\ds\sk&\sk\sk\hqsk\en%
+\scale\normalvalue
+\notes\cl{=K}\sk&\nbbu1\qb1h\tqh1i&\ds\sk&\sk\sk\hqsk\hqsk\en%
\bar%13
+\scale\normalvalue
\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
+\scale\normalvalue
+\Notes\sk\qa{.b}&\tqb1m\ibl1n{-1}\qb1n&\sk\qa n&\tqb3o\qa{.k}\en
+\scale\normalvalue
\notes\sk\sk&\nbbl1\qb1m\tqb1l&\sk\sk&\sk\sk\en
+\scale\normalvalue
\Notes\sk&\cl k&\ibl2i{-5}\qb2n&\sk\en
-\notes\ibbu0J{-2}\qb0J\tqh0I&\ds\sk&\tqb2g\sk&\ibbl3j2\qb3j\tqb3k\hqsk\en%
+\scale\normalvalue
+\notes\ibbu0J{-2}\qb0J\tqh0I&\ds\sk&\tqb2g\sk&\ibbl3j2\qb3j\tqb3k\hqsk\hqsk\en%
\bar%14
+\scale\normalvalue
\Notes\qa{.H}&\ds&\ibl2j1\qb2{.j}&\ibl3l2\qb3l\en
-\notes\sk\sk&\cu h\sk&\sk\tbbl2\tqb2k&\nbbl3\qb3m\tqb3n\en
+\scale\normalvalue
+\notes\sk&\cu h&\sk&\nbbl3\qb3m\en
+\scale\normalvalue
+\notes\sk&\sk&\tbbl2\tqb2k&\tqb3n\en
+\scale\normalvalue
\Notes\sk&\ibu1e0\qb1e&\ibl2j{-2}\qb2j&\ibl3o{-2}\qb3o\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
+\scale\normalvalue
+\notes\ibbu0I2\qb0I\tqh0J&\nbbu1\qb1d\tqh1e&\tqb2i\sk&\tqb3n\sk\en
+\scale\normalvalue
+\notes\qa{.K}\sk&\ibu1g1\qb1f\sk&\ibu2h1\qb2h\sk&\hqsk\ibbl3m{-2}\shake{o}\qb3m\tbbl3\qb3l\en
+\scale\normalvalue
\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\hqsk\en%
+\scale\normalvalue
+\notes\ibbu0J2\qb0J\tqh0K&\tqh1f\sk&\tqb2k\sk&\tqh3d\sk\hqsk\hqsk\en%
\bar%15
+\scale\normalvalue
\Notes\ibu0I0\qb0{G}&\qa{d}&\ibu2i0\qb2i&\ibl3i0\qb3{i}\en
+\scale\normalvalue
\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%
+\scale\normalvalue
+\Notes\qb0{I}\tqh0G&\qa{d}\sk&\cu g\ds&\qb3{k}\tqb3i\en
+\scale\normalvalue
\Notes\qa{.J}&\qa{e}&\ds&\ibu3j{-2}\qb3{j}\en
+\scale\normalvalue
\notes\sk\sk&\sk\sk&\ibbl2l{-2}\qb2l\tqb2k&\qb3{i}\sk\en
-\Notes\sk\cu{^J}&\qa{e}\sk&\ibl2j4\qb2j\tqb2l&\qb3{h}\tqh3g\en%
+\scale\normalvalue
+\Notes\sk&\qa{e}&\ibl2j4\qb2j&\qb3{h}\en
+\scale\normalvalue
+\Notes\cu{^J}&\sk&\tqb2l&\tqh3g\en%
\bar%16
+\scale\normalvalue
\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%
-\Notes\qa N&\ibu1i{-2}\qb1i&\ttie2\ibl2j0\qb2k&\qa g\en
+\scale\normalvalue
+\Notes\sk\qa N&\tqh1j\ibu1i{-2}\qb1i&\itieu2k\tqb2k\ttie2\ibl2j0\qb2k&\tqh3f\qa g\en
+\scale\normalvalue
\notes\sk\sk&\tqh1h\sk&\nbbl2\qb2j\tqb2k&\sk\sk\en
+\scale\normalvalue
\Notes\cu G&\cu g&\cl i&\cu g\en%
\setrightrepeat
\endpiece%
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 2020-01-23 00:54:24 UTC (rev 53497)
+++ trunk/Build/source/utils/autosp/configure.ac 2020-01-23 03:53:58 UTC (rev 53498)
@@ -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], [2019-08-26])[]dnl using unmodified autosp source
+m4_define([autosp_version], [2019-12-22])[]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