From 3e0b4848b04542e4b5d3510fbdff3b826354714a Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 4 Mar 2018 23:59:46 +0000 Subject: autosp for tl18 git-svn-id: svn://tug.org/texlive/trunk@46820 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/generic/autosp/README | 27 +- Master/texmf-dist/doc/generic/autosp/autosp.1 | 300 +++++++++++++++++++++ Master/texmf-dist/doc/generic/autosp/autosp.pdf | Bin 10194 -> 12372 bytes Master/texmf-dist/doc/generic/autosp/barsant2.aspc | 46 ++-- Master/texmf-dist/doc/generic/autosp/barsant2.pdf | Bin 31301 -> 33166 bytes .../texmf-dist/doc/generic/autosp/geminiani.aspc | 74 +++-- Master/texmf-dist/doc/generic/autosp/geminiani.pdf | Bin 145379 -> 146009 bytes Master/texmf-dist/doc/generic/autosp/kinder2.aspc | 86 +++--- Master/texmf-dist/doc/generic/autosp/kinder2.pdf | Bin 32281 -> 32967 bytes Master/texmf-dist/doc/generic/autosp/quod2.aspc | 9 +- Master/texmf-dist/doc/generic/autosp/quod2.pdf | Bin 31937 -> 33769 bytes Master/texmf-dist/doc/generic/autosp/quod2A.aspc | 163 +++++++++++ Master/texmf-dist/doc/generic/autosp/quod2A.pdf | Bin 0 -> 24235 bytes Master/texmf-dist/doc/generic/autosp/rebar.1 | 73 +++++ Master/texmf-dist/doc/generic/autosp/tex2aspc.1 | 46 ++++ Master/texmf-dist/doc/generic/autosp/tex2aspc.pdf | Bin 0 -> 4127 bytes 16 files changed, 699 insertions(+), 125 deletions(-) create mode 100644 Master/texmf-dist/doc/generic/autosp/autosp.1 create mode 100644 Master/texmf-dist/doc/generic/autosp/quod2A.aspc create mode 100644 Master/texmf-dist/doc/generic/autosp/quod2A.pdf create mode 100644 Master/texmf-dist/doc/generic/autosp/rebar.1 create mode 100644 Master/texmf-dist/doc/generic/autosp/tex2aspc.1 create mode 100644 Master/texmf-dist/doc/generic/autosp/tex2aspc.pdf (limited to 'Master/texmf-dist/doc/generic/autosp') diff --git a/Master/texmf-dist/doc/generic/autosp/README b/Master/texmf-dist/doc/generic/autosp/README index e8b174dc3b7..ea1b5218811 100644 --- a/Master/texmf-dist/doc/generic/autosp/README +++ b/Master/texmf-dist/doc/generic/autosp/README @@ -1,5 +1,5 @@ This is the README for the autosp package, -version 2017-04-06. +version 2018-02-23. autosp is a preprocessor that generates note-spacing commands for MusiXTeX scores. It simplifies the creation @@ -25,13 +25,6 @@ precede note segments, allowing more flexible source formatting; the line breaks and spaces will be elided from the output. -If applied to a file with .tex extension, autosp will -process conventional note-spacing commands (but not \vnotes -or \znotes) similarly. This is intended to correct spacing -in an extracted single-instrument part, but may not -produce satisfactory output when applied to a conventional -multi-instrument MusiXTeX score. - If there is a single staff, consecutive whole-bar rest bars are merged into a multi-bar rest. Bar-centered rests can be coded using the standard \def\atnextbar notation but also @@ -39,14 +32,19 @@ by using the non-standard command \Cpause in a note segment. Spacing commands \sk and \hsk in the source are discarded, but not \qsk, \hqsk or \qqsk; moreover non-standard commands -\Qsk, \HQsk and \QQsk generate "global" skips; i.e., the -effect of \qsk, \hqsk or \qqsk in *every* staff. +\Qsk, \TQsk, \HQsk and \QQsk generate "global" skips; i.e., the +effect of \qsk, \tqsk, \hqsk or \qqsk in *every* staff. A note segment can be completely empty, but if a note segment should start with or contain a "space," the note-value of that space must be made explicit with a command of the form \ha{*}, \qa{.*}, \qa{*}, \ca{*}, etc. +From version 2017-06-14, the effects of \TransformNotes calls are +implemented by the pre-processor. This enables use of autosp with +musixlyr.tex, which is incompatible with the musixtnt.tex implementation +of \TransformNotes. + All other conventional MusiXTeX commands are output exactly as given in the input. @@ -114,13 +112,18 @@ comments of the form %barno appended to commands such as \bar, \alaligne, etc. replacing any existing comments. Bar-numbering in the MusiXTeX output is not affected +Also included is the program tex2aspc which re-factors +conventional MusiXTeX scores to aspc format suitable for +autosp pre-processing by merging every conventional notes +commands in a measure into a single \anotes command. + To install the autosp package, unzip autosp.tds.zip at the root of a local or personal texmf tree and update the file-name database. This will install documentation and examples. -On Windows or MacOSX, install the relevant binaries on the -PATH of executables. On Unix-like systems, unpack the +On Windows or MacOSX, install the relevant binaries on +the PATH of executables. On Unix-like systems, unpack the .tar.gz archive, and compile and install using the sequence ./configure && make && sudo make install diff --git a/Master/texmf-dist/doc/generic/autosp/autosp.1 b/Master/texmf-dist/doc/generic/autosp/autosp.1 new file mode 100644 index 00000000000..3d51ccd5947 --- /dev/null +++ b/Master/texmf-dist/doc/generic/autosp/autosp.1 @@ -0,0 +1,300 @@ +.\" This manpage is licensed under the GNU Public License +.TH AUTOSP 1 2018-02-14 "" "" + +.SH NAME +autosp \- preprocessor to generate note-spacing commands for MusiXTeX scores + +.SH SYNOPSIS +.B autosp +.RB [ \-v\ |\ \-\-version\ |\ \-h\ |\ \-\-help ] + +.B autosp +.RB [ \-d\ |\ \-\-dotted ] +.RB [ \-l\ |\ \-\-log ] +.IR infile [\fR.aspc\fP] +.RI [ outfile [ \fR.tex\fP ]] + + +This program makes it easier to create MusiXTeX scores by converting (non-standard) commands of the +form \\anotes ... \\en into one or more conventional +note-spacing commands (\\notes \\Notes \\NOtes ...), +determined by the actual note values, with \\sk spacing commands inserted as necessary. +The coding +for an entire measure can be entered one part at a time, +without +concern for note-spacing changes within the part or spacing requirements of other parts. + +For example, if applied to +.nf + + \\anotes\\qa J\\qa K&\\ca l\\qa m\\ca n\\en + +.fi +.B autosp +generates +.nf + + \\Notes\\qa J\\sk\\qa K\\sk&\\ca l\\qa m\\sk\\ca n\\en + +.fi +Typically, +an +\\anotes command generates several conventional +note-spacing commands. + +If the +.I infile +argument +does not have an .aspc extension, input is taken from +.IR infile .aspc +if that file exists. + +If the +.I outfile +argument does not have a .tex extension, output is sent to +.IR outfile .tex. +If no +.I outfile +argument is provided, output will go to +.IR infile .tex +(or to +.IR infile .ltx +if a \\documentclass declaration is encountered). + +For +\\anotes commands, +line breaks and spaces may precede note segments, allowing more flexible source formatting; +the line breaks and spaces will be elided from the output. + +For example, +.nf + + \\anotes + \\ibl0K0\\qb0K\\nbbl0\\qb0{.K}\\tbbbl0\\tbbl0\\tql0L& + \\ibbl1m{-2}\\qb1{.m}\\tbbbl1\\tbbl1\\qb1l\\tql1k\\en + +.fi +is acceptable and generates +.nf + + \\notesp\\ibl0K0\\qb0K&\\ibbl1m{-2}\\qb1{.m}\\en + \\nnotes\\sk&\\tbbbl1\\tbbl1\\qb1l\\en + \\notesp\\nbbl0\\qb0{.K}&\\tql1k\\en + \\nnotes\\tbbbl0\\tbbl0\\tql0L&\\sk\\en + +.fi + + +If the +.B \-l +( \fB\-\-log\fP ) option is used, a very detailed log +.IR infile .alog +is generated. + +If the +.B \-d +( \fB--dotted\fP ) +option is used, +.I dotted +beam notes of the form \\qb{\fIn\fP}{\fB.\fP\fIp\fP} are +.I not +given extra space; +it is assumed that the subsequent note will be shifted +by +a \\roff-like command +or a spacing command such as \\qsk or \\hqsk. +Commands of the form \\qlp{\fIp\fP}, \\qlpp{\fIp\fP}, ..., \\qpb{\fIn\fP}{\fIp\fP} and +\\qppb{\fIn\fP}{\fIp\fP} are always spaced +as indicated. + +If there is a single staff, consecutive whole-bar rest bars +are merged into a multi-bar rest. Bar-centered rests can be +coded using the standard \\def\\atnextbar notation but +the non-standard command \\Cpause in a note segment also generates a +bar-centered rest. + +Spacing commands \\sk and \\bsk in the source are discarded, +but not "small" skips \\hsk, \\qsk, \\tqsk, \\hqsk or \\qqsk, +or the small "backward" skips \\hbsk, \\bqsk, \\btsk, or \\bhsk. +Moreover, +non-standard commands +\\QQsk, \\HQsk \\TQsk and \\Qsk in the source generate "global" skips; i.e., the effect of \\qqsk, \\hqsk, \\tqsk or \\qsk, respectively, in +.I every +staff. These ensure that staffs remain synchronized if additional spacing is needed in any staff(s). + +Global skips may also be obtained within collective-coding sequences by using +up to four successive commas +to get the effects of \\QQsk, \\HQsk, \\TQsk or \\Qsk, respectively. +Global skips \\tqsk (or, for double-flats, \\qsk) are +automatically inserted before accidentals ('^', '_', '=', '<', '>') on collective-coding notes +(except when the preceding note is "virtual"; i.e., a skip). +If this automatic additional spacing is +.I not +wanted in some context, it may be avoided by +replacing +the accidental in the collective-coding sequence +by +any of the +.I explicit +accidental commands: \\sh, \\fl, \\na, \\smallsh, \\bigsh, etc. +If the automatic spacing is insufficient, the spacing may be increased by adding sufficient commas or +using a conventional notes command instead of \\anotes. + + +A note segment can be completely empty, but if a note segment should start +with or contain a "space," the note-value +of that space must be made explicit with a command of the +form \\ha{*}, \\qa{.*}, \\qa{*}, \\ca{*}, etc. + +From version 2017-06-14, the effects of \\TransformNotes calls are implemented by the +.B autosp +pre-processor. This +enables use of +musixlyr in +.B autosp +scores; musixlyr.tex +is incompatible with the +musixtnt.tex +implementation of \\TransformNotes. + +All other conventional MusiXTeX commands are output exactly as given in the input. + + +.SH OPERATION + +.B autosp +determines the spacing for ordinary notes from the note +commands themselves; for example, +.TP 3 ++ +\\qa, \\qu, \\ql, \\qp result in +\\NOtes; +.TP 3 ++ +\\ca, \\cu, \\cl, \\ds result in \\Notes; +.PP +and so on. + +The spacing for +.IR beamed +notes is determined by the beam +multiplicity, so that \\ib... results in \\Notes, \\ibb... results in +\\notes, etc. + +Collective coding of note sequences (including accidentals and dots) is handled +by expanding the sequence +into a sequence of individual note commands. + + +.SH LIMITATIONS + +.B autosp +assumes that & and | (rather than \\nextinstrument and \\nextstaff) are used to separate instruments and staffs. + + +Appoggiaturas and grace notes are recognized by the use of \\tinynotesize; note-spacing +of 1.45\\elemskip is used. If this isn't suitable and can't be corrected with a small skip, a +\\vnotes command with any desired spacing can be used. + +.B autosp +supports +.I x-tuplets +introduced using \\xtuplet{\fIx\fP} +or \\xxtuplet{\fIx:y\fP} +and +.I triplets +introduced +using any of the following commands (regardless of any re-definition of \\txt or \\tuplettxt): +.nf + + \\triolet + \\uptrio + \\downtrio + \\uptuplet + \\downtuplet + +.fi +.B autosp +assumes that an x-tuplet is to be played in +(\fIx\fP\-1)/\fIx\fP +of the apparent x-tuplet duration. +So, for example, a triplet in eighths is assumed to be played in the time of one quarter note. +If this assumption +isn't valid, the x-tuplet must +be coded explicitly using a suitable \\vnotes command; see the first +measure of barsant2.aspc for an example of a non-standard x-tuplet: a 5-tuple +of 64th notes with an intended duration +of +.I six +64ths. + +In some polyrhythmic scores, the \\txt numeral may be displaced, even if the notes +themselves are correctly spaced. In these cases, it is possible to suppress +the normal output of \\txt by using the non-standard commands \\Triolet (no arguments) +or \\Xtuplet{k}\\ +and placing a numeral at the correct location using \\zcn (i.e., \\zcharnote). + +.B autosp +can deal with simultaneous x-tuplets in multiple staffs provided the x values and +total note durations are identical. + +In some baroque scores, particularly by J.S. Bach, a beamed sixteenth note is vertically aligned +with +the third note of a triplet of eighth notes in another staff (implying that they should +be sounded simultaneously); e.g., +.nf + + \\ibl0L0\\qb0{.L}\\tqql0L + +.fi +would be played as if notated +.nf + + \\uptrio{b}10\\ql L\\hroff{\\cl L} + +.fi +The following coding will align the beamed sixteenth note +with the third note of a triplet in another staff: +.nf + + \\ibl0L0\\qb0{.L}\\hbsk\\tqql0L + +.fi +and, similarly, for triplets of sixteenth notes: +.nf + + \\ibbu0J0\\qb0{.J}\\hbsk\\nqqqu0J\\qb0{.J}\\hbsk\\tqqqu0J + +.fi +Generally, user-defined macros are not processed or expanded; however, definitions of the form +.nf + + \\def\\atnextbar{\\znotes ... \\en} + +.fi +generate definitions that do take account of \\TransformNotes. + +All staffs are assumed to have the same meter; see kinder2.aspc for +an example of how to work around this. + +.B autosp +may not be effective for music with more than one voice in a single staff. It might be +advisable to use a separate staff for each voice, to avoid \\anotes when necessary, +or to omit certain voices +initially and add them into the resulting TeX file. + +.SH EXAMPLES +See files quod2.aspc, kinder2.aspc, geminiani.aspc and barsant2.aspc for scores suitable for input to +.BR autosp . +The program +.B tex2aspc +can be used to convert "legacy" MusiXTeX scores to .aspc format. + +.SH SEE ALSO +.BR msxlint (1) +.BR tex2aspc (1) +.PP +musixdoc.pdf + +.SH AUTHOR +This program and manual page were written by Bob Tennent . diff --git a/Master/texmf-dist/doc/generic/autosp/autosp.pdf b/Master/texmf-dist/doc/generic/autosp/autosp.pdf index 785360f2a7e..f4c1e0e38d8 100644 Binary files a/Master/texmf-dist/doc/generic/autosp/autosp.pdf and b/Master/texmf-dist/doc/generic/autosp/autosp.pdf differ diff --git a/Master/texmf-dist/doc/generic/autosp/barsant2.aspc b/Master/texmf-dist/doc/generic/autosp/barsant2.aspc index ba0f7ec6166..469a0c7ca92 100644 --- a/Master/texmf-dist/doc/generic/autosp/barsant2.aspc +++ b/Master/texmf-dist/doc/generic/autosp/barsant2.aspc @@ -15,8 +15,8 @@ \setname1{Basso} \setname2{Recorder} \advance\parindent by 10ex -\fulltitle{\BIgfont\so{Adagio}} -\author{Francesco Barsanti (1690--1772)} +\fulltitle{\BIGtype\so{Adagio}} +\author{Francesco Barsanti ({\sc 1690--1772})} \def\outmorceau{\shipout\vbox{\vbox to \vsize{\vss\pagecontents\vss}}} \maketitle \songbottom1\songtop2 @@ -31,7 +31,7 @@ \ca{*}\ds\ca M& \nbbl1\qb1{.l}\tbbbl1\tql1k\ibbl1j5\roff{\tbbbl1}\qb1j\tbl1\itieu1o\qb1{.o}\ttie1\ibbbl1o{-4}\qb1o\en % non-standard xtuplet: -\vnotes1.28\elemskip&\nbbbbl1\multnoteskip{1.125}\xtuplet5{n}\isluru1o\qb1{nmlk}\tslur1l\tql1j\en +\vnotes1.28\elemskip&\nbbbbl1\multnoteskip{1.125}\xxtuplet5:6{n}\isluru1o\qb1{nmlk}\tslur1l\tql1j\en \vnotes1.2\elemskip&\tinynotesize\cu j\en \anotes \ibl0M{-2}\qb0M\tql0L\ds\ca J& @@ -47,7 +47,7 @@ \bar%3 \anotes \ibu0J{-2}\qb0J\itied0I\tqu0{_I}& - \ibbl1m5\qb1{^m}\itieu1r\tql1{r}\ttie1\ibbbl1r{-4}\qb1{rq}\hqsk\triolet q\slur rpu2\qb1{_p}\qb1{o}\tql1n\en + \ibbl1m5\qb1{^m}\itieu1r\tql1{r}\ttie1\ibbbl1r{-4}\qb1{rq}\triolet q\slur rpu2\qb1{_p}\qb1{o}\tql1n\en \vnotes1.2\elemskip&\tinynotesize\cu{=m}\en \anotes \ttie0\ibu0I{-2}\qb0I\itied0H\tqu0H& @@ -74,46 +74,46 @@ \ibl0J3\qb0J\nbbl0\qb0{.L}\tbbbl0\tql0M\ibbl0N{-3}\qb0{.N}\tbbbl0\qb0M\qb0{.L}\tbbbl0\tbbl0\tql0K& \qa j\ds\ibbl1l2\qb1{.l}\tbbbl1\tbbl1\tql1m\en \bar%6 -\anotes\qa{^J}&\ca n\ibbl1m0\triolet o\qb1{n}\hqsk\smallsh m\qb1{m}\tql1n\qsk\en -\anotes\ds\ca J&\ca{_p}\ibbbl1o{-4}\qb1{on}\hqsk\qb1{^m}\tql1l\en +\anotes\qa{^J}&\ca n\ibbl1m0\triolet p\qb1{n^m}\tql1n\en +\anotes\ds\ca J&\ca{_p}\ibbbl1o{-4}\qb1{on}\qb1{^m}\tql1l\en \anotes \qa K\ds\ibbl0M{-3}\qb0{.M}\tbbbl0\tbbl0\tql0L& - \ibbl1k0\qb1{mk}\qqsk\qb1{^j}\tql1k\ibbl1k3\qb1{klm}\qqsk\tql1{^n}\en + \ibbl1k0\qb1{mk}\qb1{^j}\tql1k\ibbl1k3\qb1{klm}\tql1{^n}\en \bar%7 -\anotes\qa{^K}&\ca o\ibbl1n0\triolet q\qb1{o}\hqsk\smallsh n\qb1{n}\tql1o\qsk\en +\anotes\qa{^K}&\ca o\ibbl1n0\triolet q\qb1{o}\qb1{,,,^n}\tql1o\en \anotes\ds\ca K&\ibl1q{-4}\qb1q\shake r\nbbl1\qb1{.p}\tbbbl1\tbbl1\tql1o\en \anotes - \ibl0L0\qb0L\nbbl0\qb0{.L}\qsk\tbbbl0\tbbl0\smallsh M\tql0{M}\qsk& + \ibl0L0\qb0L\nbbl0\qb0{.L}\qsk\tbbbl0\tbbl0\tql0{^M}& \ibl1m{-2}\roff{\tbbl1}\qb1n\tql1{.l}\en -\anotes\ibl0N{-5}\smallsh N\qb0{N}\tql0L&\qs\ibbl1n0\qb1p\shake r\qb1{.p}\nbbbbl1\qb1o\tql1p\en +\anotes\ibl0N{-5}\qb0{^N}\tql0L&\qs\ibbl1n0\qb1p\shake r\qb1{.p}\nbbbbl1\qb1o\tql1p\en \bar%8 \anotes\qa a&\ibbl1q{-5}\triolet r\qb1{qp}\tql1o\ibbl1o{-5}\triolet p\qb1{on}\tql1m\en \anotes\ds\ca a&\ibbl1m0\triolet n\qb1{ml}\tql1m\ca q\en \anotes\qa N&\ibbl1p{-5}\triolet q\qb1{po}\tql1n\ibbl1n{-5}\triolet o\qb1{nm}\tql1l\en -\anotes\ds\ca N&\ibbl1l0\triolet n\qb1{l}\hqsk\qqsk\qb1{^k}\tql1l\ca p\en +\anotes\ds\ca N&\ibbl1l0\triolet n\qb1{l,,,^k}\tql1l\ca p\en \bar%9 \anotes\qa M&\ibbl1o{-5}\triolet p\qb1{on}\tql1m\ibbl1m{-5}\triolet n\qb1{ml}\tql1k\en -\anotes\ds\ca K&\ibbl1k0\triolet m\qb1{k}\hqsk\qqsk\qb1{^j}\tql1k\ca o\en +\anotes\ds\ca K&\ibbl1k0\triolet m\qb1{k,,,^j}\tql1k\ca o\en \anotes\qa L&\ibbl1n4\qb1{^n}\tbbl1\qb1p\tql1r\en \anotes\qa{^G}&\qs\ibbl1r{-3}\qb1r\qb1{.q}\tbbbl1\tbbl1\tql1p\en \bar%10 -\anotes\qa H&\ibbl1o{-2}\qb1{qo}\hqsk\qb1{_p}\hqsk\tql1{^n}\en -\anotes\qp&\ibbl1m{-2}\qb1{o}\hqsk\qb1{^m}\hqsk\qb1{=n}\tql1l\hqsk\en -\anotes\qp&\ibbl1k{-2}\qb1{=m}\hqsk\qb1{^kl}\hqsk\tql1{^j}\hqsk\en +\anotes\qa H&\ibbl1o{-2}\qb1{qo}\qb1{_p}\tql1{^n}\en +\anotes\qp&\ibbl1m{-2}\qb1{o}\qb1{^m}\qb1{=n}\tql1l\en +\anotes\qp&\ibbl1k{-2}\qb1{=m}\qb1{^kl}\tql1{^j}\en \anotes\qa{^N}&\ibbl1k0\qb1{=kml}\tql1k\en \bar%11 \anotes\ibl0M{-4}\qb0a\tql0K&\ibbl1j1\qb1{j^no}\tql1k\en \anotes\ibu0L{-5}\qb0L\tqu0E&\ibu1i{-2}\shake q\qb1{.i}\tbbu1\tqu1h\en -\anotes\ibl0I4\qb0H\nbbl0\qb0{.a}\tbbbl0\tbbl0\tql0b\qsk&\qa h\en -\anotes\ibl0a{-5}\smallsh c\qb0{c}\smallsh N\tql0{N}&\ds\ibbl1l{-1}\qb1{.l}\tbbbl1\tbbl1\tql1k\en +\anotes\ibl0I4\qb0H\nbbl0\qb0{.a}\tbbbl0\tbbl0\tql0b&\qa h\en +\anotes\ibl0a{-5}\qb0{^c}\tql0{^N}&\ds\ibbl1l{-1}\qb1{.l}\tbbbl1\tbbl1\tql1k\en \bar%12 \anotes\qa a&\ibbl1j4\qb1{^jln}\tql1{_p}\en -\anotes\qa{^J}& - \ibbbl1o4\qb1o\hqsk\qqsk\tbbbl1\qb1{^q}\tbbl1\tbl1\itieu1s\qb1s\ttie1\ibbbbl1s{-4}\qb1{sr}\hqsk\qqsk\qb1{=q}\hqsk\qqsk\qb1{_ponm}\tql1l\en +\anotes\bigsh J\qa{J}& + \ibbbl1o4\qb1o\tbbbl1\qb1{^q}\tbbl1\tbl1\itieu1s\qb1s\ttie1\ibbbbl1s{-5}\qb1{sr}\qb1{,,,,=q}\qb1{,,,,_ponm}\tql1l\en \anotes \ibl0K0\qb0K\nbbl0\qb0{.K}\tbbbl0\tbbl0\tql0L& \ibbl1m{-2}\qb1{.m}\tbbbl1\tbbl1\qb1l\shake n\tql1k\en -\anotes\ibl0M{-4}\qb0M\tql0K&\ds\ibbl1k{-2}\qb1{.k}\qsk\tbbbl1\tbbl1\smallna j\tql1{j}\en +\anotes\ibl0M{-4}\qb0M\tql0K&\ds\ibbl1k{-2}\qb1{.k}\qsk\tbbbl1\tbbl1\tql1{^j}\en \bar%13 \anotes\qa N&\ibbl1i5\qb1{ikm}\tql1{o}\en \anotes\qa{I}& @@ -131,14 +131,14 @@ \anotes\ibu0I{-1}\qb0I\nbbu0\qb0{.G}\tbbbu0\tbbu0\tqu0H&\qa n\en \anotes\ibu0I{-2}\qb0I\tqu0G&\qs\ibbl1o{-2}\qb1{_o}\qb1{.n}\tbbbl1\tbbl1\tql1m\en \anotes\qa J&\ibbl1l3\qb1{_l=pq}\tql1{=o}\en -\anotes\qp&\ibbl1n{-1}\qb1{_pn}\hqsk\qb1{_o}\hqsk\tql1{^m}\en +\anotes\qp&\ibbl1n{-1}\qb1{_pn}\qb1{_o}\tql1{^m}\en \bar%16 -\anotes\hp&\ibbl1l{-2}\qb1{nlm}\tql1k\hqsk\ibbl1j{-2}\qb1{_lj}\hqsk\qb1{_k}\hqsk\tql1{=i}\en +\anotes\hp&\ibbl1l{-2}\qb1{nlm}\tql1k\ibbl1j{-2}\qb1{_lj}\qb1{_k}\tql1{=i}\en \anotes\ds\ibl0M{-2}\qb0{ML}\tql0K&\ibl1h0\qb1{jhg}\tql1m\en \bar%17 \anotes\ibu0M0\qb0{JMN}\tqu0G&\ibl1i0\qb1{lh}\shake n\qb1{.k}\tbbl1\tql1j\en \anotes\ha J&\ha j\en -\mulooseness1% +\mulooseness+1% \Endpiece \eject \end diff --git a/Master/texmf-dist/doc/generic/autosp/barsant2.pdf b/Master/texmf-dist/doc/generic/autosp/barsant2.pdf index cc50f2fe8c4..275d1c8965d 100644 Binary files a/Master/texmf-dist/doc/generic/autosp/barsant2.pdf and b/Master/texmf-dist/doc/generic/autosp/barsant2.pdf differ diff --git a/Master/texmf-dist/doc/generic/autosp/geminiani.aspc b/Master/texmf-dist/doc/generic/autosp/geminiani.aspc index b852aa3a819..06e1379fff0 100644 --- a/Master/texmf-dist/doc/generic/autosp/geminiani.aspc +++ b/Master/texmf-dist/doc/generic/autosp/geminiani.aspc @@ -23,7 +23,7 @@ \setname4{Alto Recorder} \setname5{Soprano Recorder} \advance\parindent by 18ex -\fulltitle{\sc\so{Concerto Grosso}} +\fulltitle{\BIgtype\sc\so{Concerto Grosso}} \subtitle{\frtrm Opus~3, Number~4} \author{Francesco Geminiani \sc(1687--1762)} \othermention{Arranged for SATTB Recorders} @@ -56,7 +56,7 @@ \anotes\qup F\qs\cca G&\qa{dh}&\qa{hd}&\qa o\qs\ibbl3o{-3}\qb3{on}\tql3m&\qlp k\qs\cca k\en \bar%3 \anotes\qa{HH}&\ha a&\qlp h\qs\cca h&\qlp l\qs\cca l&\qlp k\qs\cca j\en -\anotes\qa{DK}&\ha d&\ha h&\QQsk\tr{o}\ha{^m}&\qa j\ibl4i{-3}\qb4{.i}\tbbl4\tql4h\en +\anotes\qa{DK}&\ha d&\ha h&\tr{o}\ha{^m}&\qa j\ibl4i{-3}\qb4{.i}\tbbl4\tql4h\en \bar%4 \anotes\qa{GG}&\ha d&\qlp g\qs\cca g&\qa{nk}&\qlp i\qs\cca i\en \anotes\qa{CJ}&\ha c&\ha g&\tinynotesize\qu m\tr{n}\ha l&\tr{k}\qlp i\qs\cca h\en @@ -77,12 +77,12 @@ \anotes\ha I&\qa{gd}&\qa{*g}&\tr{k}\ha g&\ha d\en \Setvolta{1}% \bar%10 -\anotes\qa H\ibl0H2\qb0{.H}\tbbl0\tql0I\ibu0H{-3}\qb0{.H}\tbbu0\qb0G\qb0{.F}\tbbu0\tqu0E&\wh a&\wh e&\wh h&\smallsh c\wh{c}\en +\anotes\qa H\ibl0H2\qb0{.H}\tbbl0\tql0I\ibu0H{-3}\qb0{.H}\tbbu0\qb0G\qb0{.F}\tbbu0\tqu0E&\wh a&\wh e&\wh h&\wh{^c}\en \endvoltabox% \setrightrepeat% \Setvolta{2}% \bar%11 -\anotes\ha H&\ha a&\ha e&\ha h&\smallsh c\ha{c}\en +\anotes\ha H&\ha a&\ha e&\ha h&\ha{^c}\en \anotes\ibu0H{-3}\qb0{.H}\tbbu0\qb0G\qb0{.F}\tbbu0\tqu0E&\hp&\hp&\qlp{^j}\qs\cca j&\qup{e}\qs\cca e\en \bar%12 \anotes\ha D&\Cpause&\ibu2d3\qb2{.d}\tbbu2\qb2e\qb2{.f}\tbbu2\tqu2g&\ha k&\ha f\en @@ -190,7 +190,7 @@ \bar%43 \anotes\ibu0E{0}\qb0{EE}\tqu0D&\Cpause&\ttie2\ibu2c0\qb2{d^c}\tqu2d&\ibl3g0\qb3{.g}\nbbl3\qb3{gh}\tql3i&\ibbl4f0\qb4{gfgef}\tql4g\en \bar%44 -\anotes\ibbu0E3\qb0{^CDCH}\QQsk\qb0{^I}\QQsk\tqu0{^J}&\itieu1h\qa{.h}&\tr l\qa{.e}&\ibl3e0\qb3{he}\tql3g&\ibbl4h{-2}\qb4{hihgf}\tql4e\en +\anotes\ibbu0E3\qb0{^CDCH}\qb0{^I}\tqu0{^J}&\itieu1h\qa{.h}&\tr l\qa{.e}&\ibl3e0\qb3{he}\tql3g&\ibbl4h{-2}\qb4{hihgf}\tql4e\en \bar%45 \anotes\ibl0K{-1}\qb0{KM}\cna J\tql0J&\ttie1\ibl1d0\qb1{hd}\tql1h&\ca d\itieu2h\qa h&\ibl3f2\qb3f\qb3{.h}\tbbl3\tql3h&\ibu4f0\qb4{ff}\tqu4e\en \bar%46 @@ -202,7 +202,7 @@ \bar%49 \anotes\ibl0H0\qb0H\qb0{.H}\tbbl0\tql0H&\qa{.e}&\ca h\qa h&\ibbl3k0\qb3{lklmn}\tql3l&\ttie4\ca d\tr k\qa{^c}\en \bar%50 -\anotes\ibbl0L0\qb0{K}\QQsk\qb0{^JKLM}\tql0K&\qa{.d}&\qa h\itied2d\ca d&\ibbl3m{-2}\qb3{mlkji}\tql3h&\ca d\ibl4f0\qb4{.f}\tbbl4\tql4f\en +\anotes\ibbl0L0\qb0{K}\qb0{^JKLM}\tql0K&\qa{.d}&\qa h\itied2d\ca d&\ibbl3m{-2}\qb3{mlkji}\tql3h&\ca d\ibl4f0\qb4{.f}\tbbl4\tql4f\en \bar%51 \anotes\ibbl0M0\qb0{LKLMN}\tql0L&\qa{.g}&\ttie2\ca d\qa j&\ca g\ibl3n0\qb3{.n}\tbbl3\tql3n&\ibbu4g{-2}\qb4{gfedc}\tqu4b\en \bar%52 @@ -224,7 +224,7 @@ \bar%60 \anotes\ca K\qa N&\ca d\qa g&\ca d\qa g&\ibbl3i0\qb3{^ihijk}\tql3i&\ds\ibu4d0\qb4{.d}\tbbu4\tqu4d\en \bar%61 -\anotes\qa{.J}&\qa{.c}&\qa{.c}&\ibbl3j0\qb3{j}\smallsh i\qb3{ijkj}\QQsk\tql3{=i}&\ibbu4f0\qb4{edefg}\tqu4e\en +\anotes\qa{.J}&\qa{.c}&\qa{.c}&\ibbl3j0\qb3{j}\qb3{^ijkj}\tql3{=i}&\ibbu4f0\qb4{edefg}\tqu4e\en \bar%62 \anotes\qa{.K}&\qa{.d}&\qa{.d}&\ibbl3h0\qb3{hghij}\tql3h&\ibbu4f0\qb4{^fefgh}\tqu4f\en \bar%63 @@ -240,7 +240,7 @@ \bar%68 \anotes\qa{.E}&\ibbl1h0\qb1{^ihijk}\tql1i&\ca e\qa e&\ttie3\ca h\qa{^g}&\ibbu4c0\qb4{^babcd}\tqu4b\en \bar%69 -\anotes\ibu0H0\qb0{H.H}\tbbu0\tqu0H&\qa{.j}&\ibu2c5\qb2{ae}\tqu2h&\ca h\itieu3o\qa o&\ibbu4d0\qb4{c}\QQsk\qb4{^bcde}\tqu4c\en +\anotes\ibu0H0\qb0{H.H}\tbbu0\tqu0H&\qa{.j}&\ibu2c5\qb2{ae}\tqu2h&\ca h\itieu3o\qa o&\ibbu4d0\qb4{c}\qb4{^bcde}\tqu4c\en \bar%70 \anotes\ibbl0H0\qb0{^IHIJK}\tql0I&\qa{.^i}&\qa d\ca{^i}&\ttie3\ca o\qa{^n}&\ibbu4e0\qb4{dcdef}\tqu4d\en \bar%71 @@ -248,43 +248,41 @@ \bar%72 \anotes\ibl0E2\qb0{Da}\tql0H&\ibbu1f0\qb1{defde}\tqu1f&\ibl2f0\qb2{.f}\nbbl2\qb2{fg}\tql2h&\ca m\itieu3m\qa m&\ttie4\ibl4e0\qb4j\qb4d\tql4j\en \bar%73 -\anotes\ibbu0G0\qb0{GHGFE}\tqu0D&\ca g\qa N&\ibbu2d0\qb2{dcd}\QQsk\qb2{^bc}\tqu2d&\ttie3\ibl3i0\qb3{mg}\tql3m&\ca{^i}\itieu4i\qa i\en +\anotes\ibbu0G0\qb0{GHGFE}\tqu0D&\ca g\qa N&\ibbu2d0\qb2{dcd}\qb2{^bc}\tqu2d&\ttie3\ibl3i0\qb3{mg}\tql3m&\ca{^i}\itieu4i\qa i\en \bar%74 \anotes\ibl0D2\qb0{CN}\tql0G&\ibbu1e0\qb1{cdecd}\tqu1e&\ibbu2f0\qb2{efgef}\tqu2g&\ca l\itieu3l\qa l&\ttie4\ibl4e0\qb4i\qb4c\tql4{^i}\en \bar%75 -\anotes\ibbu0F{0}\qb0{FGFED}\tqu0C&\ibbl1f2\qb1f\tql1g\qa h&\ibbu2c0\qb2{c}\QQsk\qb2{^bcab}\tqu2c&\ttie3\ibl3h0\qb3l\qb3f\tql3l&\ca h\itieu4h\qa h\en +\anotes\ibbu0F{0}\qb0{FGFED}\tqu0C&\ibbl1f2\qb1f\tql1g\qa h&\ibbu2c0\qb2{c}\qb2{^bcab}\tqu2c&\ttie3\ibl3h0\qb3l\qb3f\tql3l&\ca h\itieu4h\qa h\en \bar%76 \anotes\ca D\qa M&\ibbu1c0\qb1{^bcdbc}\tqu1d&\ibu2d2\qb2{.d}\nbbu2\qb2{de}\tqu2f&\ca k\itieu3k\qa k&\ttie4\ibu4h0\qb4{h^b}\tqu4h\en \bar%77 \anotes\ibbl0L{-2}\qb0{LMLKJ}\tql0{^I}&\itied1e\qa{.e}&\qa{^b}\ca e&\ttie3\ibl3g0\qb3{ke}\tql3k&\tr k\qa{.^g}\en \bar%78 -\anotes\ibbl0H0\qb0{H^GH}\QQsk\qb0{^IJ}\tql0H&\ttie1\qa e\ca c&\qa{.h}&\ibbl3i{-2}\qb3{j}\QQsk\qb3{^ijih}\tql3g&\ibu4g{-2}\qb4h\qb4a\itied4e\tqu4e\en +\anotes\ibbl0H0\qb0{H^GH}\qb0{^IJ}\tql0H&\ttie1\qa e\ca c&\qa{.h}&\ibbl3i{-2}\qb3{j}\qb3{^ijih}\tql3g&\ibu4g{-2}\qb4h\qb4a\itied4e\tqu4e\en \bar%79 -\anotes\ibbl0K0\qb0{KJKLM}\tql0K&\ca d\qa f&\qa{.h}&\ibbl3f0\qb3{femlk}\tql3j&\ttie4\ca e\ibbl4k{-2}\qb4{kj}\QQsk\qb4{^i}\tql4h\en +\anotes\ibbl0K0\qb0{KJKLM}\tql0K&\ca d\qa f&\qa{.h}&\ibbl3f0\qb3{femlk}\tql3j&\ttie4\ca e\ibbl4k{-2}\qb4{kj}\qb4{^i}\tql4h\en \bar%80 -\nspace -\anotes\ibl0G{0}\qb0L\qb0E\tql0K&\itied1e\qa{.e}&\ds\ibbu2d{-2}\qb2{edc}\QQsk\tqu2{^b}&\ibbl3i2\qb3{^il}\QQsk\qb3{^n}\tql3l\ds&\ibbu4g{0}\qb4{^g}\QQsk\qb4{^f}\QQsk\qb4{e^be}\QQsk\tqu4{^g}\en +\anotes\ibl0G{0}\qb0L\qb0E\tql0K&\itied1e\qa{.e}&\ds\ibbu2d{-2}\qb2{edc}\tqu2{^b}&\ibbl3i2\qb3{^il}\qb3{^n}\tql3l\ds&\ibbu4g{0}\qb4{^g}\qb4{^f}\qb4{e^be}\tqu4{^g}\en \bar%81 -\anotes\qa J\ca J&\ttie1\ca e\itieu1h\qa h&\ibbu2g0\qb2{cehgf}\tqu2e&\ds\ibl3h0\qb3{.h}\tbbl3\tql3h&\ibbu4h{-3}\qb4{h}\QQsk\qb4{=gfed}\tqu4c\en +\anotes\qa J\ca J&\ttie1\ca e\itieu1h\qa h&\ibbu2g0\qb2{cehgf}\tqu2e&\ds\ibl3h0\qb3{.h}\tbbl3\tql3h&\ibbu4h{-3}\qb4{h}\qb4{=gfed}\tqu4c\en \bar%82 \anotes\ca{^I}\qa{L}&\ttie1\ca h\tr k\qa{^g}&\ibbu2f0\qb2d\tbbu2\qb2f\qb2e\itied2e\tqu2e&\ibbl3h0\qb3{^ihijk}\tql3i&\ca d\tr k\qa{^b}\en \bar%83 -\anotes\ca H\itieu0H\qa H&\qa h\ds&\ttie2\ibbu2e{-1}\qb2{edc}\HQsk\qb2{^bc}\tqu2a&\ibbl3j0\qb3{j}\HQsk\qb3{^ijkl}\tql3j&\qa a\ds\en +\anotes\ca H\itieu0H\qa H&\qa h\ds&\ttie2\ibbu2e{-1}\qb2{edc}\qb2{^bc}\tqu2a&\ibbl3j0\qb3{j}\qb3{^ijkl}\tql3j&\qa a\ds\en \bar%84 -\nspace -\anotes\ttie0\ibu0H{0}\qb0H\nbbu0\qb0{GFG}\tqu0E&\Cpause&\ca{^b}\HQsk\tr k\qa{^c}&\ca k\qa l&\Cpause\en +\anotes\ttie0\ibu0H{0}\qb0H\nbbu0\qb0{GFG}\tqu0E&\Cpause&\ca{^b}\tr k\qa{^c}&\ca k\qa l&\Cpause\en \bar%85 \anotes\qa{.F}&\ibl1f0\qb1h\nbbl1\qb1{hgf}\tql1h&\ibbl2d1\qb2{dhfgh}\tql2f&\ca h\itieu3k\qa k&\ds\ibu4d0\qb4{.d}\tbbu4\tqu4d\en \bar%86 \anotes\qa{.E}&\ibl1e0\qb1{ge}\tql1h&\ibbl2f0\qb2{gfgfe}\tql2g&\ttie3\ca k\tr l\qa{^j}&\ibbu4e0\qb4{edefg}\tqu4e\en \bar%87 -\anotes\ca D\itieu0K\qa K&\ibl1f{-2}\qb1{fh}\itieu1d\tql1d&\ca h\itied2d\qa d&\ibbl3k0\qb3{k}\QQsk\qb3{^jklm}\tql3k&\ibbl4f0\qb4{fefgh}\tql4f\en +\anotes\ca D\itieu0K\qa K&\ibl1f{-2}\qb1{fh}\itieu1d\tql1d&\ca h\itied2d\qa d&\ibbl3k0\qb3{k}\qb3{^jklm}\tql3k&\ibbl4f0\qb4{fefgh}\tql4f\en \bar%88 \anotes\ttie0\ibl0J{-2}\qb0K\nbbl0\qb0{JIJ}\tql0H&\ttie1\ca d\qa c&\ttie2\ca d\qa c&\ca l\trt p\qa{^m}&\ca g\qa h\en \bar%89 \anotes\qa{.I}&\qa{.b}&\qa{b}\ca d&\ca n\itieu3k\qa k&\qa d\ds\en \bar%90 -\anotes\qa{.H}&\ca a\qa{h}&\ca e\QQsk\tr k\qa{^f}&\ttie3\ibl3j{-2}\qb3k\nbbl3\qb3{jij}\tql3h&\Cpause\en +\anotes\qa{.H}&\ca a\qa{h}&\ca e\tr k\qa{^f}&\ttie3\ibl3j{-2}\qb3k\nbbl3\qb3{jij}\tql3h&\Cpause\en \bar%91 \anotes\qa{.G}&\qa{.d}&\qa{.g}&\ibbl3h0\qb3{ihihg}\tql3i&\ds\itieu4g\qa g\en \bar%92 @@ -306,25 +304,25 @@ \bar%100 \anotes\ibbu0H0\qb0{HIHGF}\tqu0E&\ttie1\ibu1f0\qb1{eh}\tqu1a&\ttie2\ibu2g0\qb2{ga}\tqu2e&\ibl3e0\qb3{he}\tql3g&\tr k\qa{.^c}\en \bar%101 -\anotes\ibu0I0\qb0{DK}\tqu0D&\ibbu1e0\qb1{d}\QQsk\qb1{^cdef}\tqu1d&\qs\ibbl2f0\qb2{hfgh}\tql2f&\ibbl3f0\qb3{fefhk}\tql3j&\ca d\itieu4h\qa h\en +\anotes\ibu0I0\qb0{DK}\tqu0D&\ibbu1e0\qb1{d}\qb1{^cdef}\tqu1d&\qs\ibbl2f0\qb2{hfgh}\tql2f&\ibbl3f0\qb3{fefhk}\tql3j&\ca d\itieu4h\qa h\en \bar%102 \anotes\ibbu0H0\qb0{GFGHI}\tqu0G&\qs\ibbl1j{-3}\qb1{kihg}\tql1f&\ca d\qa i&\ibbl3i0\qb3{ihikl}\tql3k&\ttie4\ca h\itieu4g\qa g\en \bar%103 -\anotes\ibu0J0\qb0{HK}\tqu0D&\ibbu1e{-1}\qb1e\tbbu1\QQsk\qb1{^c}\tqu1d\ca h&\qa{.h}&\ibbl3j0\qb3{^jlkjk}\tql3l&\ttie4\ibbl4e0\qb4{gefef}\tql4g\en +\anotes\ibu0J0\qb0{HK}\tqu0D&\ibbu1e{-1}\qb1e\tbbu1\qb1{^c}\tqu1d\ca h&\qa{.h}&\ibbl3j0\qb3{^jlkjk}\tql3l&\ttie4\ibbl4e0\qb4{gefef}\tql4g\en \bar%104 \anotes\ibu0J0\qb0{HK}\tqu0D&\ibu1f{3}\qb1a\tqu1{h}\ds&\ibl2f{-3}\qb2h\tql2d\ds&\ibbl3j0\qb3{^jlkjk}\tql3l&\ibbl4e0\qb4{egfef}\tql4g\en \bar%105 \anotes\ca H\ds\ds&\qs\ibbu1g0\qb1{heh^c}\tqu1e&\qs\ibbu2g0\qb2{heh^c}\tqu2e&\ca{^j}\ds\ds&\ca e\ds\ds\en \bar%106 -\anotes\itieu0H\qa{.H}&\qs\ibbu1c0\qb1{a}\QQsk\qb1{^c}\QQsk\qb1{^bd}\tqu1c&\qs\ibbu2c0\qb2{a^c^bd}\tqu2c&\Cpause&\Cpause\en +\anotes\itieu0H\qa{.H}&\qs\ibbu1c0\qb1{a}\qb1{^c}\qb1{^bd}\tqu1c&\qs\ibbu2c0\qb2{a^c^bd}\tqu2c&\Cpause&\Cpause\en \bar%107 \anotes\ttie0\itieu0H\qa{.H}&\ibbu1f0\qb1{edfeg}\tqu1f&\ibbu2f0\qb2{edfeg}\tqu2f&\Cpause&\Cpause\en \bar%108 -\anotes\ttie0\itieu0H\qa{.H}&\itied1a\qa{.a}&\itied2a\qa{.a}&\ibbl3i0\qb3{hg}\QQsk\qb3{^ih}\QQsk\qb3{^j}\tql3i&\Cpause\en +\anotes\ttie0\itieu0H\qa{.H}&\itied1a\qa{.a}&\itied2a\qa{.a}&\ibbl3i0\qb3{hg}\qb3{^ih}\qb3{^j}\tql3i&\Cpause\en \bar%109 -\anotes\ttie0\itieu0H\qa{.H}&\ttie1\itied1a\qa{.a}&\ttie2\itied2a\qa{.a}&\ibbl3l0\qb3{k}\QQsk\qb3{^jlkm}\tql3l&\Cpause\en +\anotes\ttie0\itieu0H\qa{.H}&\ttie1\itied1a\qa{.a}&\ttie2\itied2a\qa{.a}&\ibbl3l0\qb3{k}\qb3{^jlkm}\tql3l&\Cpause\en \bar%110 -\anotes\ttie0\qa{.H}&\ttie1\qa{.a}&\ttie2\qa{.a}&\ibbl3m0\qb3{nlmno}\QQsk\tql3{^p}&\Cpause\en +\anotes\ttie0\qa{.H}&\ttie1\qa{.a}&\ttie2\qa{.a}&\ibbl3m0\qb3{nlmno}\tql3{^p}&\Cpause\en \bar%111 \anotes\ibbu0H0\qb0{HIHGF}\tqu0E&\ibbu1f0\qb1{aehef}\tqu1g&\ca h\ds\ds&\ca l\ds\ds&\ca{^j}\ds\ds\en \bar%112 @@ -351,21 +349,18 @@ \znotes&&&&\uptext{\bf\kern4ex Adagio}\en \anotes\fermataup N\qa G\qp\hp&\fermataup l\qa i\qp\hp&\fermataup l\qa d\qp\hp&\fermataup n\qa n\qp\qa{.k}\qs\cca k&\fermataup l\qa g\qp\hp\en \bar%121 -\nspace \anotes\wh{^L}&\wh{^g}&\wh{^i}& - \qa{.^p}\uptuplet{s}{3.3}{-6}\ibbl3o{-2}\qb3{o}\qsk\qb3{^n}\qsk\tql3{^m}& + \qa{.^p}\uptuplet{s}{3.0}{-6}\ibbl3o{-2}\qb3{o}\qb3{^n}\tql3{^m}& \wh{^e}\en \addspace\afterruleskip% \anotes\ha{*}&\ha{*}&\ha{*}&\ibl3l{-2}\smallsh l\qb3{.l}\tbbl3\qb3k\tr n\qb3{.j}\tbbl3\tql3{^i}&\ha{*}\en \bar%122 -\nspace \anotes\wh H&\wh c&\ibl2i2\qb2{.^i}\tbbl2\tql2j\tr p\qa h&\ibl3h3\qb3{.h}\tbbl3\qb3o\qb3{.^l}\tbbl3\tql3o&\ha{^e}\en \anotes\ha{*}&\ha{*}&\ibl2i{0}\qb2{.j}\tbbl2\qb2{^l}\qb2{.h}\tbbl2\tql2j&\qa{jh}&\usf n\qa{.h}\qs\cca h\en \bar%123 -\nspace \anotes\wh{^J}&\ibl1h0\qb1{.h}\tbbl1\qb1{^l}\qb1{.l}\tbbl1\tql1h&\ha{^e}&\wh h& - \qa{.^l}\uptuplet{o}{3.3}{-6}\ibbl4k{-2}\qb4{k}\qsk\qb4{^j}\qsk\tql4{^i}\en -\anotes\ha{*}&\HQsk\qa{^eg}&\ha{^l}&\ha{*}&\ibu4h{-2}\qb4{.h}\tbbu4\qb4g\tr o\qb4{.f}\tbbu4\tqu4{^e}\en + \qa{.^l}\uptuplet{o}{3.0}{-6}\ibbl4k{-2}\qb4{k}\qb4{^j}\tql4{^i}\en +\anotes\ha{*}&\qa{^eg}&\ha{^l}&\ha{*}&\ibu4h{-2}\qb4{.h}\tbbu4\qb4g\tr o\qb4{.f}\tbbu4\tqu4{^e}\en \alaligne%124 \anotes\wh K&\qa{fm}&\wh h&\ibl3k3\qb3{.k}\tbbl3\qb3r\qb3{.o}\tbbl3\tql3r&\ibu4e2\qb4{.^e}\tbbu4\tqu4f\tr n\qa d\en \anotes\ha{*}&\qa{kh}&\ha{*}&\ibl3l{0}\qb3{.m}\tbbl3\qb3o\qb3{.k}\tbbl3\tql3m&\usf l\qa{.k}\qs\cca k\en @@ -398,7 +393,6 @@ \bar%133 \anotes\wh L&\qa{gg}\ha j&\ha{ln}&\ttie3\ha r\tr s\ha q&\ha{gn}\en \bar%134 -\nspace \anotes\ha{.K}&\ha{.h}&\ha{.k}&\ha{.r}&\ha{.^m}\en \generalmeter{\meterfrac68}% \Changecontext% @@ -417,7 +411,6 @@ \bar%138 \anotes\qa{.J.I}&\Cpause&\Cpause&\qa{.l.k}&\ibu4h2\qb4{hi}\tqu4j\tinynotesize\cu i\qa h\ca g\en \bar%139 -\nspace \anotes\qa{.H.G}&\Cpause&\Cpause&\qa{.j}\ibl3i2\qb3{ij}\tql3k&\tr o\qa{.^f}\qa{.g}\en \bar%140 \anotes\itieu0K\ha{.K}&\Cpause&\qa{.^f.g}&\itieu3k\ha{.k}&\ibl4h2\qb4{hk}\tql4j\ibu4i{-2}\qb4{ih}\tqu4g\en @@ -428,7 +421,7 @@ \bar%143 \anotes\qa{.G.I}&\qa{.g.n}&\ttie2\qa{.k.g}&\ibl3p{-2}\qb3{po}\tql3n\qa r\ca r&\ibu4i{-2}\qb4{ih}\tqu4g\qa n\ca n\en \bar%144 -\anotes\qa{.H.K}&\qa{.^l}\cna m\qa{.m}&\ha{.h}&\qa{^q}\ca q\qa r\ca r&\qa n\ca n\cna m\qa m\ca m\en +\anotes\qa{.H.K}&\qa{.^l}\HQsk\cna m\qa{.m}&\ha{.h}&\qa{^q}\ca q\qa r\ca r&\qa n\ca n\cna m\qa m\ca m\en \bar%145 \anotes\qa{.G.J}&\qa{.k}\cna l\qa{.l}&\ha{.g}&\qa{^p}\ca p\qa q\ca q&\qa m\ca g\qa l\ca l\en \bar%146 @@ -473,14 +466,12 @@ \bar%162 \anotes\Cpause&\Cpause&\Cpause&\qa{.^l}\tr n\qa{.k}&\ibu4e2\qb4{^e^f}\tqu4g\qa g\ca g\en \bar%163 -\nspace \anotes\qa{.^L.K}&\qa{.g.i}&\qa{.g.i}&\qa{.^j.k}&\itied4g\qa{.g}\ttie4\ibu4h0\qb4{gh}\tqu4g\en \bar%164 -\nspace \anotes\qa{.^J.H}&\qa{.h}\ibu1g{-2}\qb1{gf}\tqu1{^e}&\qa{.h}\ibu2g{-2}\qb2{gf}\tqu2{^e}&\qa{.^l}\tr n\qa{.^j}&\ibl4g0\qb4{^l^f}\tql4g\ibu4i{-2}\qb4{ih}\tqu4g\en \bar%165 \addspace\afterruleskip% -\anotes\qa{.K.^L}&\qa{.d}\qpp&\qa{.d}\qpp&\itieu3k\qa{.k}\ttie3\ibl3k{-2}\qb3{k}\cna j\qb3j\tql3i&\ibu4f{-2}\cna f\qb4{f^e}\tqu4d\qa g\ca d\en +\anotes\qa{.K.^L}&\qa{.d}\qpp&\qa{.d}\qpp&\itieu3k\qa{.k}\ttie3\ibl3k{-2}\qb3{k}\HQsk\cna j\qb3j\tql3i&\ibu4f{-2}\cna f\qb4{f^e}\tqu4d\qa g\ca d\en \bar%166 \anotes \qa{.M}\itieu0N\qa{.N}& @@ -503,7 +494,6 @@ \bar%173 \anotes\qa{.K}\qpp&\qa{.h}\qpp&\qa{.k}\qpp&\qa{.k}\qpp&\ibu4d2\qb4{d^e}\tqu4{^f}\qa f\ca f\en \bar%174 -\nspace \anotes\qa{.K}\qpp&\qa{.k}\ibl1i0\qb1{ji}\tql1j&\qa{.d}\qpp&\ibl3k2\qb3{k^l}\tql3{^m}\qa m\ca m&\ibu4f2\qb4{^fg}\tqu4h\qa h\ca h\en \bar%175 \anotes\qa{.K.K}&\ibu1h{-2}\qb1{hg}\tqu1{^f}\ibu1f2\qb1{fg}\tqu1h&\itieu2k\ha{.k}&\ibl3m2\qb3{^mn}\tql3o\ibl3o{-2}\qb3{on}\tql3m&\ibl4h2\qb4{hi}\tql4j\ibl4j{-2}\qb4{ji}\tql4h\en @@ -530,10 +520,9 @@ \bar%186 \anotes\qa{.L.J}&\Cpause&\Cpause&\ttie3\qa{.n}\qa{.n}&\tinynotesize\qu i\qa{.h}\qa j\ca i\en \bar%187 -\nspace \anotes\qa{.K.K}&\ds\ibu1f2\qb1{^f}\tqu1g\ibu1h2\qb1{hi}\tqu1j&\qa{.d}\itieu2k\qa{.k}&\ca{^m}\ibl3k2\qb3k\tql3{^l}\ibl3m2\qb3{mn}\tql3o&\ca h\ibu4d2\qb4d\tqu4{^e}\ibu4f2\qb4{^fg}\tqu4h\en \bar%188 -\anotes\qa{.N.J}&\ibu1i{-2}\qb1{ih}\tqu1g\qa l\ca l&\ttie2\ibl2k{-2}\qb2{kj}\tql2i\qa j\ca j&\ibl3n2\qb3{no}\tql3p\ibl3m0\qb3n\cna m\qb3m\tql3n&\ibl4i2\qb4{ij}\tql4k\qa l\ca l\en +\anotes\qa{.N.J}&\ibu1i{-2}\qb1{ih}\tqu1g\qa l\ca l&\ttie2\ibl2k{-2}\qb2{kj}\tql2i\qa j\ca j&\ibl3n2\qb3{no}\tql3p\ibl3m0\qb3n\HQsk\cna m\qb3m\tql3n&\ibl4i2\qb4{ij}\tql4k\qa l\ca l\en \bar%189 \anotes\qa{.M.I}&\qa m\ca m\qa k\ca f&\qa{.j.i}&\ibl3m2\qb3{mn}\tql3o\ibl3o{-4}\qb3{pm}\tql3k&\ibl4l{-2}\qb4{lk}\tql4j\qa k\ca i\en \bar%190 @@ -563,7 +552,6 @@ \bar%202 \anotes\qpp\cna L\qa{.L}&\qpp\qa{.g}&\qpp\itieu2j\qa{.j}&\qa{.j}\qa{.n}&\qpp\qa{.g}\en \bar%203 -\nspace \anotes\ha{.K}&\qa{.h}\itied1h\qa{.h}&\ttie2\qa{.j}\qa{.h}&\ibl3m1\qb3{^mo}\tql3n\ibl3m{-2}\qb3{m^l}\tql3k&\qa{.d}\qpp\en \bar%204 \anotes\ha{.^M}&\ttie1\ibu1i0\qb1{hj}\tqu1i\ibu1h2\qb1{hi}\tqu1j&\itieu2k\ha{.k}&\qa{.k}\itieu3o\qa{.o}&\ibl4j1\qb4{jl}\tql4k\ibl4j{-2}\qb4{ji}\tql4h\en @@ -584,7 +572,7 @@ \bar%210 \anotes\qa{.G}\qpp&\qa{.g}\qpp&\qa{.k}\qpp&\qa{.n}\qpp&\qa{.g}\qpp\en \setendvoltabox% -\mulooseness-1% +\mulooseness-2% \Endpiece \eject \end diff --git a/Master/texmf-dist/doc/generic/autosp/geminiani.pdf b/Master/texmf-dist/doc/generic/autosp/geminiani.pdf index 80f27fd3107..f357a66d152 100644 Binary files a/Master/texmf-dist/doc/generic/autosp/geminiani.pdf and b/Master/texmf-dist/doc/generic/autosp/geminiani.pdf differ diff --git a/Master/texmf-dist/doc/generic/autosp/kinder2.aspc b/Master/texmf-dist/doc/generic/autosp/kinder2.aspc index 6ca9653b16f..ab1a20e2f27 100644 --- a/Master/texmf-dist/doc/generic/autosp/kinder2.aspc +++ b/Master/texmf-dist/doc/generic/autosp/kinder2.aspc @@ -12,6 +12,8 @@ \def\raisebarno{5\internote}% \input musixps \def\psslurhgt{1} +\let\dsorig\ds +\def\ds{{\smallnotesize\dsorig}} \setclef1\bass\setbassclefsymbol1\bassoct \setclef4\treble\settrebleclefsymbol4\trebleoct \catcodesmusic @@ -32,7 +34,6 @@ \songbottom{1}\songtop{4} \generalmeter{\meterfrac24}% \setmeter3{{\meterfrac68}} -\def\txtfont#1{}% !!!! suppresses normal output of 3 by \triolet \stafftopmarg=4.0\Interligne% \staffbotmarg=4.0\Interligne% \setinterinstrument1{2.5\internote} @@ -41,77 +42,76 @@ \startpiece\addspace\afterruleskip% \systemnumbers \znotes\zcn{e}{\ppff \kern-5ex mezzo staccato}&&&\en -\anotes\qa N&\qa i&\triolet n\ds\ibl1k5\qb1{k}\tql1n&\isluru1k\qa i\en -\anotes\qa{^J}&\qa{_i}&\triolet o\ds\ibl1l5\qb1{l}\tql1n&\qa n\en +\anotes\qa N&\qa i&\Triolet\ds\ibl1k5\qb1{k}\tql1n&\isluru1k\qa i\en +\anotes\qa{^J}&\qa{_i}&\Triolet\ds\ibl1l5\qb1{l}\tql1n&\qa n\en \bar%2 -\anotes\qa K&\qa h&\triolet n\ds\ibl1k5\qb1 k\tql1m&\ibl2m{-2}\qb2{.m}\tbbl2\tql2l\en -\anotes\qa M&\qa j&\triolet n\ds\ibl1k5\qb1{k}\tql1o&\tslur1l\qa k\en +\anotes\qa K&\qa h&\Triolet\ds\ibl1k5\qb1 k\tql1m&\ibl2m{-2}\qb2{.m}\tbbl2\tql2l\en +\anotes\qa M&\qa j&\Triolet\ds\ibl1k5\qb1{k}\tql1o&\tslur1l\qa k\en \bar%3 -\anotes\qa N&\qa i&\triolet n\ds\ibl1k5\qb1{k}\tql1n&\isluru1k\qa i\en -\anotes\qa{^J}&\qa{_i}&\triolet o\ds\ibl1l5\qb1{l}\tql1n&\qa n\en +\anotes\qa N&\qa i&\Triolet\ds\ibl1k5\qb1{k}\tql1n&\isluru1k\qa i\en +\anotes\qa{^J}&\qa{_i}&\Triolet\ds\ibl1l5\qb1{l}\tql1n&\qa n\en \bar%4 -\anotes\qa K&\qa h&\triolet n\ds\ibl1k5\qb1 k\tql1m&\ibl2m{-2}\qb2{.m}\tbbl2\tql2l\en -\anotes\qa M&\qa j&\triolet n\ds\ibl1k5\qb1{k}\tql1o&\tslur1l\qa k\en +\anotes\qa K&\qa h&\Triolet\ds\ibl1k5\qb1 k\tql1m&\ibl2m{-2}\qb2{.m}\tbbl2\tql2l\en +\anotes\qa M&\qa j&\Triolet\ds\ibl1k5\qb1{k}\tql1o&\tslur1l\qa k\en \bar%5 -\anotes\qa N&\qa i&\triolet o\ds\ibl1k5\qb1{k}\tql1n&\isluru1l\qa i\en -\anotes\qa{I}&\itied1g\qa g&\triolet o\ds\ibl1k5\qb1{k}\tql1n&\qa n\en +\anotes\qa N&\qa i&\Triolet\ds\ibl1k5\qb1{k}\tql1n&\isluru1l\qa i\en +\anotes\qa{I}&\itied1g\qa g&\Triolet\ds\ibl1k5\qb1{k}\tql1n&\qa n\en \bar%6 -\anotes\qa J&\ttie1\qa g&\triolet o\ds\ibl1l5\qb1{l}\tql1n&\ibl2l{-2}\qb2{.l}\tbbl2\tql2k\en -\anotes\qa L&\qa g&\triolet n\ds\ibl1j{5}\qb1{j}\tql1n&\qa j\tfslur1o\en +\anotes\qa J&\ttie1\qa g&\Triolet\ds\ibl1l5\qb1{l}\tql1n&\ibl2l{-2}\qb2{.l}\tbbl2\tql2k\en +\anotes\qa L&\qa g&\Triolet\ds\ibl1j{5}\qb1{j}\tql1n&\qa j\tfslur1o\en \bar%7 -\anotes\qa K&\qa g&\triolet n\ds\ibl1j{5}\qb1{j}\tql1n&\isluru1o\qa h\en -\anotes\qa{K}&\qa f&\triolet m\ds\ibl1j5\qb1{j}\tql1m&\qa k\en +\anotes\qa K&\qa g&\Triolet\ds\ibl1j{5}\qb1{j}\tql1n&\isluru1o\qa h\en +\anotes\qa{K}&\qa f&\Triolet\ds\ibl1j5\qb1{j}\tql1m&\qa k\en \bar%8 -\anotes\qa G\qp&\qa d\qa g&\triolet m\ds\ibl1i5\qb1{i}\tql1n\triolet m\ds\ibl1i5\qb1{i}\tql1n&\tfslur1k\ha i\en +\anotes\qa G\qp&\qa d\qa g&\Triolet\ds\ibl1i5\qb1{i}\tql1n\Triolet\ds\ibl1i5\qb1{i}\tql1n&\tfslur1k\ha i\en \setleftrightrepeat% \setmeter3{{\meterfrac24}}% \setmeter2{{\meterfrac68}}% \changecontext%9 \znotes\zcn{A}{\ppff tenuto}&&&\en -\anotes\qa L&\triolet m\ds\ibl1i5\qb1{i}\tql1l&\qa n&\isluru1j\qa i\en -\anotes\qa H&\triolet l\ds\ibl1h5\qb1{h}\tql1l&\qa o&\qa j\en +\anotes\qa L&\Triolet\ds\ibl1i5\qb1{i}\tql1l&\qa n&\isluru1j\qa i\en +\anotes\qa H&\Triolet\ds\ibl1h5\qb1{h}\tql1l&\qa o&\qa j\en \bar%10 -\def\txtfont#1{}% -\anotes\ibu0K{-2}\qb0{.K}\tbbu0\tqu0J&\triolet l\ds\ibl1h{5}\qb1{h}\tql1k&\qa m&\qa h\en -\anotes\qa I&\triolet l\ds\ibl1g5\qb1{g}\tql1k&\qa n&\tslur1j\qa i\en +\anotes\ibu0K{-2}\qb0{.K}\tbbu0\tqu0J&\Triolet\ds\ibl1h{5}\qb1{h}\tql1k&\qa m&\qa h\en +\anotes\qa I&\Triolet\ds\ibl1g5\qb1{g}\tql1k&\qa n&\tslur1j\qa i\en \bar%11 -\anotes\qa J&\triolet d\ds\ibu1h5\qb1{g}\tqu1j&\qa l&\isluru1n\qa g\en -\anotes\smallnotesize\zqu M\normalnotesize\qu F&\triolet c\ds\ibu1h5\qb1{f}\tqu1j&\qa l&\qa h\en +\anotes\qa J&\Triolet\ds\ibu1h5\qb1{g}\tqu1j&\qa l&\isluru1n\qa g\en +\anotes\smallnotesize\zqu M\normalnotesize\qu F&\Triolet\ds\ibu1h5\qb1{f}\tqu1j&\qa l&\qa h\en \bar%12 -\anotes\ibu0I{-2}\qb0{.I}\tbbu0\tqu0H&\triolet c\ds\ibu1g5\qb1{f}\tqu1{i}&\qa{^k}&\qa f\en -\anotes\qa G&\triolet d\ds\ibu1g5\qb1{g}\tqu1i&\qa{=k}&\tfslur1n\qa g\en +\anotes\ibu0I{-2}\qb0{.I}\tbbu0\tqu0H&\Triolet\ds\ibu1g5\qb1{f}\tqu1{i}&\qa{^k}&\qa f\en +\anotes\qa G&\Triolet\ds\ibu1g5\qb1{g}\tqu1i&\qa{=k}&\tfslur1n\qa g\en \setmeter2{{\meterfrac24}}% \setmeter3{{\meterfrac68}}% \changecontext%13 \znotes&&&\zchar{15}{\ppff\kern-2ex ritardando}\en -\anotes\qa J&\qa c&\triolet d\ds\ibu1h5\qb1{g}\tqu1j&\isluru1m\qa e\en -\anotes\qa J&\qa d&\triolet e\ds\ibu1i5\qb1{h}\tqu1k&\qa f\en +\anotes\qa J&\qa c&\Triolet\ds\ibu1h5\qb1{g}\tqu1j&\isluru1m\qa e\en +\anotes\qa J&\qa d&\Triolet\ds\ibu1i5\qb1{h}\tqu1k&\qa f\en \bar%14 -\anotes\ibu0I{-2}\qb0{.I}\tbbu0\tqu0H\hqsk\fermataup N\qa G&\fermataup l\ha d&\triolet m\ds\ibl1g5\qb1{g}\tql1k\hqsk\triolet m\ds\ibl1h{5}\qb1{h}\fermataup l\tql1k&\ibu2g1\qb2{.g}\tbbu2\tqu2h\hqsk\ibl2i1\trfslur1p\fermataup l\qb2{.i}\roff{\tbbl2\tql2j}\ccca{*}\en +\anotes\ibu0I{-2}\qb0{.I}\tbbu0\tqu0H\hqsk\fermataup N\qa G&\fermataup l\ha d&\Triolet\ds\ibl1g5\qb1{g}\tql1k\hqsk\Triolet\ds\ibl1h{5}\qb1{h}\fermataup l\tql1k&\ibu2g1\qb2{.g}\tbbu2\tqu2h\hqsk\ibl2i1\trfslur1p\fermataup l\qb2{.i}\roff{\tbbl2\tql2j}\ccca{*}\en \bar%15 \znotes\zcn{e}{\ppff \kern-5ex mezzo staccato}&&&\Uptext{\kern-2ex\ppff a tempo}\en -\anotes\qa N&\qa i&\triolet n\ds\ibl1k5\qb1{k}\tql1n&\isluru1k\qa i\en -\anotes\qa{^J}&\qa{_i}&\triolet o\ds\ibl1l5\qb1{l}\tql1n&\qa n\en +\anotes\qa N&\qa i&\Triolet\ds\ibl1k5\qb1{k}\tql1n&\isluru1k\qa i\en +\anotes\qa{^J}&\qa{_i}&\Triolet\ds\ibl1l5\qb1{l}\tql1n&\qa n\en \bar%16 -\anotes\qa K&\qa h&\triolet n\ds\ibl1k5\qb1 k\tql1m&\ibl2m{-2}\qb2{.m}\tbbl2\tql2l\en -\anotes\qa M&\qa j&\triolet n\ds\ibl1k5\qb1{k}\tql1o&\tslur1l\qa k\en +\anotes\qa K&\qa h&\Triolet\ds\ibl1k5\qb1 k\tql1m&\ibl2m{-2}\qb2{.m}\tbbl2\tql2l\en +\anotes\qa M&\qa j&\Triolet\ds\ibl1k5\qb1{k}\tql1o&\tslur1l\qa k\en \bar%17 -\anotes\qa N&\qa i&\triolet n\ds\ibl1k5\qb1{k}\tql1n&\isluru1k\qa i\en -\anotes\qa{^J}&\qa{_i}&\triolet o\ds\ibl1l5\qb1{l}\tql1n&\qa n\en +\anotes\qa N&\qa i&\Triolet\ds\ibl1k5\qb1{k}\tql1n&\isluru1k\qa i\en +\anotes\qa{^J}&\qa{_i}&\Triolet\ds\ibl1l5\qb1{l}\tql1n&\qa n\en \bar%18 -\anotes\qa K&\qa h&\triolet n\ds\ibl1k5\qb1 k\tql1m&\ibl2m{-2}\qb2{.m}\tbbl2\tql2l\en -\anotes\qa M&\qa j&\triolet n\ds\ibl1k5\qb1{k}\tql1o&\tslur1l\qa k\en +\anotes\qa K&\qa h&\Triolet\ds\ibl1k5\qb1 k\tql1m&\ibl2m{-2}\qb2{.m}\tbbl2\tql2l\en +\anotes\qa M&\qa j&\Triolet\ds\ibl1k5\qb1{k}\tql1o&\tslur1l\qa k\en \bar%19 -\anotes\qa N&\qa i&\triolet o\ds\ibl1k5\qb1{k}\tql1n&\isluru1k\qa i\en -\anotes\qa{I}&\itied1g\qa g&\triolet o\ds\ibl1k5\qb1{k}\tql1n&\qa n\en +\anotes\qa N&\qa i&\Triolet\ds\ibl1k5\qb1{k}\tql1n&\isluru1k\qa i\en +\anotes\qa{I}&\itied1g\qa g&\Triolet\ds\ibl1k5\qb1{k}\tql1n&\qa n\en \bar%20 -\anotes\qa J&\ttie1\qa g&\triolet o\ds\ibl1l5\qb1{l}\tql1n&\ibl2l{-2}\qb2{.l}\tbbl2\tql2k\en -\anotes\qa L&\qa g&\triolet n\ds\ibl1j{5}\qb1{j}\tql1n&\qa j\en +\anotes\qa J&\ttie1\qa g&\Triolet\ds\ibl1l5\qb1{l}\tql1n&\ibl2l{-2}\qb2{.l}\tbbl2\tql2k\en +\anotes\qa L&\qa g&\Triolet\ds\ibl1j{5}\qb1{j}\tql1n&\qa j\en \bar%21 -\anotes\qa K&\qa g&\triolet n\ds\ibl1j{5}\qb1{j}\tql1n&\qa h\en -\anotes\qa{K}&\qa f&\triolet m\ds\ibl1j5\qb1{j}\tql1m&\qa k\en +\anotes\qa K&\qa g&\Triolet\ds\ibl1j{5}\qb1{j}\tql1n&\qa h\en +\anotes\qa{K}&\qa f&\Triolet\ds\ibl1j5\qb1{j}\tql1m&\qa k\en \bar%22 -\anotes\ha G&\qa d\qa g&\triolet m\ds\ibl1i5\qb1{i}\tql1n\triolet m\ds\ibl1i5\qb1{i}\tql1n&\thslur1k\ha i\en +\anotes\ha G&\qa d\qa g&\Triolet\ds\ibl1i5\qb1{i}\tql1n\Triolet\ds\ibl1i5\qb1{i}\tql1n&\thslur1k\ha i\en \mulooseness-1% \setrightrepeat% \endpiece diff --git a/Master/texmf-dist/doc/generic/autosp/kinder2.pdf b/Master/texmf-dist/doc/generic/autosp/kinder2.pdf index aad76d9cacd..82029881bef 100644 Binary files a/Master/texmf-dist/doc/generic/autosp/kinder2.pdf and b/Master/texmf-dist/doc/generic/autosp/kinder2.pdf differ diff --git a/Master/texmf-dist/doc/generic/autosp/quod2.aspc b/Master/texmf-dist/doc/generic/autosp/quod2.aspc index f37c093df38..052758c8cf3 100644 --- a/Master/texmf-dist/doc/generic/autosp/quod2.aspc +++ b/Master/texmf-dist/doc/generic/autosp/quod2.aspc @@ -81,7 +81,7 @@ \anotes \itieu0a\qa a\ttie0\ibbl0a{-2}\qb0{aNM}\tqb0L& \ibl1l{-2}\qb1l\tqb1k\cl{^j}\ds& - \qa{.o}\ibbl2i2\qb2i\Qsk\tqb2{^j}& + \qa{.o}\ibbl2i2\qb2i\tqb2{^j}& \shake{n}\ibl3i0\qb3{^j}\nbbl3\qb3i\tqb3j\cu h\ds\en \bar%7 \anotes\qa{MK}&\ibu1g0\qb1{fgh}\tqh1f&\ibl2k0\qb2{klm}\tqb2k&\qa{hh}\en @@ -91,15 +91,15 @@ \anotes \qu{.H}\cu{^J}& \ibu1c4\qb1{^cde}\itied1h\tqh1h& - \ibl2l{-1}\qb2{.l}\itieu2k\tbbl2\tqb2k\ttie2\ibbl2j0\qb2k\HQsk\tbbl2\qb2{^j}\itieu2l\tqb2l& + \ibl2l{-1}\qb2{.l}\itieu2k\tbbl2\tqb2k\ttie2\ibbl2j0\qb2k\tbbl2\qb2{,,,^j}\itieu2l\tqb2l& \ibu3h{0}\qb3{hih}\tqh3g\en \anotes \ql K\cl K& \ttie1\ibu1h{-2}\qb1h\tqh1g\cu f& \ttie2\ibbl2l{-1}\qb2{lkl}\tqb2j\cl k& \ibu3f{-1}\qb3f\tqh3e\cu d\en -\advance\barno by -1% \leftrightrepeat +\advance\barno-1% \anotes\ds&\cl m&\ds&\cl o\en \bar%9 \anotes\qa{dc}&\ibl1k0\qb1{kmk}\tqb1{m}&\qa{oo}&\ibl3m0\qb3{mom}\tqb3o\en @@ -124,7 +124,7 @@ \qa b\qa I& \ibl1k2\qb1{^k}\nbbl1\qb1l\tqb1m\itied1i\qu i& \ibl2o{-1}\qb2p\qb2q\qb2p\tqb2o& - \ibl3n{-2}\qb3n\nbbl3\qb3m\tqb3l\Qsk\ibbl3k0\qb3{^kl}\qb3m\tqb3k\en + \ibl3n{-2}\qb3n\nbbl3\qb3m\tqb3l\ibbl3k0\qb3{,,,^kl}\qb3m\tqb3k\en \anotes \qa{.L}\cl{=K}& \ttie1\ibu1i0\qb1i\nbbu1\qb1h\tqh1i\ibu1g2\qb1g\nbbu1\qb1h\tqh1i& @@ -162,6 +162,7 @@ \ibbl2h1\qb2{hkj}\tqb2i\ibbl2j0\qb2j\tbbl2\qb2h\itieu2k\tqb2k& \ibu3f2\qb3f\tqh3g\ibu3h{-4}\qb3h\tqh3f\en \anotes\qa N\cu G&\ibu1i{-2}\qb1i\tqh1h\cu g&\ttie2\ibl2j0\qb2k\nbbl2\qb2j\tqb2k\cl i&\qa g\cu g\en +\mulooseness-1% \setrightrepeat \endpiece% \eject diff --git a/Master/texmf-dist/doc/generic/autosp/quod2.pdf b/Master/texmf-dist/doc/generic/autosp/quod2.pdf index 1d45dc13396..88881db6a9f 100644 Binary files a/Master/texmf-dist/doc/generic/autosp/quod2.pdf and b/Master/texmf-dist/doc/generic/autosp/quod2.pdf differ diff --git a/Master/texmf-dist/doc/generic/autosp/quod2A.aspc b/Master/texmf-dist/doc/generic/autosp/quod2A.aspc new file mode 100644 index 00000000000..6ee39add04c --- /dev/null +++ b/Master/texmf-dist/doc/generic/autosp/quod2A.aspc @@ -0,0 +1,163 @@ +\input musixtex +\input musixplt +\input soul.sty +\sodef{\so}{}{0.15em}{0.5em}{0.5em} +\input musixsty +\input musixps +\nohalfties +\def\pstiehgt{0.5} +\def\psslurhgt{0.5} +\vsize9.75in +\voffset-0.5in +\hsize7.0in +\hoffset-0.25in +\smallmusicsize +\bigaccid +\advance\parindent by 10pt +\def\raisebarno{7\internote}% +\nobarnumbers +\relativeaccid +\geometricskipscale +\instrumentnumber1 +\generalsignature{+1} +\generalmeter\meterC +\setname1{A} +\fulltitle{\sc\so{Quodlibet}} +\subtitle{\it Variation 30 of the Goldberg Variations for Clavier} +\title{\it Quodlibet} +\author{J. S. Bach (1685--1750)} +\shortauthor{\it J. S. Bach} +\othermention{Arranged for Recorders by R. D. Tennent} +\maketitle +\startbarno=0 +\nobarnumbers +\stafftopmarg=3.0\Interligne% +\staffbotmarg=3.0\Interligne% +\startpiece\addspace\afterruleskip% +\TransformNotes{#2}{#4}% +\systemnumbers% +\anotes\ds&\cu d&\ds&\ds\en +\bar%1 +\anotes\ha N&\ibu1g2\qb1{ghi}\tqh1j&\Cpause&\hp\en +\anotes + \ha M& + \ibl1k{-2}\qb1k\nbbl1\qb1j\tqb1i\ibu1h0\qb1h\nbbu1\qb1g\tqh1h&& + \qp\ds\cu d\en +\bar%2 +\anotes\ha L&\ibu1i{-2}\qb1i\tqh1h\itied1g\qa g&\qa{nn}&\ibu3g2\qb3{ghi}\tqh3j\en +\anotes + \qa{.K}\cu J& + \ttie1\qa g\ibu1f0\shake{n}\qb1f\nbbu1\qb1e\tqh1f& + \qa o\cl o\ds& + \ibl3k{-2}\qb3k\nbbl3\qb3j\tqb3i\cu h\ds\en +\bar%3 +\anotes\hu I&\qa g\ds\cl k&\ibl2n{-1}\qb2{no}\qb2{n}\tqb2{=m}&\qa{kk}\en +\anotes\hu J&\ibu1j{-2}\qb1{ji}\qb1h\tqh1g&\ibl2j{0}\qb2{lk}\qb2j\tqb2p&\qa{ll}\en +\bar%4 +\anotes + \ha K& + \itied1f\shake{n}\qa f\ttie1\ibbu1e{-2}\qb1f\tbbu1\qb1e\itied1d\tqh1d& + \ibl2o{-1}\qb2{ono}\tqb2m& + \ibl3k{-1}\qb3{klk}\tqb3j\en +\anotes + \qa G\ds\ibbl0b{-1}\qb0b\tqb0a& + \ttie1\qa d\qp& + \ibl2n{-2}\qb2n\tqb2m\ibl2n{-5}\qb2n\tqb2k& + \ibu3h{-2}\shake{p}\qb3i\tqh3h\qa g\en +\bar%5 +\anotes\ibl0M0\qb0N\nbbl0\qb0M\tqb0N\ibl0K0\qb0L\nbbl0\qb0K\tqb0L&\qa{nn}&\ibl2n2\qb2{nop}\tqb2q&\hp\en +\anotes\qa{.M}\cu I&\qa{oo}&\ibl2r{-2}\qb2r\nbbl2\qb2q\tqb2p\ibl2o6\qb2o\itieu2r\tqb2r&\qp\ds\cl k\en +\bar%6 +\anotes + \qa{.L}\ibbl0M2\qb0M\tqb0N& + \ibl1n{-1}\qb1{non}\tqb1m& + \ttie2\ibl2r{-2}\qb2r\tqb2q\qa p& + \ibl3n{-2}\qb3{nml}\tqb3k\en +\anotes + \itieu0a\qa a\ttie0\ibbl0a{-2}\qb0{aNM}\tqb0L& + \ibl1l{-2}\qb1l\tqb1k\cl{^j}\ds& + \qa{.o}\ibbl2i2\qb2i\qsk\tqb2{^j}& + \shake{n}\ibl3i0\qb3{^j}\nbbl3\qb3i\tqb3j\cu h\ds\en +\bar%7 +\anotes\qa{MK}&\ibu1g0\qb1{fgh}\tqh1f&\ibl2k0\qb2{klm}\tqb2k&\qa{hh}\en +\anotes\qa{NG}&\ibu1g{-2}\qb1{gfe}\tqh1d&\ibl2i4\qb2{ikn}\tqb2m&\qa{ii}\en +\bar%8 +\vnotes0.4\elemskip&&&\en +\anotes + \qu{.H}\cu{^J}& + \ibu1c4\qb1{^cde}\itied1h\tqh1h& + \ibl2l{-1}\qb2{.l}\itieu2k\tbbl2\tqb2k\ttie2\ibbl2j0\qb2k\hqsk\tbbl2\qb2{^j}\itieu2l\tqb2l& + \ibu3h{0}\qb3{hih}\tqh3g\en +\anotes + \ql K\cl K& + \ttie1\ibu1h{-2}\qb1h\tqh1g\cu f& + \ttie2\ibbl2l{-1}\qb2{lkl}\tqb2j\cl k& + \ibu3f{-1}\qb3f\tqh3e\cu d\en +\advance\barno by -1% +\leftrightrepeat +\anotes\ds&\cl m&\ds&\cl o\en +\bar%9 +\anotes\qa{dc}&\ibl1k0\qb1{kmk}\tqb1{m}&\qa{oo}&\ibl3m0\qb3{mom}\tqb3o\en +\anotes\qa{bN}&\ibl1k0\qb1{nkk}\tqb1n&\qa{pp}&\ibl3k2\qb3k\nbbl3\qb3l\tqb3m\ibl3n{-4}\qb3n\tqb3l\en +\bar%10 +\anotes\ibl0b{-1}\qb0{cbc}\tqb0a&\cl l\ds\qp&\ibl2o{-1}\qb2{opo}\tqb2n&\ibl3o{-2}\qb3{onm}\tqb3l\en +\anotes + \qa{.b}\cl{^a}& + \qa{mm}& + \ibl2m{-2}\qb2m\tqb2l\cl{^k}\ds& + \ibl3j0\shake n\qb3{^k}\nbbl3\qb3{^j}\tqb3k\ibl3i8\qb3i\tqb3{p}\en +\bar%11 +\anotes\qa{NN}&\ibl1l0\qb1{nln}\tqb1l&\qa{pp}&\ibl3m0\qb3{lpl}\tqb3{p}\en +\anotes + \qa{.a}\cl{^a}& + \ibl1m{-1}\qb1{mnm}\tqb1l& + \qa{qq}& + \ibbl3k2\qb3{^klm}\tqb3n\ibl3o{-2}\qb3o\nbbl3\qb3n\qsk\tqb3m\en +\bar%12 +\vnotes0.4\elemskip&&&\en +\anotes + \qa b\qa I& + \ibl1k2\qb1{^k}\nbbl1\qb1l\tqb1m\itied1i\qu i& + \ibl2o{-1}\qb2p\qb2q\qb2p\tqb2o& + \ibl3n{-2}\qb3n\nbbl3\qb3m\tqb3l\qsk\ibbl3k0\qb3{^kl}\qb3m\tqb3k\en +\anotes + \qa{.L}\cl{=K}& + \ttie1\ibu1i0\qb1i\nbbu1\qb1h\tqh1i\ibu1g2\qb1g\nbbu1\qb1h\tqh1i& + \ibl2n0\qb2n\nbbl2\qb2m\tqb2n\cl l\ds& + \itieu3l\ha l\en +\bar%13 +\anotes + \qa{Jc}& + \ibl1j2\qb1{jkl}\tqb1m& + \hp& + \ttie3\ibbl3k1\slur lku1\qb3{lk}\slur mlu1\qb3m\tqb3l\ibbl3m1\isluru3n\qb3n\tbbl3\tslur3m\qb3m\tqb3o\en +\anotes + \qa{.b}\ibbu0J{-2}\qb0J\tqh0I& + \ibl1n{-1}\qb1n\nbbl1\qb1m\tqb1l\cl k\ds& + \qa n\ibl2i{-5}\qb2n\tqb2g& + \qa{.k}\ibbl3j2\qb3j\tqb3k\en +\bar%14 +\anotes + \qa{.H}\ibbu0I2\qb0I\tqh0J& + \ds\cu h\ibu1e0\qb1e\nbbu1\qb1d\tqh1e& + \ibl2j1\qb2{.j}\tbbl2\tqb2k\ibl2j{-2}\qb2j\tqb2i& + \ibl3l2\qb3l\nbbl3\qb3m\tqb3n\ibl3o{-2}\qb3o\tqb3n\en +\anotes + \qa{.K}\ibbu0J2\qb0J\tqh0K& + \ibu1g1\qb1f\itied1g\tqh1g\ttie1\ibu1g{-1}\qb1g\tqh1f& + \ibu2h1\qb2h\tqh2i\ibl2j2\qb2j\tqb2k& + \ibbl3m{-2}\shake{o}\qb3m\tbbl3\qb3l\tqb3k\ibu3i{-6}\qb3j\tqh3d\en +\bar%15 +\anotes\ibu0I0\qb0{GHI}\tqh0G&\qa{dd}&\ibu2i0\qb2i\nbbu2\qb2h\tqh2i\cu g\ds&\ibl3i0\qb3{ijk}\tqb3i\en +\anotes\qa{.J}\cu{^J}&\qa{ee}&\ds\ibbl2l{-2}\qb2l\tqb2k\ibl2j4\qb2j\tqb2l&\ibu3j{-2}\qb3{jih}\tqh3g\en +\bar%16 +\anotes + \qa{KK}& + \ibu1g{1}\qb1{ded}\tqh1j& + \ibbl2h1\qb2{hkj}\tqb2i\ibbl2j0\qb2j\tbbl2\qb2h\itieu2k\tqb2k& + \ibu3f2\qb3f\tqh3g\ibu3h{-4}\qb3h\tqh3f\en +\anotes\qa N\cu G&\ibu1i{-2}\qb1i\tqh1h\cu g&\ttie2\ibl2j0\qb2k\nbbl2\qb2j\tqb2k\cl i&\qa g\cu g\en +\setrightrepeat +\endpiece% +\eject +\end diff --git a/Master/texmf-dist/doc/generic/autosp/quod2A.pdf b/Master/texmf-dist/doc/generic/autosp/quod2A.pdf new file mode 100644 index 00000000000..0291e120e79 Binary files /dev/null and b/Master/texmf-dist/doc/generic/autosp/quod2A.pdf differ diff --git a/Master/texmf-dist/doc/generic/autosp/rebar.1 b/Master/texmf-dist/doc/generic/autosp/rebar.1 new file mode 100644 index 00000000000..d3d7a3e5713 --- /dev/null +++ b/Master/texmf-dist/doc/generic/autosp/rebar.1 @@ -0,0 +1,73 @@ +.\" This manpage is licensed under the GNU Public License +.TH REBAR 1 2015-07-14 "" "" + +.SH NAME +rebar \- corrects bar-number comments in MusiXTeX scores + +.SH SYNOPSIS +.B rebar +.RB [ \-v\ |\ \-\-version\ |\ \-h\ |\ \-\-help ] + +.B rebar +[ +.IB infile .tex +[ +.IR outfile [\fB.tex\fP] +] ] + +.B rebar +[ +.IB infile .aspc +[ +.IR outfile [\fB.aspc\fP] +] ] + +.SH DESCRIPTION + +.B rebar +reads a MusiXTeX score and generates a copy +with bar-number comments +of the form +.I %barno +appended to the following commands: +.RS 0.25in +.nf + +\\bar +\\alaligne +\\alapage +\\leftrepeat +\\rightrepeat +\\leftrightrepeat +\\startpiece +\\startextract +\\changecontext +\\Changecontext +\\contpiece +\\Contpiece +\\xbar + +.fi +.RE +replacing any existing comments. The following commands are +respected: +.RS 0.25in +.nf + +\\startbarnumber=... +\\barno=... +\\advance\\barno... + +.fi +.RE +Bar-numbering in the MusiXTeX output is not affected. + +If no output filename is provided, output goes to standard output. If no +input filename is provided, input comes from standard input. + +.SH SEE ALSO +.PP +musixdoc.pdf + +.SH AUTHOR +This program and manual page were written by Bob Tennent . diff --git a/Master/texmf-dist/doc/generic/autosp/tex2aspc.1 b/Master/texmf-dist/doc/generic/autosp/tex2aspc.1 new file mode 100644 index 00000000000..5fa7e3c5b82 --- /dev/null +++ b/Master/texmf-dist/doc/generic/autosp/tex2aspc.1 @@ -0,0 +1,46 @@ +.\" This manpage is licensed under the GNU Public License +.TH TEX2ASPC 1 2018-02-14 "" "" + +.SH NAME + +tex2aspc \- converts conventional MusiXTeX scores to .aspc format +for processing by +.BR autosp (1). + +.SH SYNOPSIS + +.B tex2aspc +.RB [ \-v\ |\ \-\-version\ |\ \-h\ |\ \-\-help ] + +.B tex2aspc +.IR infile [\fR.tex\fP] +.RI [ outfile [ \fR.aspc\fP ]] + +This program re-factors (sequences of) conventional +note-spacing commands (\\notes \\Notes \\NOtes ...) +in a measure +into +a single \\anotes command. +This is intended for "legacy" scores in order to take advantage of +features +only provided by +.BR autosp (1), +such as "global" skips and processing of \TransformNotes commands. + +.SH LIMITATIONS + + +.B tex2aspc +assumes that & and | (rather than \\nextinstrument and \\nextstaff) are used to separate instruments and staffs. + +User-defined macros are not processed or expanded. + +.SH SEE ALSO +.BR autosp (1) +.PP +musixdoc.pdf + +.SH AUTHOR +This program and manual page were written by Bob Tennent . + + diff --git a/Master/texmf-dist/doc/generic/autosp/tex2aspc.pdf b/Master/texmf-dist/doc/generic/autosp/tex2aspc.pdf new file mode 100644 index 00000000000..dbef52ddf74 Binary files /dev/null and b/Master/texmf-dist/doc/generic/autosp/tex2aspc.pdf differ -- cgit v1.2.3