From fa1f0d5f56c122767cc8fbd545aa1c63df4d6b39 Mon Sep 17 00:00:00 2001 From: Akira Kakuto Date: Thu, 23 Jan 2020 03:53:58 +0000 Subject: autosp 2019-12-22 git-svn-id: svn://tug.org/texlive/trunk@53498 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/utils/README | 2 +- Build/source/utils/autosp/ChangeLog | 5 + Build/source/utils/autosp/TLpatches/ChangeLog | 5 + .../utils/autosp/TLpatches/patch-01-binary-write | 247 +--------- Build/source/utils/autosp/autosp-src/ChangeLog | 4 + Build/source/utils/autosp/autosp-src/README | 4 +- Build/source/utils/autosp/autosp-src/autosp.1 | 5 +- Build/source/utils/autosp/autosp-src/autosp.c | 2 +- Build/source/utils/autosp/autosp-src/compile | 17 +- Build/source/utils/autosp/autosp-src/configure | 20 +- Build/source/utils/autosp/autosp-src/configure.ac | 2 +- Build/source/utils/autosp/autosp-src/depcomp | 10 +- Build/source/utils/autosp/autosp-src/install-sh | 410 ++++++++-------- .../utils/autosp/autosp-src/process_command.c | 42 +- .../source/utils/autosp/autosp-src/process_score.c | 1 + .../source/utils/autosp/autosp-src/process_score.h | 3 + .../source/utils/autosp/autosp-src/spacing_note.c | 2 +- .../source/utils/autosp/autosp-src/tests/quod2.tex | 2 +- .../utils/autosp/autosp-src/tests/quod4.aspc | 515 ++++++++++++++++++--- .../source/utils/autosp/autosp-src/tests/quod4.tex | 176 +++++-- Build/source/utils/autosp/configure | 20 +- Build/source/utils/autosp/configure.ac | 2 +- 22 files changed, 900 insertions(+), 596 deletions(-) (limited to 'Build/source/utils') diff --git a/Build/source/utils/README b/Build/source/utils/README index 958edf1aaa1..9e055cf016b 100644 --- a/Build/source/utils/README +++ b/Build/source/utils/README @@ -9,7 +9,7 @@ asymptote 2.62 - checked 16jan20 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. diff --git a/Build/source/utils/autosp/ChangeLog b/Build/source/utils/autosp/ChangeLog index fdf737d7e6b..cae63ee26d6 100644 --- a/Build/source/utils/autosp/ChangeLog +++ b/Build/source/utils/autosp/ChangeLog @@ -1,3 +1,8 @@ +2020-01-23 Akira Kakuto + + * Import autosp-2019-12-22. + configure.ac: Adapted. + 2019-08-29 Akira Kakuto * Import autosp-2019-08-26. diff --git a/Build/source/utils/autosp/TLpatches/ChangeLog b/Build/source/utils/autosp/TLpatches/ChangeLog index f4b585b0222..7a727652706 100644 --- a/Build/source/utils/autosp/TLpatches/ChangeLog +++ b/Build/source/utils/autosp/TLpatches/ChangeLog @@ -1,3 +1,8 @@ +2020-01-23 Akira Kakuto + + Import autosp-2019-12-22. + * patch-01-binary-write: Adapt. + 2019-08-29 Akira Kakuto Import autosp-2019-08-26. diff --git a/Build/source/utils/autosp/TLpatches/patch-01-binary-write b/Build/source/utils/autosp/TLpatches/patch-01-binary-write index c71cb29a5f5..9d4cc914bc5 100644 --- a/Build/source/utils/autosp/TLpatches/patch-01-binary-write +++ b/Build/source/utils/autosp/TLpatches/patch-01-binary-write @@ -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 @@ diff -ur autosp-2019-08-26/autosp.c autosp-src/autosp.c 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 @@ diff -ur autosp-2019-08-26/rebar.c autosp-src/rebar.c 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 @@ diff -ur autosp-2019-08-26/spacing_note.c autosp-src/spacing_note.c 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)); } diff --git a/Build/source/utils/autosp/autosp-src/ChangeLog b/Build/source/utils/autosp/autosp-src/ChangeLog index 36e5b992be8..6c6367ccd34 100644 --- a/Build/source/utils/autosp/autosp-src/ChangeLog +++ b/Build/source/utils/autosp/autosp-src/ChangeLog @@ -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 diff --git a/Build/source/utils/autosp/autosp-src/README b/Build/source/utils/autosp/autosp-src/README index e9abdc25d56..2aec8c04948 100644 --- a/Build/source/utils/autosp/autosp-src/README +++ b/Build/source/utils/autosp/autosp-src/README @@ -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 @@ Collective coding of note sequences (including accidentals 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 diff --git a/Build/source/utils/autosp/autosp-src/autosp.1 b/Build/source/utils/autosp/autosp-src/autosp.1 index 547933a96d6..a4a24c68273 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 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 @@ Collective coding of note sequences (including accidentals and dots) is handled by expanding the sequence into a sequence of individual note commands. + +.B autosp +scales notes by the relevant instrument-size value. .SH LIMITATIONS diff --git a/Build/source/utils/autosp/autosp-src/autosp.c b/Build/source/utils/autosp/autosp-src/autosp.c index 48349a8531f..b109032e94a 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] = "2019-08-26"; +char version[12] = "2019-12-22"; /* Copyright (C) 2014-19 R. D. Tennent School of Computing, * Queen's University, rdt@cs.queensu.ca diff --git a/Build/source/utils/autosp/autosp-src/compile b/Build/source/utils/autosp/autosp-src/compile index 23fcba01132..531136b068e 100755 --- a/Build/source/utils/autosp/autosp-src/compile +++ b/Build/source/utils/autosp/autosp-src/compile @@ -1,9 +1,9 @@ #! /bin/sh # Wrapper for compilers which do not understand '-c -o'. -scriptversion=2018-03-07.03; # UTC +scriptversion=2012-10-14.11; # UTC -# Copyright (C) 1999-2020 Free Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # Written by Tom Tromey . # # This program is free software; you can redistribute it and/or modify @@ -17,7 +17,7 @@ scriptversion=2018-03-07.03; # UTC # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# along with this program. If not, see . # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -53,7 +53,7 @@ func_file_conv () MINGW*) file_conv=mingw ;; - CYGWIN* | MSYS*) + CYGWIN*) file_conv=cygwin ;; *) @@ -67,7 +67,7 @@ func_file_conv () mingw/*) file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` ;; - cygwin/* | msys/*) + cygwin/*) file=`cygpath -m "$file" || echo "$file"` ;; wine/*) @@ -255,8 +255,7 @@ EOF echo "compile $scriptversion" exit $? ;; - cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \ - icl | *[/\\]icl | icl.exe | *[/\\]icl.exe ) + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) func_cl_wrapper "$@" # Doesn't return... ;; esac @@ -340,9 +339,9 @@ exit $ret # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'before-save-hook 'time-stamp) +# eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC0" +# time-stamp-time-zone: "UTC" # time-stamp-end: "; # UTC" # End: diff --git a/Build/source/utils/autosp/autosp-src/configure b/Build/source/utils/autosp/autosp-src/configure index eaa6a32e9b8..358ca14d93a 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 2019-08-26. +# Generated by GNU Autoconf 2.69 for autosp 2019-12-22. # # Report bugs to . # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='autosp' PACKAGE_TARNAME='autosp' -PACKAGE_VERSION='2019-08-26' -PACKAGE_STRING='autosp 2019-08-26' +PACKAGE_VERSION='2019-12-22' +PACKAGE_STRING='autosp 2019-12-22' 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 2019-08-26 to adapt to many kinds of systems. +\`configure' configures autosp 2019-12-22 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 2019-08-26:";; + short | recursive ) echo "Configuration of autosp 2019-12-22:";; 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 2019-08-26 +autosp configure 2019-12-22 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 2019-08-26, which was +It was created by autosp $as_me 2019-12-22, 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='2019-08-26' + VERSION='2019-12-22' 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 2019-08-26, which was +This file was extended by autosp $as_me 2019-12-22, 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 2019-08-26 +autosp config.status 2019-12-22 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 ed1c6a1c8ea..3d1016caedd 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],[2019-08-26],[rdt@cs.queensu.ca]) +AC_INIT([autosp],[2019-12-22],[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/depcomp b/Build/source/utils/autosp/autosp-src/depcomp index 6b391623c4b..4ebd5b3a2f2 100755 --- a/Build/source/utils/autosp/autosp-src/depcomp +++ b/Build/source/utils/autosp/autosp-src/depcomp @@ -1,9 +1,9 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2018-03-07.03; # UTC +scriptversion=2013-05-30.07; # UTC -# Copyright (C) 1999-2020 Free Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ scriptversion=2018-03-07.03; # UTC # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# along with this program. If not, see . # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -783,9 +783,9 @@ exit 0 # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'before-save-hook 'time-stamp) +# eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC0" +# time-stamp-time-zone: "UTC" # time-stamp-end: "; # UTC" # End: diff --git a/Build/source/utils/autosp/autosp-src/install-sh b/Build/source/utils/autosp/autosp-src/install-sh index 20d8b2eaea9..377bb8687ff 100755 --- a/Build/source/utils/autosp/autosp-src/install-sh +++ b/Build/source/utils/autosp/autosp-src/install-sh @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2018-03-11.20; # UTC +scriptversion=2011-11-20.07; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -41,15 +41,19 @@ scriptversion=2018-03-11.20; # UTC # This script is compatible with the BSD install script, but was written # from scratch. -tab=' ' nl=' ' -IFS=" $tab$nl" +IFS=" "" $nl" -# Set DOITPROG to "echo" to test this script. +# set DOITPROG to echo to test this script +# Don't use :- since 4.3BSD and earlier shells don't like it. doit=${DOITPROG-} -doit_exec=${doit:-exec} +if test -z "$doit"; then + doit_exec=exec +else + doit_exec=$doit +fi # Put in absolute file names if you don't have them in your path; # or use environment vars. @@ -64,6 +68,17 @@ mvprog=${MVPROG-mv} rmprog=${RMPROG-rm} stripprog=${STRIPPROG-strip} +posix_glob='?' +initialize_posix_glob=' + test "$posix_glob" != "?" || { + if (set -f) 2>/dev/null; then + posix_glob= + else + posix_glob=: + fi + } +' + posix_mkdir= # Desired mode of installed file. @@ -82,7 +97,7 @@ dir_arg= dst_arg= copy_on_change=false -is_target_a_directory=possibly +no_target_directory= usage="\ Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE @@ -122,57 +137,46 @@ while test $# -ne 0; do -d) dir_arg=true;; -g) chgrpcmd="$chgrpprog $2" - shift;; + shift;; --help) echo "$usage"; exit $?;; -m) mode=$2 - case $mode in - *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*) - echo "$0: invalid mode: $mode" >&2 - exit 1;; - esac - shift;; + case $mode in + *' '* | *' '* | *' +'* | *'*'* | *'?'* | *'['*) + echo "$0: invalid mode: $mode" >&2 + exit 1;; + esac + shift;; -o) chowncmd="$chownprog $2" - shift;; + shift;; -s) stripcmd=$stripprog;; - -t) - is_target_a_directory=always - dst_arg=$2 - # Protect names problematic for 'test' and other utilities. - case $dst_arg in - -* | [=\(\)!]) dst_arg=./$dst_arg;; - esac - shift;; + -t) dst_arg=$2 + # Protect names problematic for 'test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac + shift;; - -T) is_target_a_directory=never;; + -T) no_target_directory=true;; --version) echo "$0 $scriptversion"; exit $?;; - --) shift - break;; + --) shift + break;; - -*) echo "$0: invalid option: $1" >&2 - exit 1;; + -*) echo "$0: invalid option: $1" >&2 + exit 1;; *) break;; esac shift done -# We allow the use of options -d and -T together, by making -d -# take the precedence; this is for compatibility with GNU install. - -if test -n "$dir_arg"; then - if test -n "$dst_arg"; then - echo "$0: target directory not allowed when installing a directory." >&2 - exit 1 - fi -fi - if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then # When -d is used, all remaining arguments are directories to create. # When -t is used, the destination is already specified. @@ -203,15 +207,6 @@ if test $# -eq 0; then exit 0 fi -if test -z "$dir_arg"; then - if test $# -gt 1 || test "$is_target_a_directory" = always; then - if test ! -d "$dst_arg"; then - echo "$0: $dst_arg: Is not a directory." >&2 - exit 1 - fi - fi -fi - if test -z "$dir_arg"; then do_exit='(exit $ret); exit $ret' trap "ret=129; $do_exit" 1 @@ -228,16 +223,16 @@ if test -z "$dir_arg"; then *[0-7]) if test -z "$stripcmd"; then - u_plus_rw= + u_plus_rw= else - u_plus_rw='% 200' + u_plus_rw='% 200' fi cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;; *) if test -z "$stripcmd"; then - u_plus_rw= + u_plus_rw= else - u_plus_rw=,u+rw + u_plus_rw=,u+rw fi cp_umask=$mode$u_plus_rw;; esac @@ -271,113 +266,122 @@ do fi dst=$dst_arg - # If destination is a directory, append the input filename. + # If destination is a directory, append the input filename; won't work + # if double slashes aren't ignored. if test -d "$dst"; then - if test "$is_target_a_directory" = never; then - echo "$0: $dst_arg: Is a directory" >&2 - exit 1 + if test -n "$no_target_directory"; then + echo "$0: $dst_arg: Is a directory" >&2 + exit 1 fi dstdir=$dst - dstbase=`basename "$src"` - case $dst in - */) dst=$dst$dstbase;; - *) dst=$dst/$dstbase;; - esac + dst=$dstdir/`basename "$src"` dstdir_status=0 else - dstdir=`dirname "$dst"` + # Prefer dirname, but fall back on a substitute if dirname fails. + dstdir=` + (dirname "$dst") 2>/dev/null || + expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$dst" : 'X\(//\)[^/]' \| \ + X"$dst" : 'X\(//\)$' \| \ + X"$dst" : 'X\(/\)' \| . 2>/dev/null || + echo X"$dst" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q' + ` + test -d "$dstdir" dstdir_status=$? fi fi - case $dstdir in - */) dstdirslash=$dstdir;; - *) dstdirslash=$dstdir/;; - esac - obsolete_mkdir_used=false if test $dstdir_status != 0; then case $posix_mkdir in '') - # Create intermediate dirs using mode 755 as modified by the umask. - # This is like FreeBSD 'install' as of 1997-10-28. - umask=`umask` - case $stripcmd.$umask in - # Optimize common cases. - *[2367][2367]) mkdir_umask=$umask;; - .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; - - *[0-7]) - mkdir_umask=`expr $umask + 22 \ - - $umask % 100 % 40 + $umask % 20 \ - - $umask % 10 % 4 + $umask % 2 - `;; - *) mkdir_umask=$umask,go-w;; - esac - - # With -d, create the new directory with the user-specified mode. - # Otherwise, rely on $mkdir_umask. - if test -n "$dir_arg"; then - mkdir_mode=-m$mode - else - mkdir_mode= - fi - - posix_mkdir=false - case $umask in - *[123567][0-7][0-7]) - # POSIX mkdir -p sets u+wx bits regardless of umask, which - # is incompatible with FreeBSD 'install' when (umask & 300) != 0. - ;; - *) - # Note that $RANDOM variable is not portable (e.g. dash); Use it - # here however when possible just to lower collision chance. - tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ - - trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0 - - # Because "mkdir -p" follows existing symlinks and we likely work - # directly in world-writeable /tmp, make sure that the '$tmpdir' - # directory is successfully created first before we actually test - # 'mkdir -p' feature. - if (umask $mkdir_umask && - $mkdirprog $mkdir_mode "$tmpdir" && - exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1 - then - if test -z "$dir_arg" || { - # Check for POSIX incompatibilities with -m. - # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or - # other-writable bit of parent directory when it shouldn't. - # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. - test_tmpdir="$tmpdir/a" - ls_ld_tmpdir=`ls -ld "$test_tmpdir"` - case $ls_ld_tmpdir in - d????-?r-*) different_mode=700;; - d????-?--*) different_mode=755;; - *) false;; - esac && - $mkdirprog -m$different_mode -p -- "$test_tmpdir" && { - ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"` - test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" - } - } - then posix_mkdir=: - fi - rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" - else - # Remove any dirs left behind by ancient mkdir implementations. - rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null - fi - trap '' 0;; - esac;; + # Create intermediate dirs using mode 755 as modified by the umask. + # This is like FreeBSD 'install' as of 1997-10-28. + umask=`umask` + case $stripcmd.$umask in + # Optimize common cases. + *[2367][2367]) mkdir_umask=$umask;; + .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; + + *[0-7]) + mkdir_umask=`expr $umask + 22 \ + - $umask % 100 % 40 + $umask % 20 \ + - $umask % 10 % 4 + $umask % 2 + `;; + *) mkdir_umask=$umask,go-w;; + esac + + # With -d, create the new directory with the user-specified mode. + # Otherwise, rely on $mkdir_umask. + if test -n "$dir_arg"; then + mkdir_mode=-m$mode + else + mkdir_mode= + fi + + posix_mkdir=false + case $umask in + *[123567][0-7][0-7]) + # POSIX mkdir -p sets u+wx bits regardless of umask, which + # is incompatible with FreeBSD 'install' when (umask & 300) != 0. + ;; + *) + tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ + trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 + + if (umask $mkdir_umask && + exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 + then + if test -z "$dir_arg" || { + # Check for POSIX incompatibilities with -m. + # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or + # other-writable bit of parent directory when it shouldn't. + # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. + ls_ld_tmpdir=`ls -ld "$tmpdir"` + case $ls_ld_tmpdir in + d????-?r-*) different_mode=700;; + d????-?--*) different_mode=755;; + *) false;; + esac && + $mkdirprog -m$different_mode -p -- "$tmpdir" && { + ls_ld_tmpdir_1=`ls -ld "$tmpdir"` + test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" + } + } + then posix_mkdir=: + fi + rmdir "$tmpdir/d" "$tmpdir" + else + # Remove any dirs left behind by ancient mkdir implementations. + rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null + fi + trap '' 0;; + esac;; esac if $posix_mkdir && ( - umask $mkdir_umask && - $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" + umask $mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" ) then : else @@ -387,51 +391,53 @@ do # directory the slow way, step by step, checking for races as we go. case $dstdir in - /*) prefix='/';; - [-=\(\)!]*) prefix='./';; - *) prefix='';; + /*) prefix='/';; + [-=\(\)!]*) prefix='./';; + *) prefix='';; esac + eval "$initialize_posix_glob" + oIFS=$IFS IFS=/ - set -f + $posix_glob set -f set fnord $dstdir shift - set +f + $posix_glob set +f IFS=$oIFS prefixes= for d do - test X"$d" = X && continue - - prefix=$prefix$d - if test -d "$prefix"; then - prefixes= - else - if $posix_mkdir; then - (umask=$mkdir_umask && - $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break - # Don't fail if two instances are running concurrently. - test -d "$prefix" || exit 1 - else - case $prefix in - *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; - *) qprefix=$prefix;; - esac - prefixes="$prefixes '$qprefix'" - fi - fi - prefix=$prefix/ + test X"$d" = X && continue + + prefix=$prefix$d + if test -d "$prefix"; then + prefixes= + else + if $posix_mkdir; then + (umask=$mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break + # Don't fail if two instances are running concurrently. + test -d "$prefix" || exit 1 + else + case $prefix in + *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; + *) qprefix=$prefix;; + esac + prefixes="$prefixes '$qprefix'" + fi + fi + prefix=$prefix/ done if test -n "$prefixes"; then - # Don't fail if two instances are running concurrently. - (umask $mkdir_umask && - eval "\$doit_exec \$mkdirprog $prefixes") || - test -d "$dstdir" || exit 1 - obsolete_mkdir_used=true + # Don't fail if two instances are running concurrently. + (umask $mkdir_umask && + eval "\$doit_exec \$mkdirprog $prefixes") || + test -d "$dstdir" || exit 1 + obsolete_mkdir_used=true fi fi fi @@ -444,25 +450,14 @@ do else # Make a couple of temp file names in the proper directory. - dsttmp=${dstdirslash}_inst.$$_ - rmtmp=${dstdirslash}_rm.$$_ + dsttmp=$dstdir/_inst.$$_ + rmtmp=$dstdir/_rm.$$_ # Trap to clean up those temp files at exit. trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 # Copy the file name to the temp name. - (umask $cp_umask && - { test -z "$stripcmd" || { - # Create $dsttmp read-write so that cp doesn't create it read-only, - # which would cause strip to fail. - if test -z "$doit"; then - : >"$dsttmp" # No need to fork-exec 'touch'. - else - $doit touch "$dsttmp" - fi - } - } && - $doit_exec $cpprog "$src" "$dsttmp") && + (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") && # and set any options; do chmod last to preserve setuid bits. # @@ -477,12 +472,15 @@ do # If -C, don't bother to copy if it wouldn't change the file. if $copy_on_change && - old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && - new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && - set -f && + old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && + new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && + + eval "$initialize_posix_glob" && + $posix_glob set -f && set X $old && old=:$2:$4:$5:$6 && set X $new && new=:$2:$4:$5:$6 && - set +f && + $posix_glob set +f && + test "$old" = "$new" && $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1 then @@ -495,24 +493,24 @@ do # to itself, or perhaps because mv is so ancient that it does not # support -f. { - # Now remove or move aside any old file at destination location. - # We try this two ways since rm can't unlink itself on some - # systems and the destination file might be busy for other - # reasons. In this case, the final cleanup might fail but the new - # file should still install successfully. - { - test ! -f "$dst" || - $doit $rmcmd -f "$dst" 2>/dev/null || - { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && - { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } - } || - { echo "$0: cannot unlink or rename $dst" >&2 - (exit 1); exit 1 - } - } && - - # Now rename the file to the real destination. - $doit $mvcmd "$dsttmp" "$dst" + # Now remove or move aside any old file at destination location. + # We try this two ways since rm can't unlink itself on some + # systems and the destination file might be busy for other + # reasons. In this case, the final cleanup might fail but the new + # file should still install successfully. + { + test ! -f "$dst" || + $doit $rmcmd -f "$dst" 2>/dev/null || + { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && + { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } + } || + { echo "$0: cannot unlink or rename $dst" >&2 + (exit 1); exit 1 + } + } && + + # Now rename the file to the real destination. + $doit $mvcmd "$dsttmp" "$dst" } fi || exit 1 @@ -521,9 +519,9 @@ do done # Local variables: -# eval: (add-hook 'before-save-hook 'time-stamp) +# eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC0" +# time-stamp-time-zone: "UTC" # time-stamp-end: "; # UTC" # End: diff --git a/Build/source/utils/autosp/autosp-src/process_command.c b/Build/source/utils/autosp/autosp-src/process_command.c index d2feb5ae19f..6ec9e8533ea 100644 --- a/Build/source/utils/autosp/autosp-src/process_command.c +++ b/Build/source/utils/autosp/autosp-src/process_command.c @@ -11,6 +11,7 @@ void analyze_notes (char **ln) 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 @@ void analyze_notes (char **ln) 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 @@ output_rests (void) } 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 @@ void initialize_notes () 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 @@ void generate_notes () 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 @@ void process_command (char **ln) } *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)++;} } diff --git a/Build/source/utils/autosp/autosp-src/process_score.c b/Build/source/utils/autosp/autosp-src/process_score.c index f1c30d412bd..bdd63ddf8f5 100644 --- a/Build/source/utils/autosp/autosp-src/process_score.c +++ b/Build/source/utils/autosp/autosp-src/process_score.c @@ -25,6 +25,7 @@ void process_score () 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; diff --git a/Build/source/utils/autosp/autosp-src/process_score.h b/Build/source/utils/autosp/autosp-src/process_score.h index 34f790b1878..152f4c1b795 100644 --- a/Build/source/utils/autosp/autosp-src/process_score.h +++ b/Build/source/utils/autosp/autosp-src/process_score.h @@ -22,6 +22,9 @@ char TransformNotes2[SHORT_LEN]; /* 2nd argument of \TransformNotes */ 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 */ diff --git a/Build/source/utils/autosp/autosp-src/spacing_note.c b/Build/source/utils/autosp/autosp-src/spacing_note.c index ac3ee2f0b5b..631ff1ba5ba 100644 --- a/Build/source/utils/autosp/autosp-src/spacing_note.c +++ b/Build/source/utils/autosp/autosp-src/spacing_note.c @@ -30,7 +30,7 @@ int collective_note (int i) 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? */ ) diff --git a/Build/source/utils/autosp/autosp-src/tests/quod2.tex b/Build/source/utils/autosp/autosp-src/tests/quod2.tex index 02470cda760..7d5bb0bf018 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 (2019-08-26). +% Generated by autosp (2019-12-22). \input musixtex \input musixplt \input soul.sty diff --git a/Build/source/utils/autosp/autosp-src/tests/quod4.aspc b/Build/source/utils/autosp/autosp-src/tests/quod4.aspc index b3d4e367582..e80b91680b8 100644 --- a/Build/source/utils/autosp/autosp-src/tests/quod4.aspc +++ b/Build/source/utils/autosp/autosp-src/tests/quod4.aspc @@ -42,49 +42,202 @@ \staffbotmarg=3.0\Interligne% \startpiece\addspace\afterruleskip% \systemnumbers% +\scale\normalvalue \anotes \ds& \cu d& \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& + \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 - \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 + \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& + \qa g\sk& + \ibl2n{-1}\qb2{n}\qb2{o}& + \qa{k}\sk\en +\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 + \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& + \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 - \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 + \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& + \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 - \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 + \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,67 +245,311 @@ \qa{h}\sk\qa{h}\sk\qa{i}\sk\qa{i}\sk\en \bar%8 \nspace +\scale\normalvalue +\anotes + \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\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\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& \ds& \cl o\en \bar%9 +\scale\normalvalue +\anotes + \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{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{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\tqsk\qa b& + \tqsk\tqsk\ibl1k2\qb1{^k}& + \tqsk\tqsk\ibl2o{-1}\qb2p& + \tqsk\tqsk\ibl3n{-2}\qb3n\en +\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 + \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& + \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 - \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 + \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}& + \qa{d}& + \ibu2i0\qb2i& + \ibl3i0\qb3{i}\en +\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 + \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& + \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 - \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 + \cu G& + \cu g& + \cl i& + \cu g\en \setrightrepeat \endpiece% \eject diff --git a/Build/source/utils/autosp/autosp-src/tests/quod4.tex b/Build/source/utils/autosp/autosp-src/tests/quod4.tex index bcc4457c491..543f10f584b 100644 --- a/Build/source/utils/autosp/autosp-src/tests/quod4.tex +++ b/Build/source/utils/autosp/autosp-src/tests/quod4.tex @@ -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% diff --git a/Build/source/utils/autosp/configure b/Build/source/utils/autosp/configure index a1f4d0221b2..128330df5fb 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) 2019-08-26. +# Generated by GNU Autoconf 2.69 for autosp (TeX Live) 2019-12-22. # # Report bugs to . # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='autosp (TeX Live)' PACKAGE_TARNAME='autosp--tex-live-' -PACKAGE_VERSION='2019-08-26' -PACKAGE_STRING='autosp (TeX Live) 2019-08-26' +PACKAGE_VERSION='2019-12-22' +PACKAGE_STRING='autosp (TeX Live) 2019-12-22' 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) 2019-08-26 to adapt to many kinds of systems. +\`configure' configures autosp (TeX Live) 2019-12-22 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) 2019-08-26:";; + short | recursive ) echo "Configuration of autosp (TeX Live) 2019-12-22:";; 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 2019-08-26 +autosp (TeX Live) configure 2019-12-22 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 2019-08-26, which was +It was created by autosp (TeX Live) $as_me 2019-12-22, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3789,7 +3789,7 @@ fi # Define the identity of the package. PACKAGE='autosp--tex-live-' - VERSION='2019-08-26' + VERSION='2019-12-22' cat >>confdefs.h <<_ACEOF @@ -5973,7 +5973,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 2019-08-26, which was +This file was extended by autosp (TeX Live) $as_me 2019-12-22, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -6030,7 +6030,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 2019-08-26 +autosp (TeX Live) config.status 2019-12-22 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 e1503f51cdf..a9d17b403db 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], [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@tug.org]) AC_PREREQ([2.65]) AC_CONFIG_SRCDIR([autosp-src/autosp.c]) -- cgit v1.2.3