diff options
author | Karl Berry <karl@freefriends.org> | 2011-04-05 22:59:54 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2011-04-05 22:59:54 +0000 |
commit | 4e8d3cd79b79589e4265bb196afe87ebaa3cc5cc (patch) | |
tree | b6742cf6f1c7c2c3e528a9c214394a9bf3abc05b /Master/texmf-dist/tex/generic | |
parent | 3eec9d6f256c17603e9cbe8bbeaaf4b180034cd4 (diff) |
musixtex (5apr11)
git-svn-id: svn://tug.org/texlive/trunk@21982 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic')
-rw-r--r-- | Master/texmf-dist/tex/generic/musixtex/musixadd.tex | 141 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/musixtex/musixbbm.tex | 34 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/musixtex/musixbm.tex | 65 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/musixtex/musixcpt.sty | 3 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/musixtex/musixlex.tex | 1201 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/musixtex/musixltx.tex | 32 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/musixtex/musixlyr.tex | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/musixtex/musixmad.tex | 142 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/musixtex/musixper.tex | 6 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/musixtex/musixps.tex | 17 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/musixtex/musixtex.sty | 3 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/musixtex/musixtex.tex | 726 |
12 files changed, 483 insertions, 1889 deletions
diff --git a/Master/texmf-dist/tex/generic/musixtex/musixadd.tex b/Master/texmf-dist/tex/generic/musixtex/musixadd.tex index f5cc37edf18..9e3b7160719 100644 --- a/Master/texmf-dist/tex/generic/musixtex/musixadd.tex +++ b/Master/texmf-dist/tex/generic/musixtex/musixadd.tex @@ -16,134 +16,15 @@ % the Free Software Foundation, Inc., 59 Temple Place - Suite 330, % Boston, MA 02111-1307, USA. % -\ifx\staffspacingix\undefined\else\endinput\fi - -\immediate\write16{MusiXADDitional instruments T.99\space<24 March 2000>}% - -\edef\catcodeat{\the\catcode`\@}\catcode`\@=11 - -\let\@wloG\wlog -\def\wlog#1{} - -\let\maxinstruments\nin@ - -\let\interinstrumentvii\interinstrument -\let\interinstrumentviii\interinstrument -\let\interinstrumentix\interinstrument - -\let\T@Rvii\z@ -\let\T@Rviii\z@ -\let\T@Rix\z@ - -\let\staffspacingvii\@ne -\let\staffspacingviii\@ne -\let\staffspacingix\@ne - -\newskip\k@ivii -\newskip\k@iviii -\newskip\k@iix - -\newskip\i@nvii -\newskip\i@nviii -\newskip\i@nix - -\newskip\b@xvii \newskip\b@zvii -\newskip\b@xviii\newskip\b@zviii -\newskip\b@xix \newskip\b@zix - -\newskip\c@xvii \newskip\c@zvii -\newskip\c@xviii\newskip\c@zviii -\newskip\c@xix \newskip\c@zix - -\newskip\d@xvii \newskip\d@zvii -\newskip\d@xviii\newskip\d@zviii -\newskip\d@xix \newskip\d@zix - -\newskip\e@xvii \newskip\e@zvii -\newskip\e@xviii\newskip\e@zviii -\newskip\e@xix \newskip\e@zix - -\newcount\b@pvii \newcount\b@nvii -\newcount\b@pviii\newcount\b@nviii -\newcount\b@pix \newcount\b@nix - -\newcount\n@pvii \n@pvii\@ne -\newcount\n@pviii\n@pviii\@ne -\newcount\n@pix \n@pix\@ne - -\newskip\s@xvii -\newskip\s@xviii -\newskip\s@xix -\newskip\s@Yvii -\newskip\s@Yviii -\newskip\s@Yix -\newskip\s@avii -\newskip\s@aviii -\newskip\s@aix -\newtoks\s@svii \s@svii={x} -\newtoks\s@sviii\s@sviii={x} -\newtoks\s@six \s@six={x} -\newcount\s@yvii -\newcount\s@yviii -\newcount\s@yix -\newcount\s@Nvii -\newcount\s@Nviii -\newcount\s@Nix -\newcount\s@zvii \s@zvii\maxdimen -\newcount\s@zviii\s@zviii\maxdimen -\newcount\s@zix \s@zix\maxdimen -\newtoks\s@dvii -\newtoks\s@dviii -\newtoks\s@dix - -\newcount\a@svii \newcount\o@svii -\newcount\a@sviii\newcount\o@sviii -\newcount\a@six \newcount\o@six - -\newtoks\a@cvii \a@cvii={{\z@}{\z@}{\z@}{\z@}} -\newtoks\a@cviii \a@cviii={{\z@}{\z@}{\z@}{\z@}} -\newtoks\a@cix \a@cix={{\z@}{\z@}{\z@}{\z@}} - -\newtoks\o@cvii -\newtoks\o@cviii -\newtoks\o@cix - -\newtoks\m@tvii -\newtoks\m@tviii -\newtoks\m@tix - -\def\resetlayout{\let\interfacteur\nin@ - \stafftopmarg\thr@@\Interligne \staffbotmarg\thr@@\Interligne - \let\n@li\fiv@ \let\n@lii\fiv@ \let\n@liii\fiv@ - \let\n@liv\fiv@ \let\n@lv\fiv@ \let\n@lvi\fiv@ - \let\n@lvii\fiv@ \let\n@lviii\fiv@ \let\n@lix\fiv@ - \resetclefsymbols} - -\def\resetclefsymbols{% - \let\bassc@si\z@ \let\bassc@sii\z@ \let\bassc@siii\z@ \let\bassc@siv\z@ - \let\bassc@sv\z@ \let\bassc@svi\z@ \let\bassc@svii\z@ \let\bassc@sviii\z@ \let\bassc@six\z@ - \let\altoc@si\z@ \let\altoc@sii\z@ \let\altoc@siii\z@ \let\altoc@siv\z@ - \let\altoc@sv\z@ \let\altoc@svi\z@ \let\altoc@svii\z@ \let\altoc@sviii\z@ \let\altoc@six\z@ - \let\treblec@si\z@ \let\treblec@sii\z@ \let\treblec@siii\z@ \let\treblec@siv\z@ - \let\treblec@sv\z@ \let\treblec@svi\z@ \let\treblec@svii\z@ \let\treblec@sviii\z@ \let\treblec@six\z@ -} - -% allow one morz gourp of instruments. - -\let\maxgroups\f@ur % maximum three groups of instruments or choirs - -\newskip\g@biv -\newskip\g@hiv - -\let\lowersonginstrumiv\maxdimen -\let\uppersonginstrumiv\z@ - - -\let\nbinstruments\maxinstruments -\normalnotesize\resetlayout -\let\nbinstruments\@ne - -\let\wlog\@wloG - -\catcode`\@=\catcodeat +% +% musixadd.tex : allocate registers for additional instruments +% +\immediate\write16{MusiXADDitional instruments T.115 <19 Nov 2010>}% +% +% +% setup the maximum element numbers +\setmaxinstruments{9}% +\setmaxgroups{4}% +\setmaxslurs\maxinstruments +% \endinput diff --git a/Master/texmf-dist/tex/generic/musixtex/musixbbm.tex b/Master/texmf-dist/tex/generic/musixtex/musixbbm.tex index 538bf4a089d..c3c2333002e 100644 --- a/Master/texmf-dist/tex/generic/musixtex/musixbbm.tex +++ b/Master/texmf-dist/tex/generic/musixtex/musixbbm.tex @@ -16,27 +16,20 @@ % the Free Software Foundation, Inc., 59 Temple Place - Suite 330, % Boston, MA 02111-1307, USA. % - -\ifx\undefined\ibbbbbu - \input musixbm -\fi - -\immediate\write16{MusiXBBeaM T.405\space<30 October 1995>}% 256th beams - +% +% musixbbm.tex : allocate registers and define macros for 256th beam +% +\immediate\write16{MusiXBBeaM T.115 <19 Nov 2010>}% +% \ifx\undefined\ibbbbbbu \else \endinput \fi - +% +% setup the maximum element numbers +\setmaxcclvibeams{6}% +% +% +% definitions for 256th beams \edef\catcodeat{\the\catcode`\@}\catcode`\@=11 - -\newdimen\g@xi \newskip\g@zi -\newdimen\g@xii \newskip\g@zii -\newdimen\g@xiii\newskip\g@ziii -\newdimen\g@xiv \newskip\g@ziv -\newdimen\g@xv \newskip\g@zv -\newdimen\g@xvi \newskip\g@zvi -%\newdimen\g@xvii \newskip\g@zvii -%\newdimen\g@xviii\newskip\g@zviii -%\newdimen\g@xix \newskip\g@zix - +% \def\s@l@ctg{\edef\g@x{\csname g@x\romannumeral\n@i\endcsname}% \edef\g@z{\csname g@z\romannumeral\n@i\endcsname}\s@l@ctf} @@ -74,6 +67,3 @@ \catcode`\@=\catcodeat \endinput - - - diff --git a/Master/texmf-dist/tex/generic/musixtex/musixbm.tex b/Master/texmf-dist/tex/generic/musixtex/musixbm.tex index ba986ac83d9..d07b2070083 100644 --- a/Master/texmf-dist/tex/generic/musixtex/musixbm.tex +++ b/Master/texmf-dist/tex/generic/musixtex/musixbm.tex @@ -16,62 +16,11 @@ % the Free Software Foundation, Inc., 59 Temple Place - Suite 330, % Boston, MA 02111-1307, USA. % -\immediate\write16{MusiXBeaM T.94\space<11 May 1999>}% - -\ifx\undefined\ibbbbbu \else \endinput \fi - -\edef\catcodeat{\the\catcode`\@}\catcode`\@=11 - -\let\@wloG\wlog -\def\wlog#1{} - -\newdimen\f@xi \newskip\f@zi -\newdimen\f@xii \newskip\f@zii -\newdimen\f@xiii\newskip\f@ziii -\newdimen\f@xiv \newskip\f@ziv -\newdimen\f@xv \newskip\f@zv -\newdimen\f@xvi \newskip\f@zvi - -\def\s@l@ctf{\edef\f@x{\csname f@x\romannumeral\n@i\endcsname}% - \edef\f@z{\csname f@z\romannumeral\n@i\endcsname}\s@l@ctcde} - -\def\ibbbbbu#1{\s@l@ctbeam#1\relax \s@l@ctf \i@bbbbbu} -\def\ibbbbbl#1{\s@l@ctbeam#1\relax \s@l@ctf \i@bbbbbl} - -\def\i@bbbbbu#1#2{% - \ifnum\b@n=\z@ \i@bbbbu{#1}{#2}\C@ba\b@z\@ne \C@ba\c@z\@ne - \C@ba\d@z\@ne \C@ba\e@z\@ne \fi \n@bbbbbu} -\def\i@bbbbbl#1#2{% - \ifnum\b@n=\z@ \i@bbbbl{#1}{#2}\C@ba\b@z\m@ne \C@ba\c@z\m@ne - \C@ba\d@z\m@ne \C@ba\e@z\m@ne \fi \n@bbbbbl} - -\def\nbbbbbu#1{\s@l@ctbeam#1\relax \s@l@ctf \Dec@b\@ne\n@bbu - \Dec@b\tw@\n@bbbu \Dec@b\thr@@\n@bbbbu \Dec@b\f@ur\n@bbbbbu} -\def\nbbbbbl#1{\s@l@ctbeam#1\relax \s@l@ctf \Dec@b\@ne\n@bbl - \Dec@b\tw@\n@bbbl \Dec@b\thr@@\n@bbbbl \Dec@b\f@ur\n@bbbbbl} - -\def\n@bbbbbu{\C@nb\f@z\f@x\f@ur\qd@skip} -\def\n@bbbbbl{\C@nb\f@z\f@x\f@ur\z@} - -\def\tbbbbbu#1{\s@l@ctbeam#1\relax \s@l@ctf \t@bbbbbu} -\def\tbbbbbl#1{\s@l@ctbeam#1\relax \s@l@ctf \t@bbbbbl} - -\def\t@bbbbu{\n@v\f@ur \C@b\t@bbbbbu\n@bbbbu\y@i\e@z \beam@pos\e@x \t@xbu} -\def\t@bbbbl{\n@v\f@ur \C@b\t@bbbbbl\n@bbbbl\y@i\e@z \beam@pos\e@x \t@xbl} - -\def\t@bbbbbu{\n@v\fiv@ \C@b\empty\n@bbbbu\y@i\f@z \beam@pos\f@x \t@xbu} -\def\t@bbbbbl{\n@v\fiv@ \C@b\empty\n@bbbbl\y@i\f@z \beam@pos\f@x \t@xbl} - -\def\Ibbbbbu#1{\s@l@ctbeam#1\relax \s@l@ctf \I@bu\i@bbbbbu} -\def\Ibbbbbl#1{\s@l@ctbeam#1\relax \s@l@ctf \I@bl\i@bbbbbl} - -\def\cccccu{\q@symbol\n@vii44\let\st@m\up@flag \g@q} -\def\zcccccu{\advancefalse\cccccu} -\def\cccccl{\q@symbol\n@vii49\let\st@m\down@flag \g@q} -\def\zcccccl{\advancefalse\cccccl} -\def\ccccca{\q@symbol\@ccccca} - -\let\wlog\@wloG - -\catcode`\@=\catcodeat +% +% musixbm.tex : allocate registers for 128th beam +% +\immediate\write16{MusiXBeaM T.115 <19 Nov 2010>}% +% +% (nothing to do. - T.111 or later provides 128th beam by default.) +% \endinput diff --git a/Master/texmf-dist/tex/generic/musixtex/musixcpt.sty b/Master/texmf-dist/tex/generic/musixtex/musixcpt.sty deleted file mode 100644 index 54c2ca8dd67..00000000000 --- a/Master/texmf-dist/tex/generic/musixtex/musixcpt.sty +++ /dev/null @@ -1,3 +0,0 @@ -\input musixcpt -\endinput - diff --git a/Master/texmf-dist/tex/generic/musixtex/musixlex.tex b/Master/texmf-dist/tex/generic/musixtex/musixlex.tex deleted file mode 100644 index 7d243763c80..00000000000 --- a/Master/texmf-dist/tex/generic/musixtex/musixlex.tex +++ /dev/null @@ -1,1201 +0,0 @@ -\begin{theindex} - - \item {\tt\char37}, 12 - \item *, 34 - \item \&, 6, 16, 82 - \item \^{}M, 99 - \item {\tt\char'174}, 6, 81, 82 - - \indexspace - - \item {\tt a4wide}, 81 - \item {\Bslash AB}, 96 - \item {\Bslash absoluteaccid}, 38 - \item {\Bslash accshift}, 35 - \item acute accent, 35 - \item {\Bslash addspace}, 34 - \item {\Bslash afterruleskip}, 22, 34 - \item {\Bslash akkoladen}, 20 - \item {\Bslash alaligne}, 10, 12, 49, 52, 63, 84 - \item {\Bslash alapage}, 10, 12, 49, 52, 63, 84 - \item {\Bslash allabreve}, 18 - \item {\Bslash altitude}, 68 - \item {\Bslash alto}, 18 - \item alto clef, 18, 51 - \item {\Bslash altplancher}, 68 - \item {\Bslash altportee}, 68 - \item anonymous ftp, 99 - \item apostropha, 87 - \item {\Bslash apostropha}, 87 - \item apostropha aucta, 87 - \item {\Bslash apostropha aucta}, 87 - \item {\Bslash arithmeticskipscale}, 22 - \item {\Bslash arpeggio}, 58 - \item {\Bslash atnextline}, 63, 69 - \item {\Bslash AUF}, 96 - \item {\Bslash author}, 97 - \item author names, 96 - \item {\Bslash autoledgerlines}, 86 - \item {\Bslash autolines}, 12, 84 - - \indexspace - - \item {\sc Bach, J.S.}, 104 - \item {\Bslash backturn}, 60 - \item {\Bslash bar}, 45, 49, 52, 53 - \item {\Bslash bar} \ital{(original meaning)}, 45 - \item bar numbering, 45 - \item {\Bslash barno}, 46 - \item {\Bslash barnumbers}, 46 - \item baroque, 62 - \item {\Bslash barre}, 83 - \item {\Bslash barsinline}, 84 - \item {\Bslash bass}, 18 - \item bass clef, 18, 51 - \item {\Bslash basslowoct}, 78 - \item {\Bslash bassoct}, 78 - \item beams, 8, 17 - \item {\Bslash beforeruleskip}, 22, 34 - \item {\Bslash begin{\tt \char '173}bigmusic{\tt \char '175}}, 81 - \item {\Bslash begin{\tt \char '173}music{\tt \char '175}}, 70 - \item {\Bslash bf}, 56, 96 - \item {\Bslash bigaccid}, 35 - \item {\Bslash bigfl}, 35 - \item Big\LaTeX, 81, 82 - \item {\Bslash biglbrace}, 84 - \item {\Bslash bigrbrace}, 84 - \item {\Bslash bigsh}, 35 - \item Big\TeX, 82 - \item {\Bslash BIGtype}, 56 - \item {\Bslash BIgtype}, 56 - \item {\Bslash Bigtype}, 56 - \item {\Bslash bigtype}, 56 - \item {\Bslash bistropha}, 88 - \item {\Bslash bivirga}, 88 - \item {\Bslash blppz}, 58 - \item {\Bslash blpz}, 58 - \item {\Bslash blsf}, 58 - \item {\Bslash blsfz}, 58 - \item {\Bslash blst}, 58 - \item {\Bslash bltext}, 58 - \item {\Bslash boxit}, 46, 54 - \item {\Bslash boxitsep}, 54 - \item {\Bslash bporrectus}, 90 - \item {\Bslash braceheight}, 84 - \item {\Bslash bracket}, 62 - \item {\sc Brahms, J.}, 30, 51 - \item {\Bslash breakslur}, 43 - \item {\Bslash breath}, 60 - \item breathing, 60 - \item {\Bslash breve}, 23 - \item {\sc Brouard, N.}, 81 - \item {\Bslash bsk}, 33 - \item {\Bslash buppz}, 58 - \item {\Bslash bupz}, 58 - \item {\Bslash busf}, 58 - \item {\Bslash busfz}, 58 - \item {\Bslash bust}, 58 - \item {\Bslash butext}, 58 - \item {\Bslash bye}, 21, 50 - - \indexspace - - \item {\Bslash ca}, 23 - \item cadenzas, 64 - \item {\Bslash caesura}, 61 - \item {\Bslash catcode}, 16, 81, 82 - \item {\Bslash catcodes}, 81 - \item {\Bslash catcodesmusic}, 82 - \item cautionary accidental, 35 - \item {\Bslash cbreath}, 60 - \item {\Bslash cca}, 23 - \item {\Bslash ccca}, 24 - \item {\Bslash ccccca}, 84 - \item {\Bslash cccccl}, 84 - \item {\Bslash cccccu}, 84 - \item {\Bslash ccccl}, 24 - \item {\Bslash cccclp}, 96 - \item {\Bslash cccclpp}, 96 - \item {\Bslash ccccu}, 24 - \item {\Bslash ccccup}, 96 - \item {\Bslash ccccupp}, 96 - \item {\Bslash cccl}, 24 - \item {\Bslash ccclp}, 96 - \item {\Bslash ccclpp}, 96 - \item {\Bslash cccu}, 23 - \item {\Bslash cccup}, 96 - \item {\Bslash cccupp}, 96 - \item {\Bslash cchar}, 55, 71 - \item {\Bslash ccharnote}, 54, 55 - \item {\Bslash ccl}, 23 - \item {\Bslash cclp}, 96 - \item {\Bslash cclpp}, 96 - \item {\Bslash ccu}, 23 - \item {\Bslash ccup}, 96 - \item {\Bslash ccupp}, 96 - \item {\Bslash cdfl}, 35 - \item {\Bslash cdsh}, 35 - \item {\Bslash centerbar}, 32 - \item {\Bslash centerhpause}, 32 - \item {\Bslash centerPAUSe}, 32 - \item {\Bslash centerPAuse}, 32 - \item {\Bslash centerpause}, 32 - \item {\Bslash cfl}, 35 - \item {\Bslash changeclefs}, 51 - \item {\Bslash Changecontext}, 51, 52 - \item {\Bslash changecontext}, 34, 49, 51, 52 - \item {\Bslash changesignature}, 51 - \item {\Bslash chl}, 94 - \item chords, 17 - \item {\Bslash ChroirStrut}, 85 - \item {\Bslash chu}, 94 - \item {\Bslash circleit}, 54 - \item {\Bslash cl}, 23, 65 - \item clef d'ut, 17, 51 - \item clef de fa, 17, 51 - \item clef de sol, 17, 51 - \item clefs (empty), 77 - \item {\Bslash climacus}, 90 - \item {\Bslash climacusauctdown}, 92 - \item {\Bslash climacusdeminut}, 93 - \item {\Bslash climacusresupinus}, 90 - \item {\Bslash clivis}, 88 - \item {\Bslash clivisauctdown}, 91 - \item {\Bslash clivisauctup}, 91 - \item {\Bslash clivisdeminut}, 92 - \item {\Bslash clp}, 26 - \item {\Bslash clpp}, 26 - \item {\Bslash clppp}, 97 - \item {\Bslash cmidstaff}, 55 - \item {\Bslash cna}, 35 - \item {\Bslash cnhl}, 94 - \item {\Bslash cnhu}, 94 - \item {\Bslash cnql}, 94 - \item {\Bslash cnqu}, 94 - \item {\Bslash Coda}, 54 - \item {\Bslash coda}, 54 - \item {\Bslash Contpiece}, 49 - \item {\Bslash contpiece}, 49, 52, 69 - \item {\Bslash cql}, 94 - \item {\Bslash cqu}, 94 - \item {\Bslash crescendo}, 61 - \item crescendos, 103 - \item {\Bslash csh}, 35 - \item {\Bslash csong}, 72 - \item {\Bslash cu}, 23, 65 - \item {\Bslash cup}, 26 - \item {\Bslash cupp}, 26 - \item {\Bslash cuppp}, 97 - \item {\Bslash curve}, 42 - - \indexspace - - \item {\Bslash dateaustrian}, 85 - \item {\Bslash dateenglish}, 85 - \item {\Bslash datefrench}, 85 - \item {\Bslash dategerman}, 85 - \item {\Bslash dateUSenglish}, 85 - \item {\Bslash dccccl}, 85 - \item {\Bslash dccccu}, 85 - \item {\Bslash dcccl}, 85, 95 - \item {\Bslash dcccu}, 85, 95 - \item {\Bslash dccl}, 85, 95 - \item {\Bslash dccu}, 85, 95 - \item {\Bslash dcl}, 85 - \item {\Bslash dclp}, 85 - \item {\Bslash dclpp}, 85 - \item {\Bslash dcqb}, 95 - \item {\Bslash dcql}, 95 - \item {\Bslash dcqu}, 95 - \item {\Bslash dcu}, 85 - \item {\Bslash dcup}, 85 - \item {\Bslash dcupp}, 85 - \item {\Bslash dczq}, 95 - \item {\sc Debussy, C.}, 103 - \item {\Bslash debutmorceau}, 83 - \item {\Bslash decrescendo}, 61 - \item default values, 70 - \item {\Bslash demisoupir}, 84 - \item {\Bslash DEP}, 59, 60 - \item {\Bslash Dep}, 60 - \item {\Bslash dfl}, 34, 37 - \item {\Bslash dgroff}, 88 - \item {\Bslash dhccl}, 95 - \item {\Bslash dhccu}, 95 - \item {\Bslash dhcl}, 95 - \item {\Bslash dhcu}, 95 - \item {\Bslash dhqb}, 95 - \item {\Bslash dhql}, 95 - \item {\Bslash dhqu}, 95 - \item {\Bslash dhsong}, 73 - \item {\Bslash dhzq}, 95 - \item {\Bslash diapunc}, 87 - \item {\Bslash diapunctumauctdown}, 87 - \item dictionnaire, 5 - \item {\Bslash dimen}, 15 - \item distribution, 14 - \item {\Bslash dnq}, 85 - \item {\Bslash doccl}, 95 - \item {\Bslash doccu}, 95 - \item {\Bslash docl}, 95 - \item {\Bslash docu}, 95 - \item {\Bslash documentstyle}, 81 - \item {\Bslash doqb}, 95 - \item {\Bslash doql}, 95 - \item {\Bslash doqu}, 95 - \item {\Bslash dotted}, 41 - \item {\Bslash doublebar}, 49 - \item {\Bslash doublethumb}, 62 - \item {\Bslash downbow}, 57, 96 - \item {\Bslash downtrio}, 62 - \item {\Bslash dozq}, 95 - \item dpi, 100 - \item {\Bslash dqb}, 85 - \item {\Bslash Dqbbl}, 31 - \item {\Bslash Dqbbu}, 31 - \item {\Bslash Dqbl}, 31 - \item {\Bslash Dqbu}, 31 - \item {\Bslash dql}, 85 - \item {\Bslash dqlp}, 85 - \item {\Bslash dqlpp}, 85 - \item {\Bslash dqu}, 85 - \item {\Bslash dqup}, 85 - \item {\Bslash dqupp}, 85 - \item {\Bslash Drtx}, 84 - \item drum clef, 78 - \item {\Bslash drumclef}, 78, 95 - \item {\Bslash ds}, 31, 86 - \item {\Bslash dsh}, 34, 37 - \item {\Bslash dsoupir}, 84 - \item {\Bslash Dtx}, 84 - \item {\Bslash duevolte}, 55 - \item {\Bslash Dwr}, 86 - \item {\Bslash dznq}, 85 - \item {\Bslash dzq}, 85 - \item {\Bslash dzqp}, 85 - \item {\Bslash dzqpp}, 85 - - \indexspace - - \item {\Bslash eeeer}, 86 - \item {\Bslash eeer}, 86 - \item {\Bslash eer}, 86 - \item {\Bslash eightpoint}, 96 - \item {\Bslash eject}, 49, 50 - \item {\Bslash elemskip}, 9, 21, 22, 34, 50 - \item em\TeX, 82 - \item {\Bslash en}, 6 - \item {\Bslash end}, 21 - \item {\Bslash endcatcodesmusic}, 82 - \item {\Bslash endextract}, 70, 82 - \item {\Bslash endmuflex}, 21 - \item {\Bslash Endpiece}, 10, 49, 83 - \item {\Bslash endpiece}, 10, 49, 52, 69, 82, 83 - \item {\Bslash endvolta}, 54 - \item {\Bslash endvoltabox}, 54 - \item {\Bslash end{\tt \char '173}music{\tt \char '175}}, 70 - \item {\Bslash enotes}, 6 - \item {\Bslash er}, 86 - \item {\Bslash everystaff}, 63 - \item {\Bslash extractline}, 70 - - \indexspace - - \item {\Bslash f}, 61 - \item FAQ, 98 - \item fermata, 60 - \item {\Bslash Fermatadown}, 60 - \item {\Bslash fermatadown}, 60 - \item {\Bslash Fermataup}, 60 - \item {\Bslash fermataup}, 60 - \item {\Bslash ff}, 61 - \item {\Bslash fff}, 61 - \item {\Bslash ffff}, 61 - \item {\Bslash finmorceau}, 83 - \item {\Bslash fl}, 34, 37 - \item {\Bslash flageolett}, 57 - \item flats, 18 - \item {\Bslash flushbottom}, 49 - \item {\Bslash fontbarno}, 46 - \item fonts, 100 - \item {\Bslash Footnote}, 97 - \item {\Bslash footnote}, 97 - \item footnotes, 97 - \item format, 100 - \item {\Bslash fp}, 61 - \item {\Bslash FR}, 96 - \item french violin clef, 18 - \item french.sty, 82 - \item {\tt french.sty}, 81 - \item {\Bslash freqbarno}, 45 - \item {\Bslash frtpoint}, 96 - \item full rest, 32 - \item {\Bslash fullauthor}, 97 - \item {\Bslash fulltitle}, 97 - - \indexspace - - \item {\sc Gaulle, B.}, 82 - \item {\Bslash GB}, 96 - \item {\Bslash Gb}, 96 - \item {\Bslash gbarre}, 93 - \item {\Bslash gdot}, 93 - \item general staff size, 65 - \item {\Bslash generalmeter}, 18, 19 - \item {\Bslash generalsignature}, 13, 18, 38, 49, 50 - \item {\Bslash geometricskipscale}, 22 - \item glossaire, 5 - \item glossary, 5 - \item {\sc Gounod, C.}, 66, 103 - \item {\sc Gouzes, A.}, 104 - \item grave accent, 35 - \item {\Bslash grcl}, 65 - \item {\Bslash grcu}, 65 - \item gregorian clefs, 76 - \item gregorian music, 69, 76, 86 - \item {\Bslash gregorianCclef}, 87 - \item {\Bslash gregorianFclef}, 87 - \item {\sc Grieg, E.}, 30 - \item {\Bslash groff}, 88 - \item {\Bslash groupbottom}, 19 - \item {\Bslash grouptop}, 19 - \item guillemets, 82 - \item {\Bslash guitar}, 93 - \item guitar tablature, 70 - \item guitar tablatures, 93 - \item GUTenberg, 82 - - \indexspace - - \item {\Bslash ha}, 23 - \item {\sc Haendel, G.F.}, 104 - \item half rest, 32 - \item hard spacing, 12, 34, 73 - \item hard width, 9 - \item {\Bslash hardlyrics}, 73, 104 - \item {\Bslash hardnotes}, 73 - \item {\Bslash hardspace}, 34, 71 - \item harmonic notes, 79 - \item {\sc Haydn, J.}, 64 - \item {\Bslash hb}, 29 - \item {\Bslash hbox}, 32 - \item {\Bslash hf}, 84 - \item {\Bslash Hidebarrule}, 47 - \item {\Bslash hidebarrule}, 47 - \item hihat, 95 - \item {\Bslash hl}, 21, 23, 25 - \item {\Bslash hloff}, 33 - \item {\Bslash Hlonga}, 95 - \item {\Bslash hlp}, 26 - \item {\Bslash hlpp}, 26 - \item {\Bslash hlppp}, 97 - \item {\Bslash hoffset}, 50, 96, 103 - \item {\Bslash Hpause}, 95 - \item {\Bslash hpause}, 31, 86 - \item {\Bslash hpausep}, 31, 86 - \item {\Bslash hqsk}, 33 - \item {\Bslash hr}, 86 - \item {\Bslash hroff}, 33 - \item {\Bslash hrp}, 86 - \item {\Bslash hs}, 31, 86 - \item {\Bslash hsize}, 50, 96 - \item {\Bslash hsk}, 30, 33 - \item {\Bslash hskip}, 33 - \item {\Bslash hsong}, 73 - \item {\Bslash hu}, 23 - \item {\Bslash hup}, 26 - \item {\Bslash hupp}, 26 - \item {\Bslash huppp}, 97 - - \indexspace - - \item {\Bslash Ibbbbbbl}, 84 - \item {\Bslash ibbbbbbl}, 84 - \item {\Bslash Ibbbbbbu}, 84 - \item {\Bslash ibbbbbbu}, 84 - \item {\Bslash Ibbbbbl}, 84 - \item {\Bslash ibbbbbl}, 84 - \item {\Bslash Ibbbbbu}, 84 - \item {\Bslash ibbbbbu}, 84 - \item {\Bslash Ibbbbl}, 31 - \item {\Bslash ibbbbl}, 26 - \item {\Bslash Ibbbbu}, 31 - \item {\Bslash ibbbbu}, 26 - \item {\Bslash Ibbbl}, 31 - \item {\Bslash ibbbl}, 26 - \item {\Bslash Ibbbu}, 31 - \item {\Bslash ibbbu}, 26, 27 - \item {\Bslash Ibbl}, 31 - \item {\Bslash ibbl}, 26 - \item {\Bslash Ibbu}, 31 - \item {\Bslash ibbu}, 26 - \item {\Bslash Ibl}, 31 - \item {\Bslash ibl}, 26, 27 - \item {\Bslash ibslurd}, 39 - \item {\Bslash ibsluru}, 39 - \item {\Bslash Ibu}, 31 - \item {\Bslash ibu}, 26 - \item {\sc Icking, W.}, 96 - \item {\Bslash icresc}, 61 - \item {\Bslash ignorenats}, 51 - \item INITEX, 100 - \item {\Bslash input}, 84, 103 - \item instrument, 17 - \item instrument number, 13 - \item {\Bslash instrumentnumber}, 17 - \item {\Bslash interbarrules}, 95 - \item {\Bslash interbeam}, 61, 68, 69 - \item {\Bslash interfacteur}, 69 - \item {\Bslash interinstrument}, 68, 69, 71, 72 - \item {\Bslash interinstrumentiii}, 68 - \item {\Bslash Interligne}, 67, 69 - \item {\Bslash Internote}, 67 - \item {\Bslash internote}, 67, 94 - \item {\Bslash interportee}, 68 - \item {\Bslash interportee+\tt \char '134interinstrument}, 68 - \item {\Bslash interstaff}, 68--70 - \item {\Bslash invertslur}, 43 - \item {\Bslash Ioctfindown}, 36 - \item {\Bslash ioctfindown}, 37 - \item {\Bslash Ioctfinup}, 36 - \item {\Bslash ioctfinup}, 37 - \item {\Bslash islurd}, 38, 39 - \item {\Bslash Islurdbreak}, 44 - \item {\Bslash isluru}, 38, 39 - \item {\Bslash Islurubreak}, 44 - \item {\Bslash isslurd}, 39 - \item {\Bslash issluru}, 39 - \item {\Bslash it}, 56, 96 - \item {\Bslash itenl}, 40 - \item {\Bslash itenu}, 40 - \item {\Bslash itied}, 39 - \item {\Bslash itieu}, 39 - \item {\Bslash ITrille}, 59 - \item {\Bslash Itrille}, 58 - \item {\Bslash itrille}, 59 - - \indexspace - - \item {\Bslash kccl}, 95 - \item {\Bslash kccu}, 95 - \item {\Bslash kcl}, 95 - \item {\Bslash kcu}, 95 - \item {\Bslash kern}, 33 - \item {\sc Kneifl, S.}, 100 - \item {\Bslash kqb}, 95 - \item {\Bslash kql}, 95 - \item {\Bslash kqu}, 95 - \item {\Bslash kzq}, 95 - - \indexspace - - \item {\Bslash Largemusicsize}, 17, 65, 70 - \item {\Bslash largemusicsize}, 17, 65, 70 - \item {\Bslash Largevalue}, 66 - \item {\Bslash largevalue}, 66 - \item {\Bslash larpeggio}, 58 - \item \LaTeX, 81 - \item \protect\LaTeX, 97 - \item {\Bslash lchar}, 55, 71 - \item {\Bslash lcharnote}, 55 - \item {\Bslash lcl}, 25 - \item {\Bslash lclimacus}, 90 - \item {\Bslash lclivis}, 89 - \item {\Bslash lcu}, 25 - \item {\Bslash ldfl}, 34 - \item {\Bslash ldsh}, 34 - \item ledger lines, 86 - \item {\Bslash leftrepeat}, 52, 53 - \item {\Bslash leftrightrepeat}, 52 - \item legal, 96 - \item {\Bslash let\tt \char '134extractline\tt \char '134hbox}, 70 - \item {\Bslash let\tt \char '134extractline\tt \char '134leftline}, - 70 - \item lexique, 5 - \item {\Bslash lfl}, 34 - \item {\Bslash lh}, 24 - \item {\Bslash lhl}, 25 - \item {\Bslash lhu}, 25 - \item {\Bslash lifthpause}, 32, 86 - \item {\Bslash lifthpausep}, 32 - \item {\Bslash lifthr}, 86 - \item lifting rests, 31 - \item {\Bslash Liftoctline}, 37 - \item {\Bslash liftpause}, 32, 86 - \item {\Bslash liftpausep}, 32 - \item {\Bslash Liftslur}, 43 - \item {\Bslash liftwr}, 86 - \item {\Bslash linegoal}, 11 - \item {\Bslash linesinpage}, 84 - \item liquescens neumes, 91 - \item {\Bslash llap}, 32 - \item {\Bslash lmidstaff}, 55 - \item {\Bslash lna}, 34 - \item {\Bslash loff}, 30, 33 - \item {\Bslash loffset}, 33 - \item {\Bslash longa}, 23 - \item {\Bslash longaa}, 23 - \item {\Bslash longledgerlines}, 86 - \item {\Bslash lpar}, 62 - \item {\Bslash lpodatus}, 89 - \item {\Bslash lpppt}, 97 - \item {\Bslash lppt}, 26 - \item {\Bslash lppz}, 57 - \item {\Bslash lpt}, 26 - \item {\Bslash lpz}, 57 - \item {\Bslash lpzst}, 57 - \item {\Bslash lq}, 24 - \item {\Bslash lql}, 25 - \item {\Bslash lqu}, 25 - \item {\Bslash lreprmorceau}, 83 - \item {\Bslash lsf}, 57 - \item {\Bslash lsfz}, 57 - \item {\Bslash lsh}, 34 - \item {\Bslash lsong}, 72 - \item {\Bslash lsqu}, 87 - \item {\Bslash lst}, 57 - \item {\Bslash lw}, 24 - \item lyrics, 68, 70, 82 - - \indexspace - - \item mailing list, 98 - \item {\Bslash maketitle}, 97 - \item {\sc Marcello, B.}, 104 - \item {\Bslash maxbarsinline}, 84 - \item {\Bslash maxlinesinpage}, 84 - \item {\Bslash maxoctlines}, 36 - \item {\Bslash maxtrills}, 58 - \item {\Bslash medtype}, 56 - \item meter, 7, 18 - \item {\Bslash meterC}, 18 - \item {\Bslash meterplus}, 18 - \item {\Bslash meterskip}, 19 - \item Metric (TFM) not found, 100 - \item {\Bslash metron}, 57 - \item {\Bslash mf}, 61 - \item {\Bslash MI}, 96 - \item {\Bslash Mi}, 96 - \item {\Bslash midslur}, 41 - \item {\Bslash Mordent}, 60 - \item {\Bslash mordent}, 60 - \item {\sc Mozart, W.A.}, 8 - \item {\Bslash mp}, 61 - \item MS-DOS, 14, 99, 102 - \item {\Bslash mulooseness}, 10, 11, 13, 50, 73, 76 - \item {\Bslash multnoteskip}, 22 - \item musical footnotes, 70 - \item {\Bslash musicparskip}, 50 - \item {\tt musixadd.tex}, 38 - \item {\tt musixadd.tex}, 16 - \item {\tt musixblx.tex}, 81 - \item {\tt musixcpt.tex}, 12, 59, 62, 83 - \item {\tt musixdat.tex}, 85 - \item {\tt musixdoc\underscoreSymbol lj.zip}, 99 - \item {\tt musixdoc\underscoreSymbol ps.zip}, 99 - \item {\tt musixexa.zip}, 99, 103 - \item {\tt musixfll.tex}, 86 - \item {\tt musixflx}, 11, 12, 22 - \item {\tt musixgui.tex}, 93 - \item {\tt musixltx.tex}, 81 - \item {\tt musixmad.tex}, 95 - \item {\tt musixper.tex}, 80 - \item {\tt musixpk.zip}, 99 - \item {\tt musixpk3.zip}, 99 - \item {\tt musixpk6.zip}, 99 - \item {\tt musixstr.tex}, 96 - \item {\tt musixsty.tex}, 96 - \item {\tt musixtex.sty}, 81 - \item {\tt musixtex.tex}, 16 - \item {\tt musixtri.tex}, 97 - \item \protect\mutex, 15 - \item {\Bslash mxversion}, 83 - - \indexspace - - \item {\Bslash na}, 34, 37 - \item name of the instrument, 19 - \item name of the voice, 19 - \item {\Bslash nbbbbbbl}, 84 - \item {\Bslash nbbbbbbu}, 84 - \item {\Bslash nbbbbbl}, 84 - \item {\Bslash nbbbbbu}, 84 - \item {\Bslash nbbbbl}, 27 - \item {\Bslash nbbbbu}, 27 - \item {\Bslash nbbbu}, 27 - \item {\Bslash nbbl}, 27 - \item {\Bslash nbbu}, 27 - \item neumes, 76, 86, 88, 94 - \item newsgroups, 98 - \item {\Bslash nextinstrument}, 82 - \item {\Bslash nextstaff}, 82 - \item {\Bslash nh}, 25 - \item {\Bslash nobarmessage}, 47 - \item {\Bslash nobarnumbers}, 45 - \item {\Bslash nolinemessages}, 47 - \item {\Bslash normalbottom}, 49 - \item {\Bslash normalmusicsize}, 17, 22, 65, 70 - \item {\Bslash normalnotesize}, 64 - \item {\Bslash normaltranspose}, 35 - \item {\Bslash normalvalue}, 66, 67 - \item {\Bslash normtype}, 56 - \item {\Bslash nostartrule}, 18 - \item {\Bslash nostemcut}, 62 - \item {\Bslash NOTEs}, 21 - \item {\Bslash NOTes}, 21 - \item {\Bslash NOtes}, 21, 22 - \item {\Bslash Notes}, 21 - \item {\Bslash notes}, 21, 22 - \item {\Bslash noteskip}, 21, 23, 26, 31, 33, 34, 50, 83, 95 - \item {\Bslash NOTesp}, 21 - \item {\Bslash NOtesp}, 21 - \item {\Bslash Notesp}, 21 - \item {\Bslash notesp}, 21 - \item {\Bslash nq}, 25 - \item {\Bslash nspace}, 33 - - \indexspace - - \item octave clefs, 78 - \item octaviation, 35 - \item {\Bslash octfindown}, 36 - \item {\Bslash octfinup}, 36 - \item {\Bslash octnumber}, 36 - \item {\Bslash OD}, 96 - \item {\Bslash Od}, 96 - \item {\Bslash off}, 34 - \item {\Bslash OH}, 96 - \item {\Bslash Oh}, 96 - \item {\Bslash oldGclef}, 94 - \item oriscus, 87 - \item {\Bslash oriscus}, 87 - \item ornament codings, 62 - \item ornaments, 60, 64 - \item {\Bslash othermention}, 97 - \item {\Bslash ovbkt}, 62, 63 - \item {\Bslash oxccl}, 95 - \item {\Bslash oxccu}, 95 - \item {\Bslash oxcl}, 95 - \item {\Bslash oxcu}, 95 - \item {\Bslash oxqb}, 95 - \item {\Bslash oxql}, 95 - \item {\Bslash oxqu}, 95 - \item {\Bslash oxzq}, 95 - - \indexspace - - \item {\Bslash p}, 61 - \item page and line layout (global), 50 - \item {\Bslash parindent}, 19, 21, 49, 50 - \item {\Bslash parskip}, 49 - \item {\Bslash PAUSe}, 31, 86 - \item {\Bslash PAuse}, 31, 86 - \item {\Bslash pause}, 31, 86 - \item {\Bslash pausep}, 31, 86 - \item PC end of line coding, 99 - \item {\Bslash PED}, 59, 60 - \item {\Bslash Ped}, 60 - \item percussion music, 65, 69, 77, 80 - \item {\Bslash pesquassus}, 89 - \item {\Bslash pesquassusauctdown}, 91 - \item {\Bslash piececont}, 97 - \item {\Bslash Pizz}, 96 - \item {\Bslash podatus}, 89 - \item {\Bslash podatusauctdown}, 91 - \item {\Bslash podatusauctup}, 91 - \item {\Bslash podatusdeminut}, 92 - \item {\Bslash podatusinitiodebilis}, 89 - \item {\Bslash Porrectus}, 89 - \item {\Bslash Porrectusauctdown}, 92 - \item {\Bslash Porrectusdeminut}, 93 - \item {\Bslash Porrectusflexus}, 90 - \item portato, 57 - \item {\Bslash pp}, 61 - \item {\Bslash ppff}, 56 - \item {\Bslash ppffsixteen}, 56 - \item {\Bslash ppfftwenty}, 56 - \item {\Bslash ppfftwentyfour}, 56 - \item {\Bslash ppp}, 61 - \item {\Bslash pppp}, 61 - \item {\Bslash pppt}, 26 - \item {\Bslash ppt}, 26 - \item {\Bslash preprmorceau}, 83 - \item {\Bslash pt $p$}, 26 - \item punctum, 87 - \item {\Bslash punctum}, 87 - \item punctum auctum, 87 - \item punctum deminutum, 87 - \item {\Bslash punctumauctdown}, 87 - \item {\Bslash punctumauctup}, 87 - \item {\Bslash punctumdeminutum}, 87 - - \indexspace - - \item {\Bslash qa}, 23 - \item {\Bslash qb}, 21, 27 - \item {\Bslash qbp}, 26 - \item {\Bslash qbpp}, 26 - \item {\Bslash qbppp}, 97 - \item {\Bslash qh}, 83 - \item {\Bslash ql}, 23 - \item {\Bslash qlp}, 26 - \item {\Bslash qlpp}, 26 - \item {\Bslash qlppp}, 97 - \item {\Bslash qp}, 31, 86 - \item {\Bslash Qqbbl}, 31 - \item {\Bslash Qqbbu}, 31 - \item {\Bslash Qqbl}, 31 - \item {\Bslash Qqbu}, 31 - \item {\Bslash qqs}, 31, 86 - \item {\Bslash qr}, 86 - \item {\Bslash Qrtx}, 84 - \item {\Bslash qs}, 31, 86 - \item {\Bslash qsk}, 33, 34 - \item {\Bslash qsoupir}, 84 - \item {\Bslash qspace}, 33 - \item {\Bslash Qtx}, 84 - \item {\Bslash qu}, 21, 23 - \item quilisma, 87 - \item {\Bslash quilisma}, 87 - \item {\Bslash quilismapes}, 89 - \item {\Bslash quilismapesauctdown}, 92 - \item {\Bslash qup}, 26 - \item {\Bslash qupp}, 26 - \item {\Bslash quppp}, 97 - \item {\Bslash Qwr}, 86 - - \indexspace - - \item {\Bslash raggedbottom}, 49 - \item {\Bslash raggedstoppiece}, 86 - \item {\Bslash raise}, 31 - \item {\Bslash raisebarno}, 46 - \item {\Bslash raiseguitar}, 94 - \item {\Bslash raiseped}, 60 - \item {\Bslash raisevolta}, 54 - \item {\Bslash rcl}, 25 - \item {\Bslash rcu}, 25 - \item relative accidentals, 13 - \item {\Bslash relativeaccid}, 38 - \item {\Bslash relax}, 12 - \item repeated patterns, 29 - \item {\Bslash reprmorceau}, 83 - \item {\Bslash resetclefsymbols}, 76, 78 - \item {\Bslash resetlayout}, 70 - \item rest lifting, 31 - \item {\Bslash reverseallabreve}, 18 - \item {\Bslash reverseC}, 18 - \item {\Bslash rh}, 24 - \item {\Bslash rhl}, 25 - \item {\Bslash rhu}, 25 - \item {\Bslash rightrepeat}, 52, 53 - \item {\Bslash rlap}, 32 - \item {\Bslash rm}, 56, 96 - \item {\Bslash roccl}, 95 - \item {\Bslash roccu}, 95 - \item {\Bslash rocl}, 95 - \item {\Bslash rocu}, 95 - \item {\Bslash roff}, 30, 33 - \item {\Bslash roffset}, 33 - \item {\Bslash roqb}, 95 - \item {\Bslash roql}, 95 - \item {\Bslash roqu}, 95 - \item {\Bslash rozq}, 95 - \item {\Bslash rpar}, 62 - \item {\Bslash rq}, 24 - \item {\Bslash rql}, 25 - \item {\Bslash rqu}, 25 - \item {\Bslash rsqu}, 87 - \item {\Bslash rtx}, 84 - \item {\Bslash rw}, 24 - - \indexspace - - \item {\Bslash salicus}, 91 - \item {\Bslash salicusauctdown}, 92 - \item {\Bslash salicusflexus}, 91 - \item {\sc Satie, E.}, 104 - \item scalable dimension, 34 - \item scalable values, 34 - \item {\Bslash scale}, 22 - \item {\Bslash scalenoteskip}, 22 - \item {\Bslash scandicus}, 90 - \item {\Bslash scandicusauctdown}, 92 - \item {\Bslash scandicusdeminut}, 93 - \item {\sc Schofer, A.}, 15 - \item {\sc Schumann, R.}, 103 - \item {\Bslash sDEP}, 59, 60 - \item {\Bslash sDep}, 60 - \item {\Bslash Segno}, 54 - \item {\Bslash segno}, 54 - \item {\Bslash sepbarrules}, 47 - \item {\Bslash setaltoclefsymbol}, 76, 78, 87 - \item {\Bslash setbassclefsymbol}, 76, 78 - \item {\Bslash setclef}, 17, 18, 51, 63, 76 - \item {\Bslash setclefsymbol}, 77, 78 - \item {\Bslash setdoubleBAR}, 49 - \item {\Bslash setdoublebar}, 49 - \item {\Bslash setemptybar}, 49 - \item {\Bslash setendvolta}, 53 - \item {\Bslash setendvoltabox}, 53, 54 - \item {\Bslash setinterinstrument}, 68, 69, 71 - \item {\Bslash setleftrepeat}, 52 - \item {\Bslash setleftrightrepeat}, 52 - \item {\Bslash setlines}, 70 - \item {\Bslash setmeter}, 19, 52 - \item {\Bslash setname}, 19 - \item {\Bslash setrightrepeat}, 52 - \item {\Bslash setsign}, 13, 50 - \item {\Bslash setsign$n$}, 38 - \item {\Bslash setsize}, 66 - \item {\Bslash setsize$n$}, 67 - \item {\Bslash setsongraise}, 72 - \item {\Bslash setstaffs}, 17, 71 - \item {\Bslash settrebleclefsymbol}, 78 - \item {\Bslash Setvolta}, 53 - \item {\Bslash setvolta}, 53 - \item {\Bslash setvoltabox}, 54 - \item {\Bslash sF}, 61 - \item sforzando, 57 - \item {\Bslash sh}, 34, 37 - \item {\Bslash Shake}, 60 - \item {\Bslash shake}, 60 - \item {\Bslash Shakel}, 60 - \item {\Bslash Shakene}, 60 - \item {\Bslash Shakenw}, 60 - \item {\Bslash Shakesw}, 60 - \item sharps, 18 - \item {\Bslash shiftbarno}, 46 - \item {\Bslash shortauthor}, 97 - \item {\Bslash shortbarrules}, 95 - \item {\Bslash shorttitle}, 97 - \item {\Bslash showallbarrules}, 48 - \item {\Bslash Showbarrule}, 47 - \item {\Bslash showbarrule}, 47 - \item signatures, 17 - \item sizes, 17 - \item {\Bslash sk}, 24, 33, 34 - \item {\Bslash sl}, 96 - \item {\Bslash slide}, 86 - \item {\Bslash slur}, 44 - \item {\Bslash smallaccid}, 35 - \item {\Bslash smallfl}, 35 - \item {\Bslash smallmusicsize}, 17, 22, 65, 70 - \item {\Bslash smallnotesize}, 64 - \item {\Bslash smallsh}, 35 - \item {\Bslash smalltype}, 56 - \item {\Bslash smallvalue}, 66 - \item soft width, 9 - \item {\Bslash softlyrics}, 73 - \item {\Bslash songbottom}, 19 - \item {\Bslash songtop}, 19 - \item {\Bslash soupir}, 31 - \item {\Bslash SP}, 96 - \item spacing, 7 - \item spacing note, 21 - \item {\Bslash sPED}, 59, 60 - \item {\Bslash sPed}, 60 - \item {\Bslash squ}, 87 - \item {\Bslash sslur}, 45 - \item staccato, 57 - \item staff line number, 69 - \item staff size, 65, 66 - \item staff spacing, 66 - \item {\Bslash staffbotmarg}, 49, 68--72 - \item {\Bslash staffspacing}, 66 - \item {\Bslash stafftopmarg}, 49, 68, 70, 94 - \item standard musical notation, 5 - \item {\Bslash startbarno}, 46 - \item {\Bslash startextract}, 70, 82 - \item {\Bslash startmuflex}, 20 - \item {\Bslash startpiece}, 21, 49, 52, 69, 70, 82--84, 97 - \item {\Bslash startrule}, 18 - \item {\Bslash stdbarrules}, 47 - \item {\Bslash stdstemfalse}, 62 - \item {\Bslash stdstemtrue}, 62 - \item {\sc Steinbach, A.}, 15 - \item {\Bslash stemcut}, 62 - \item {\Bslash stemfactor}, 69 - \item {\Bslash stemlength}, 61, 62, 69 - \item stems, 17 - \item {\Bslash stie}, 45 - \item {\Bslash Stoppiece}, 10, 49, 83 - \item {\Bslash stoppiece}, 10, 11, 49, 52, 69, 82, 83, 97 - \item string instruments, 96 - \item style, 81 - \item subbass, 17 - \item {\Bslash subtitle}, 97 - \item {\Bslash suspmorceau}, 83 - \item {\Bslash svtpoint}, 96 - \item {\Bslash systemheight}, 68 - \item {\Bslash systemnumbers}, 46 - \item {\sc Szukics, B.}, 87 - - \indexspace - - \item tabulation, 82 - \item {\Bslash tbbbbbbl}, 84 - \item {\Bslash tbbbbbbu}, 84 - \item {\Bslash tbbbbbl}, 84 - \item {\Bslash tbbbbbu}, 84 - \item {\Bslash tbbbbl}, 28 - \item {\Bslash tbbbbu}, 28 - \item {\Bslash tbbbl}, 28 - \item {\Bslash tbbbu}, 28 - \item {\Bslash tbbl}, 28 - \item {\Bslash tbbu}, 28 - \item {\Bslash tbl}, 27 - \item {\Bslash tbslurd}, 39 - \item {\Bslash tbsluru}, 39 - \item {\Bslash tbu}, 27 - \item {\Bslash tcresc}, 61 - \item {\Bslash tdecresc}, 61 - \item {\Bslash temps}, 84 - \item tenor violin clef, 63 - \item {\Bslash tenpoint}, 96 - \item {\Bslash tgccl}, 95 - \item {\Bslash tgccu}, 95 - \item {\Bslash tgcl}, 95 - \item {\Bslash tgcu}, 95 - \item {\Bslash tgqb}, 95 - \item {\Bslash tgql}, 95 - \item {\Bslash tgqu}, 95 - \item {\Bslash tgzq}, 95 - \item {\Bslash thelyrics}, 73 - \item {\Bslash thsong}, 73 - \item {\Bslash tie}, 45 - \item ties, 39 - \item {\Bslash tinynotesize}, 64 - \item {\Bslash tinyvalue}, 66 - \item {\Bslash title}, 97 - \item titles, 96 - \item {\Bslash Toctfin}, 36 - \item {\Bslash today}, 85 - \item {\Bslash torculus}, 89 - \item {\Bslash torculusauctdown}, 92 - \item {\Bslash torculusdebilis}, 93 - \item {\Bslash torculusdeminut}, 92 - \item {\Bslash torculusinitiodebilis}, 89 - \item {\Bslash tqb}, 27 - \item {\Bslash Tqbbl}, 31 - \item {\Bslash Tqbbu}, 31 - \item {\Bslash Tqbl}, 31 - \item {\Bslash Tqbu}, 31 - \item {\Bslash tqh}, 27 - \item traduction, 5 - \item {\Bslash transpose}, 13, 35, 37 - \item {\Bslash treble}, 18 - \item {\Bslash treblelowoct}, 78 - \item {\Bslash trebleoct}, 78 - \item {\Bslash trigonus}, 91 - \item {\Bslash Trille}, 58 - \item {\Bslash trille}, 58 - \item {\Bslash TrilleC}, 59 - \item {\Bslash trilleC}, 59 - \item {\Bslash TrilleX}, 59 - \item {\Bslash trilleX}, 59 - \item trills, 58 - \item {\Bslash triolet}, 58 - \item {\Bslash tristropha}, 88 - \item {\Bslash trivirga}, 88 - \item {\Bslash Trtx}, 84 - \item {\Bslash tslur}, 38, 39 - \item {\Bslash Tslurbreak}, 44 - \item {\Bslash tsslur}, 39 - \item {\Bslash tten}, 40 - \item {\Bslash ttie}, 39 - \item {\Bslash Ttrille}, 59 - \item {\Bslash tTrille}, 59 - \item {\Bslash ttrille}, 59 - \item {\Bslash Ttx}, 84 - \item {\Bslash turn}, 60 - \item {\Bslash twfvpoint}, 96 - \item {\Bslash twlpoint}, 96 - \item {\Bslash twtypoint}, 96 - \item {\Bslash tx}, 84 - \item {\Bslash txt}, 58, 62 - - \indexspace - - \item {\Bslash UD}, 96 - \item {\Bslash Ud}, 96 - \item {\Bslash UH}, 96 - \item {\Bslash Uh}, 96 - \item {\Bslash unbkt}, 62, 63 - \item {\Bslash upbow}, 57, 96 - \item {\Bslash upperfl}, 35 - \item {\Bslash upperna}, 35 - \item {\Bslash uppersh}, 35 - \item {\Bslash uppz}, 57 - \item {\Bslash Uptext}, 54, 55, 57 - \item {\Bslash uptext}, 55 - \item {\Bslash uptrio}, 62 - \item {\Bslash upz}, 57 - \item {\Bslash upzst}, 57 - \item {\Bslash usf}, 57 - \item {\Bslash usfz}, 57 - \item {\Bslash ust}, 57 - - \indexspace - - \item {\Bslash vadjust}, 63 - \item {\Bslash varaccid}, 35 - \item {\Bslash varline}, 62 - \item {\Bslash vfootnote}, 97 - \item violin, 96 - \item violin clef, 18, 51 - \item violin harmonic notes, 65 - \item virga, 87 - \item {\Bslash virga}, 87 - \item {\Bslash voffset}, 50, 96, 103 - \item voices, 68 - \item {\Bslash voltadot}, 54 - \item {\Bslash vsize}, 50, 96 - - \indexspace - - \item {\Bslash wh}, 23 - \item {\Bslash wholeshift}, 57 - \item {\Bslash whp}, 26 - \item {\Bslash whpp}, 26 - \item {\Bslash whppp}, 97 - \item {\sc Widor, C.M.}, 104 - \item {\Bslash wq}, 23 - \item {\Bslash wqq}, 23 - \item {\Bslash wr}, 86 - \item {\Bslash writebarno}, 46 - \item {\Bslash writethebarno}, 46 - \item {\Bslash writezbarno}, 46 - \item {\Bslash wrp}, 86 - - \indexspace - - \item {\Bslash xbar}, 49 - \item {\Bslash xccl}, 95 - \item {\Bslash xccu}, 95 - \item {\Bslash xcl}, 95 - \item {\Bslash xcu}, 95 - \item {\Bslash xqb}, 95 - \item {\Bslash xql}, 95 - \item {\Bslash xqu}, 95 - \item {\Bslash xtuplet}, 58 - \item {\Bslash xzq}, 95 - - \indexspace - - \item {\Bslash yccccl}, 85 - \item {\Bslash yccccu}, 85 - \item {\Bslash ycccl}, 85 - \item {\Bslash ycccu}, 85 - \item {\Bslash yccl}, 85 - \item {\Bslash yccu}, 85 - \item {\Bslash ycl}, 85 - \item {\Bslash yclp}, 85 - \item {\Bslash yclpp}, 85 - \item {\Bslash ycu}, 85 - \item {\Bslash ycup}, 85 - \item {\Bslash ycupp}, 85 - \item {\Bslash ynq}, 85 - \item {\Bslash yqb}, 85 - \item {\Bslash yql}, 85 - \item {\Bslash yqlp}, 85 - \item {\Bslash yqlpp}, 85 - \item {\Bslash yqu}, 85 - \item {\Bslash yqup}, 85 - \item {\Bslash yqupp}, 85 - \item {\Bslash yzq}, 85 - \item {\Bslash yzqp}, 85 - \item {\Bslash yzqpp}, 85 - - \indexspace - - \item {\Bslash zalaligne}, 10, 49 - \item {\Bslash zalapage}, 10, 49 - \item {\Bslash zapostropha}, 87 - \item {\Bslash zbar}, 49 - \item {\Bslash zbreath}, 60 - \item {\Bslash zbreve}, 25 - \item {\Bslash zcccccl}, 84 - \item {\Bslash zcccccu}, 84 - \item {\Bslash zccccl}, 25 - \item {\Bslash zcccclp}, 96 - \item {\Bslash zcccclpp}, 96 - \item {\Bslash zccccu}, 25 - \item {\Bslash zccccup}, 96 - \item {\Bslash zccccupp}, 96 - \item {\Bslash zcccl}, 25 - \item {\Bslash zccclp}, 96 - \item {\Bslash zccclpp}, 96 - \item {\Bslash zcccu}, 25 - \item {\Bslash zcccup}, 96 - \item {\Bslash zcccupp}, 96 - \item {\Bslash zccl}, 25 - \item {\Bslash zcclp}, 96 - \item {\Bslash zcclpp}, 96 - \item {\Bslash zccu}, 25 - \item {\Bslash zccup}, 96 - \item {\Bslash zccupp}, 96 - \item {\Bslash zchangeclefs}, 51 - \item {\Bslash zchangecontext}, 51, 52 - \item {\Bslash zchar}, 54, 55, 60, 71 - \item {\Bslash zcharnote}, 8, 54, 55, 60, 63, 71 - \item {\Bslash zcl}, 25 - \item {\Bslash zclp}, 26 - \item {\Bslash zclpp}, 26 - \item {\Bslash zclppp}, 97 - \item {\Bslash zcu}, 25 - \item {\Bslash zcup}, 26 - \item {\Bslash zcupp}, 26 - \item {\Bslash zcuppp}, 97 - \item {\Bslash zdiapunc}, 87 - \item {\Bslash zendextract}, 70 - \item {\Bslash zh}, 24 - \item {\Bslash zhl}, 25 - \item {\Bslash zhlp}, 26 - \item {\Bslash zhlpp}, 26 - \item {\Bslash zhlppp}, 97 - \item {\Bslash zhp}, 26 - \item {\Bslash zhpp}, 26 - \item {\Bslash zhppp}, 97 - \item {\Bslash zhu}, 25 - \item {\Bslash zhup}, 26 - \item {\Bslash zhupp}, 26 - \item {\Bslash zhuppp}, 97 - \item {\Bslash zlonga}, 25 - \item {\Bslash zlsqu}, 87 - \item {\Bslash zmaxima}, 23, 25 - \item {\Bslash zmidstaff}, 55 - \item {\Bslash znh}, 25 - \item {\Bslash znotes}, 21 - \item {\Bslash znq}, 25 - \item {\Bslash zoriscus}, 87 - \item {\Bslash zq}, 7, 24 - \item {\Bslash zqb}, 25 - \item {\Bslash zqbp}, 26 - \item {\Bslash zqbpp}, 26 - \item {\Bslash zqbppp}, 97 - \item {\Bslash zql}, 25 - \item {\Bslash zqlp}, 26 - \item {\Bslash zqlpp}, 26 - \item {\Bslash zqlppp}, 97 - \item {\Bslash zqp}, 26 - \item {\Bslash zqpp}, 26 - \item {\Bslash zqppp}, 97 - \item {\Bslash zqu}, 25 - \item {\Bslash zqup}, 26 - \item {\Bslash zqupp}, 26 - \item {\Bslash zquppp}, 97 - \item {\Bslash zrsqu}, 87 - \item {\Bslash zsong}, 72 - \item {\Bslash zsqu}, 87 - \item {\Bslash zstoppiece}, 10, 49 - \item {\Bslash ztqb}, 27 - \item {\Bslash ztqh}, 27 - \item {\Bslash zw}, 25 - \item {\Bslash zwp}, 26 - \item {\Bslash zwpp}, 26 - \item {\Bslash zwppp}, 97 - \item {\Bslash zwq}, 25 - \item {\Bslash zynq}, 85 - -\end{theindex} diff --git a/Master/texmf-dist/tex/generic/musixtex/musixltx.tex b/Master/texmf-dist/tex/generic/musixtex/musixltx.tex deleted file mode 100644 index f4eff2cf23c..00000000000 --- a/Master/texmf-dist/tex/generic/musixtex/musixltx.tex +++ /dev/null @@ -1,32 +0,0 @@ -% -% This file is part of MusiXTeX -% -% MusiXTeX is free software; you can redistribute it and/or modify -% it under the terms of the GNU General Public License as published by -% the Free Software Foundation; either version 2, or (at your option) -% any later version. -% -% MusiXTeX is distributed in the hope that it will be useful, -% but WITHOUT ANY WARRANTY; without even the implied warranty of -% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -% GNU General Public License for more details. -% -% You should have received a copy of the GNU General Public License -% along with MusiXTeX; see the file COPYING. If not, write to -% the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -% Boston, MA 02111-1307, USA. -% -\ifx\undefined\music \else \endinput \fi - -\immediate\write16{MusiXLaTeX T.61\space<25 September 1996>}% - -\newenvironment{music}{\@afterindenttrue\parskip0pt\catcodesmusic - \resetlayout}{}% - -\ifx\musix@begindocument\undefined - \let\musix@begindocument\document - \def\document{\musix@begindocument - \ifstartmuflex@done\else\startmuflex\fi}% -\fi - -\endinput diff --git a/Master/texmf-dist/tex/generic/musixtex/musixlyr.tex b/Master/texmf-dist/tex/generic/musixtex/musixlyr.tex index 753928bf99c..fc9aaaf9b1f 100644 --- a/Master/texmf-dist/tex/generic/musixtex/musixlyr.tex +++ b/Master/texmf-dist/tex/generic/musixtex/musixlyr.tex @@ -26,7 +26,7 @@ %% E-mail: rainer.dunker@web.de %% \ifx\undefined\lyr\else\endinput\fi -\immediate\write10{MusiXLYRics 2.1c\space<June 10, 2003>} +\immediate\write16{MusiXLYRics 2.1c\space<June 10, 2003>} \def\musixlyrversion{2.12} \makeatletter diff --git a/Master/texmf-dist/tex/generic/musixtex/musixmad.tex b/Master/texmf-dist/tex/generic/musixtex/musixmad.tex index 18b705c2e96..6d29d3cd843 100644 --- a/Master/texmf-dist/tex/generic/musixtex/musixmad.tex +++ b/Master/texmf-dist/tex/generic/musixtex/musixmad.tex @@ -16,135 +16,15 @@ % the Free Software Foundation, Inc., 59 Temple Place - Suite 330, % Boston, MA 02111-1307, USA. % - -\ifx\staffspacingxii\undefined\else\endinput\fi - -% input musixadd before changing \catcode`\@ to avoid macro collision -\ifnum\maxinstruments<9 \input musixadd \fi - -\immediate\write16{MusiXMore ADditional instruments T.113\space<28 June 2005>}% - -\edef\catcodeat{\the\catcode`\@}\catcode`\@=11 - -%\ifx\undefined\documentstyle \else -% \errmessage{MusiXMAD+LaTeX will need too many dimension registers, it's -%better to stop with 'x'}\fi - -\let\@wloG\wlog -\def\wlog#1{} - -\let\maxinstruments\tw@lv@ - -\let\interinstrumentx\interinstrument -\let\interinstrumentxi\interinstrument -\let\interinstrumentxii\interinstrument - -\let\T@Rx\z@ -\let\T@Rxi\z@ -\let\T@Rxii\z@ - -\let\staffspacingx\@ne -\let\staffspacingxi\@ne -\let\staffspacingxii\@ne - -\newskip\k@ix -\newskip\k@ixi -\newskip\k@ixii - -\newskip\i@nx -\newskip\i@nxi -\newskip\i@nxii - -\newskip\b@xx \newskip\b@zx -\newskip\b@xxi \newskip\b@zxi -\newskip\b@xxii\newskip\b@zxii - -\newskip\c@xx \newskip\c@zx -\newskip\c@xxi \newskip\c@zxi -\newskip\c@xxii\newskip\c@zxii - -\newskip\d@xx \newskip\d@zx -\newskip\d@xxi \newskip\d@zxi -\newskip\d@xxii\newskip\d@zxii - -\newskip\e@xx \newskip\e@zx -\newskip\e@xxi \newskip\e@zxi -\newskip\e@xxii\newskip\e@zxii - -\newcount\b@px \newcount\b@nx -\newcount\b@pxi \newcount\b@nxi -\newcount\b@pxii\newcount\b@nxii - -\newcount\n@px \n@px\@ne -\newcount\n@pxi \n@pxi\@ne -\newcount\n@pxii\n@pxii\@ne - -\newskip\s@xx -\newskip\s@xxi -\newskip\s@xxii -\newskip\s@Yx -\newskip\s@Yxi -\newskip\s@Yxii -\newskip\s@ax -\newskip\s@axi -\newskip\s@axii -\newtoks\s@sx \s@sx={x} -\newtoks\s@sxi \s@sxi={x} -\newtoks\s@sxii\s@sxii={x} -\newcount\s@yx -\newcount\s@yxi -\newcount\s@yxii -\newcount\s@Nx -\newcount\s@Nxi -\newcount\s@Nxii -\newcount\s@zx \s@zx\maxdimen -\newcount\s@zxi \s@zxi\maxdimen -\newcount\s@zxii\s@zxii\maxdimen -\newtoks\s@dx -\newtoks\s@dxi -\newtoks\s@dxii - -\newcount\a@sx \newcount\o@sx -\newcount\a@sxi \newcount\o@sxi -\newcount\a@sxii\newcount\o@sxii - -\newtoks\a@cx \a@cx={{\z@}{\z@}{\z@}{\z@}} -\newtoks\a@cxi \a@cxi={{\z@}{\z@}{\z@}{\z@}} -\newtoks\a@cxii \a@cxii={{\z@}{\z@}{\z@}{\z@}} - -\newtoks\o@cx -\newtoks\o@cxi -\newtoks\o@cxii - -\newtoks\m@tx -\newtoks\m@txi -\newtoks\m@txii - -\def\resetlayout{\let\interfacteur\nin@ - \stafftopmarg\thr@@\Interligne \staffbotmarg\thr@@\Interligne - \let\n@li\fiv@ \let\n@lii\fiv@ \let\n@liii\fiv@ - \let\n@liv\fiv@ \let\n@lv\fiv@ \let\n@lvi\fiv@ - \let\n@lvii\fiv@ \let\n@lviii\fiv@ \let\n@lix\fiv@ - \let\n@lx\fiv@ \let\n@lxi\fiv@ \let\n@lxii\fiv@ - \resetclefsymbols} - -\def\resetclefsymbols{% - \let\treblec@si\z@ \let\treblec@sii\z@ \let\treblec@siii\z@ \let\treblec@siv\z@ - \let\treblec@sv\z@ \let\treblec@svi\z@ \let\treblec@svii\z@ \let\treblec@sviii\z@ \let\treblec@six\z@ - \let\treblec@sx\z@ \let\treblec@sxi\z@ \let\treblec@sxii\z@ - \let\altoc@si\z@ \let\altoc@sii\z@ \let\altoc@siii\z@ \let\altoc@siv\z@ - \let\altoc@sv\z@ \let\altoc@svi\z@ \let\altoc@svii\z@ \let\altoc@sviii\z@ \let\altoc@six\z@ - \let\altoc@sx\z@ \let\altoc@sxi\z@ \let\altoc@sxii\z@ - \let\bassc@si\z@ \let\bassc@sii\z@ \let\bassc@siii\z@ \let\bassc@siv\z@ - \let\bassc@sv\z@ \let\bassc@svi\z@ \let\bassc@svii\z@ \let\bassc@sviii\z@ \let\bassc@six\z@ - \let\bassc@sx\z@ \let\bassc@sxi\z@ \let\bassc@sxii\z@ -} - -\let\nbinstruments\maxinstruments -\normalnotesize\resetlayout -\let\nbinstruments\@ne - -\let\wlog\@wloG - -\catcode`\@=\catcodeat +% +% musixmad.tex : allocate registers for more additional instruments +% +\immediate\write16{MusiXMore ADditional instruments T.115 <19 Nov 2010>}% +% +% +% setup the maximum element numbers +\setmaxinstruments{12}% +\setmaxgroups{4}% +\setmaxslurs\maxinstruments +% \endinput diff --git a/Master/texmf-dist/tex/generic/musixtex/musixper.tex b/Master/texmf-dist/tex/generic/musixtex/musixper.tex index 39dd908fca7..47ad54e6440 100644 --- a/Master/texmf-dist/tex/generic/musixtex/musixper.tex +++ b/Master/texmf-dist/tex/generic/musixtex/musixper.tex @@ -16,16 +16,16 @@ % the Free Software Foundation, Inc., 59 Temple Place - Suite 330, % Boston, MA 02111-1307, USA. % -\immediate\write16{MusiXPERcussion T.60\space<23 September 1996>}% - \ifx\undefined\drumclef \else \endinput \fi -\edef\catcodeat{\the\catcode`\@}\catcode`\@=11 +\immediate\write16{MusiXPERcussion T.60\space<27 September 2010>}% \ifx\undefined\dqb \input musixdia \fi +\edef\catcodeat{\the\catcode`\@}\catcode`\@=11 + % if you need pointed percussion notes, say '\p[p][p]t n\xqu n' or '\xqu{.n}' % if you need them more often define them by your one diff --git a/Master/texmf-dist/tex/generic/musixtex/musixps.tex b/Master/texmf-dist/tex/generic/musixtex/musixps.tex index c604de32011..c2a392c80be 100644 --- a/Master/texmf-dist/tex/generic/musixtex/musixps.tex +++ b/Master/texmf-dist/tex/generic/musixtex/musixps.tex @@ -1,20 +1,5 @@ %% PostScript slurs, ties and crescendos -% Copyright 2002 by Stanislav Kneifl stanislav.kneifl@hieronymus.cz -% -% 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 the -% Free Software Foundation; either version 2 of the License, or (at your -% option) any later version. -% -% This program is distributed in the hope that it will be useful, -% but WITHOUT ANY WARRANTY; without even the implied warranty of -% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 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, write to the Free Software Foundation, Inc., -% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - +% Coded by Stanislav Kneifl \ifx\undefined\liftcresc\else\endinput\fi diff --git a/Master/texmf-dist/tex/generic/musixtex/musixtex.sty b/Master/texmf-dist/tex/generic/musixtex/musixtex.sty deleted file mode 100644 index c8127f51d08..00000000000 --- a/Master/texmf-dist/tex/generic/musixtex/musixtex.sty +++ /dev/null @@ -1,3 +0,0 @@ -\input musixtex -\input musixltx -\endinput diff --git a/Master/texmf-dist/tex/generic/musixtex/musixtex.tex b/Master/texmf-dist/tex/generic/musixtex/musixtex.tex index 618711cfa53..3dee4a2e36d 100644 --- a/Master/texmf-dist/tex/generic/musixtex/musixtex.tex +++ b/Master/texmf-dist/tex/generic/musixtex/musixtex.tex @@ -16,18 +16,21 @@ % the Free Software Foundation, Inc., 59 Temple Place - Suite 330, % Boston, MA 02111-1307, USA. % -% New in this version -% macros: \lwp \lwpp \rwp \rwpp \lhp \rhp \lhpp \rhpp +% Main changes of T.115 (Search the string "T115" for details.) +% New user macros: +% \mxvernumber, \mxversuffix +% \setmaxinstruments, \setmaxcxxviiibeams, \setmaxcclvibeams, +% \setmaxgroups, \setmaxslurs, \setmaxtrills, \setmaxoctlines +% \smalltrebleoct, \smalltreblelowoct, \smallbassoct, \smallbasslowoct +% +% Changes functionally/syntax compatible: +% \mxversion +% \resetlayout, \resetclefsymbols +% +% Changes which may be incompatible: +% \maxinstruments +% \setname % -% Correction of signature spacing at change of the music size (l.1428-35)rev2 -% -% Correction of a bug in the definition of choir bracket (l.1690-1700) -% -% Correction of a bug in the macro \rul@sep (l. 2259)(l.2273) -% -% \cclp, \zccup, \zcclp from musixpoi.tex (l.3254)rev3 typo correction -% -% Correction of a historical bug of stem length (l.4460) % \ifx\undefined\startpiece \else \endinput \fi \edef\catcodeat{\the\catcode`\@}\catcode`\@=11 @@ -36,8 +39,12 @@ \ifx\makeatother\undefined\def\makeatother{\catcode`\@=12\relax}\fi \def\mufl@x{0.83}% -\def\mxversion{T.114} -\def\mxdate{1 Feb 2009} % T.114-rev.4 +\def\mxmajorvernumber{1} +\def\mxminorvernumber{15} +\def\mxvernumber{\mxmajorvernumber\mxminorvernumber}% make it possible to compare with \ifnum +\def\mxversuffix{}% +\edef\mxversion{\mxmajorvernumber.\mxminorvernumber\mxversuffix} +\def\mxdate{3 April 2011} \immediate\write16{MusiXTeX(c) \mxversion\space<\mxdate>}% \everyjob{\immediate\write16{MusiXTeX(c) \mxversion\space<\mxdate>}}% @@ -57,6 +64,10 @@ % marked with +simick for added single lines, -simick for %++simick replaced lines and ++simick...++simick for added blocks +% Hiroaki, May2010, T.115: change register allocation codes into new ones +% which enables >12 elements. Search the string "T115" for details. +% + % TeXperts may want to change the next % PARAMETER DIFFERENT THAN PLAIN @@ -156,9 +167,9 @@ %...\let\@wloG=\wlog %...\def\wlog#1{} -%%% account registers +%%% account registers -\let\maxinstruments\si@ +% \let\maxinstruments\si@ % [T115] here disabled to avoid conflict % temporary registers @@ -183,133 +194,324 @@ \newdimen\y@iv \newdimen\y@v +% [T115] moved out to the new register allocation code -- start from here -- % altitude - -\newskip\k@ii -\newskip\k@iii -\newskip\k@iiii -\newskip\k@iiv -\newskip\k@iv -\newskip\k@ivi - +% \newskip\k@ii % InterNote - -\newdimen\i@ni -\newdimen\i@nii -\newdimen\i@niii -\newdimen\i@niv -\newdimen\i@nv -\newdimen\i@nvi - +% \newdimen\i@ni \def\i@n{\z@} % safety in case of.... - % positions x et z de debut des poutres - -\newdimen\b@xi \newdimen\b@zi -\newdimen\b@xii \newdimen\b@zii -\newdimen\b@xiii\newdimen\b@ziii -\newdimen\b@xiv \newdimen\b@ziv -\newdimen\b@xv \newdimen\b@zv -\newdimen\b@xvi \newdimen\b@zvi - -\newdimen\c@xi \newskip\c@zi -\newdimen\c@xii \newskip\c@zii -\newdimen\c@xiii\newskip\c@ziii -\newdimen\c@xiv \newskip\c@ziv -\newdimen\c@xv \newskip\c@zv -\newdimen\c@xvi \newskip\c@zvi - -\newdimen\d@xi \newskip\d@zi -\newdimen\d@xii \newskip\d@zii -\newdimen\d@xiii\newskip\d@ziii -\newdimen\d@xiv \newskip\d@ziv -\newdimen\d@xv \newskip\d@zv -\newdimen\d@xvi \newskip\d@zvi - -\newdimen\e@xi \newskip\e@zi -\newdimen\e@xii \newskip\e@zii -\newdimen\e@xiii\newskip\e@ziii -\newdimen\e@xiv \newskip\e@ziv -\newdimen\e@xv \newskip\e@zv -\newdimen\e@xvi \newskip\e@zvi - -\newdimen\f@xi \newskip\f@zi -\newdimen\f@xii \newskip\f@zii -\newdimen\f@xiii\newskip\f@ziii -\newdimen\f@xiv \newskip\f@ziv -\newdimen\f@xv \newskip\f@zv -\newdimen\f@xvi \newskip\f@zvi - +% \newdimen\b@xi \newdimen\b@zi +% \newdimen\c@xi \newskip\c@zi +% \newdimen\d@xi \newskip\d@zi +% \newdimen\e@xi \newskip\e@zi +% \newdimen\f@xi \newskip\f@zi % pentes des poutres ( entier de -9 a +9 ) % multiplicite des poutres ( de -5 a +5 . 0= inactive ) - -\newcount\b@pi \newcount\b@ni -\newcount\b@pii \newcount\b@nii -\newcount\b@piii\newcount\b@niii -\newcount\b@piv \newcount\b@niv -\newcount\b@pv \newcount\b@nv -\newcount\b@pvi \newcount\b@nvi - +% \newcount\b@pi \newcount\b@ni % Number of Portees - -\newcount\n@pi \n@pi\@ne -\newcount\n@pii \n@pii\@ne -\newcount\n@piii\n@piii\@ne -\newcount\n@piv \n@piv\@ne -\newcount\n@pv \n@pv\@ne -\newcount\n@pvi \n@pvi\@ne - +% \newcount\n@pi \n@pi\@ne % Actual Signs Old Signs - -\newcount\a@si \newcount\o@si -\newcount\a@sii \newcount\o@sii -\newcount\a@siii\newcount\o@siii -\newcount\a@siv \newcount\o@siv -\newcount\a@sv \newcount\o@sv -\newcount\a@svi \newcount\o@svi - +% \newcount\a@si \newcount\o@si % ActualCleftoks - -\newtoks\a@ci \a@ci={{\z@}{\z@}{\z@}{\z@}} -\newtoks\a@cii \a@cii={{\z@}{\z@}{\z@}{\z@}} -\newtoks\a@ciii\a@ciii={{\z@}{\z@}{\z@}{\z@}} -\newtoks\a@civ \a@civ={{\z@}{\z@}{\z@}{\z@}} -\newtoks\a@cv \a@cv={{\z@}{\z@}{\z@}{\z@}} -\newtoks\a@cvi \a@cvi={{\z@}{\z@}{\z@}{\z@}} - +% \newtoks\a@ci \a@ci={{\z@}{\z@}{\z@}{\z@}} % OldCleftoks - -\newtoks\o@ci -\newtoks\o@cii -\newtoks\o@ciii -\newtoks\o@civ -\newtoks\o@cv -\newtoks\o@cvi - +% \newtoks\o@ci % MeterToks - -\newtoks\m@ti -\newtoks\m@tii -\newtoks\m@tiii -\newtoks\m@tiv -\newtoks\m@tv -\newtoks\m@tvi - +% \newtoks\m@ti % Altitude of choir groups - -\newskip\g@bi -\newskip\g@bii -\newskip\g@biii - +% \newskip\g@bi % Height of choir groups +% \newskip\g@hi -\newskip\g@hi -\newskip\g@hii -\newskip\g@hiii - -\let\maxgroups\thr@@ % maximum three groups of instruments or choirs +% [T115] moved out to the new register allocation code -- until here -- +% \let\maxgroups\thr@@ % maximum three groups of instruments or choirs [T115] moved to later, using \setmaxgroups \newcount\group@no +%%% [T115] new register allocation code -- start from here -- +% +% register allocation for use inside \loop...\if...\repeat +% (only for plain, but no harm even in case of LaTeX) +\edef\noexpand@newcount{\noexpand\newcount}% +\edef\noexpand@newdimen{\noexpand\newdimen}% +\edef\noexpand@newskip{\noexpand\newskip}% +%\edef\noexpand@newmuskip{\noexpand\newmuskip}% not used +%\edef\noexpand@newbox{\noexpand\newbox}% not used +\edef\noexpand@newtoks{\noexpand\newtoks}% +%\edef\noexpand@newmarks{\noexpand\newmarks}% not used +% +% a shortcut for register allocation routines +\def\roman@c@{\romannumeral\count@}% +% +% some registers (i@n, b@x, b@z, c@x, d@x, e@x, s@x, s@Y) +% should be allocated by \newdimen (for id 0...5) and \newskip (for id 6...11) +% because T.114 and earlier did so and for the compatibility to Stanislav +% Kneifl's musixps.tex 0.92a. +% And again \newdimen (for id>11), because both \dimen and \skip are +% applicable but \dimen uses less memory in case of >255 on e-TeX. +\def\noexpand@newdimsk{% + \ifnum\count@<7 \let\@@newdimsk=\noexpand@newdimen + \else\ifnum\count@<13 \let\@@newdimsk=\noexpand@newskip + \else\let\@@newdimsk=\noexpand@newdimen + \fi\fi \@@newdimsk}% +% +% and some other registers (c@z, d@z, e@z, f@z, g@z) +% should be allocated by \newskip (for id 0...11) and \newdimen (for id>11) +% for the same reason of above. +\def\noexpand@newskdim{% + \ifnum\count@<13 \let\@@newskdim=\noexpand@newskip + \else \let\@@newskdim=\noexpand@newdimen + \fi \@@newskdim}% +% +% registers for instrument +\newdimen\interinstrument % moved from "distance between instruments" to here +\def\setmaxinstruments#1{% + \ifnum#1>\@oldmaxinstruments + \chardef\maxinstruments=#1\relax + \ifnum#1>\@c + \errmessage{The maximum reference number of elements is limited to \the\@c} + \chardef\maxinstruments=\@c + \fi + \count@\@oldmaxinstruments\loop + \advance\count@ by\@ne + % + \expandafter \let \csname interinstrument\roman@c@\endcsname \interinstrument + % + % altitude + \expandafter \noexpand@newskip \csname k@i\roman@c@\endcsname + % + % InterNote + \expandafter \noexpand@newdimsk \csname i@n\roman@c@\endcsname + % + % beam horizontal positions: x=start, z=end, 8th-64th beams + \expandafter \noexpand@newdimsk \csname b@x\roman@c@\endcsname + \expandafter \noexpand@newdimsk \csname b@z\roman@c@\endcsname + \expandafter \noexpand@newdimsk \csname c@x\roman@c@\endcsname + \expandafter \noexpand@newskdim \csname c@z\roman@c@\endcsname + \expandafter \noexpand@newdimsk \csname d@x\roman@c@\endcsname + \expandafter \noexpand@newskdim \csname d@z\roman@c@\endcsname + \expandafter \noexpand@newdimsk \csname e@x\roman@c@\endcsname + \expandafter \noexpand@newskdim \csname e@z\roman@c@\endcsname + % + % pentes des poutres ( entier de -9 a +9 ) (slopes of the beams) + % multiplicite des poutres ( de -5 a +5 . 0= inactive ) (multiplicity of the beams) + \expandafter \noexpand@newcount \csname b@p\roman@c@\endcsname + \expandafter \noexpand@newcount \csname b@n\roman@c@\endcsname + % + % Number of Portees + \expandafter \noexpand@newcount \csname n@p\roman@c@\endcsname + \csname n@p\roman@c@\endcsname\@ne + % + % Actual Signs + \expandafter \noexpand@newcount \csname a@s\roman@c@\endcsname + % + % Old Signs + \expandafter \noexpand@newcount \csname o@s\roman@c@\endcsname + % + % ActualCleftoks + \expandafter \noexpand@newtoks \csname a@c\roman@c@\endcsname + \csname a@c\roman@c@\endcsname={{\z@}{\z@}{\z@}{\z@}}% + % + % OldCleftoks + \expandafter \noexpand@newtoks \csname o@c\roman@c@\endcsname + % + % MeterToks + \expandafter \noexpand@newtoks \csname m@t\roman@c@\endcsname + % + % staffsize + \expandafter \let \csname staffspacing\roman@c@\endcsname \@ne + % + % text, lyrics, free positioning of chars + \expandafter \let \csname T@R\roman@c@\endcsname \z@ + % + % preset clef symbols + \expandafter \let \csname treblec@s\roman@c@\endcsname \z@ + \expandafter \let \csname altoc@s\roman@c@\endcsname \z@ + \expandafter \let \csname bassc@s\roman@c@\endcsname \z@ + % + % preset default staff lines as 5 + \expandafter \let \csname n@l\roman@c@\endcsname \fiv@ + % + \ifnum\count@<\maxinstruments\repeat + \expandafter\message\expandafter{maxinstruments=\the\maxinstruments}% + \chardef\@oldmaxinstruments=\maxinstruments\relax% + \normalnotesize\resetlayout + \fi +}% +% +% registers for 128th beam +\def\setmaxcxxviiibeams#1{% + \ifnum#1>\maxinstruments + \errmessage{The number of 128th beam must not exceed maxinstruments}% + \else + \ifnum#1>\@oldmaxcxxviiibeams + \chardef\maxcxxviiibeams=#1\relax + \ifnum#1>\@c + \errmessage{The maximum reference number of elements is limited to \the\@c} + \chardef\maxcxxviiibeams=\@c + \fi + \count@\@oldmaxcxxviiibeams \loop + \advance\count@ by\@ne + \expandafter \noexpand@newdimen \csname f@x\roman@c@\endcsname + \expandafter \noexpand@newskdim \csname f@z\roman@c@\endcsname + \ifnum\count@<\maxcxxviiibeams\repeat + \expandafter\message\expandafter{max128beams=\the\maxcxxviiibeams}% + \chardef\@oldmaxcxxviiibeams=\maxcxxviiibeams\relax% + \fi + \fi +}% +% +% registers for 256th beam +\def\setmaxcclvibeams#1{% + \ifnum#1>\maxcxxviiibeams + \errmessage{The number of 256th beam must not exceed the number of 128th beam}% + \else + \ifnum#1>\@oldmaxcclvibeams + \chardef\maxcclvibeams=#1\relax + \ifnum#1>\@c + \errmessage{The maximum reference number of elements is limited to \the\@c} + \chardef\maxcclvibeams=\@c + \fi + \count@\@oldmaxcclvibeams \loop + \advance\count@ by\@ne + \expandafter \noexpand@newdimen \csname g@x\roman@c@\endcsname + \expandafter \noexpand@newskdim \csname g@z\roman@c@\endcsname + \ifnum\count@<\maxcclvibeams\repeat + \expandafter\message\expandafter{max256beams=\the\maxcclvibeams}% + \chardef\@oldmaxcclvibeams=\maxcclvibeams\relax% + \fi + \fi +}% +% +% registers for choir group +\def\setmaxgroups#1{% + \ifnum#1>\@oldmaxgroups + \chardef\maxgroups=#1\relax + \ifnum#1>\@c + \errmessage{The maximum reference number of elements is limited to \the\@c} + \chardef\maxgroups=\@c + \fi + \count@\@oldmaxgroups \loop + \advance\count@ by\@ne + % Altitude + \expandafter \noexpand@newskip \csname g@b\roman@c@\endcsname + % Height + \expandafter \noexpand@newskip \csname g@h\roman@c@\endcsname + % + \expandafter \let \csname lowersonginstrum\roman@c@\endcsname \maxdimen + \expandafter \let \csname uppersonginstrum\roman@c@\endcsname \z@ + \ifnum\count@<\maxgroups\repeat + \expandafter\message\expandafter{maxgroups=\the\maxgroups}% + \chardef\@oldmaxgroups=\maxgroups\relax% + \fi +}% +% +% registers for slur +\def\setmaxslurs#1{% + \ifnum#1>\@oldmaxslurs + \chardef\maxslurs=#1\relax + \ifnum#1>\@c + \errmessage{The maximum reference number of elements is limited to \the\@c} + \chardef\maxslurs=\@c + \fi + \count@\@oldmaxslurs \loop + \advance\count@ by\@ne + % + % horizontal start position of slur + \expandafter \noexpand@newdimsk \csname s@x\roman@c@\endcsname + % + % sense u,d and x (flag) for pending slurs + \expandafter \noexpand@newtoks \csname s@s\roman@c@\endcsname + \csname s@s\roman@c@\endcsname={x}% + % + % vertical offset of slur + \expandafter \noexpand@newdimsk \csname s@Y\roman@c@\endcsname + % + % altportee of slur + \expandafter \noexpand@newskip \csname s@a\roman@c@\endcsname + % + % vertical start position of slur [steps of internote] + \expandafter \noexpand@newcount \csname s@y\roman@c@\endcsname + % + % instrument number of that slur (to retrieve internote) + \expandafter \noexpand@newcount \csname s@N\roman@c@\endcsname + % + % vertical end position of slur [steps of internote], used from + % \breakslur. the value \maxdimen is used to decide, if + % \breakslur is used or not (flag) + \expandafter \noexpand@newcount \csname s@z\roman@c@\endcsname + \csname s@z\roman@c@\endcsname\maxdimen + % + %++ickd: dotted indicator for pending slurs + \expandafter \noexpand@newtoks \csname s@d\roman@c@\endcsname + % + \ifnum\count@<\maxslurs\repeat + \expandafter\message\expandafter{maxslurs=\the\maxslurs}% + \chardef\@oldmaxslurs=\maxslurs\relax% + \fi +}% +% +% registers for trill (MusiXTeX-type trill only. Legacy \trillC and +% \TrillC are out of the scope.) +\def\setmaxtrills#1{% + \ifnum#1>\@oldmaxtrills + \chardef\maxtrills=#1\relax + \ifnum#1>\@c + \errmessage{The maximum reference number of elements is limited to \the\@c} + \chardef\maxtrills=\@c + \fi + \count@\@oldmaxtrills \loop + \advance\count@ by\@ne + % starting horizontal pos + \expandafter \noexpand@newskip \csname tr@x\roman@c@\endcsname + \csname tr@x\roman@c@\endcsname\maxdimen\relax + % heading of trill + \expandafter \noexpand@newtoks \csname tr@sw\roman@c@\endcsname + % height of trill + \expandafter \noexpand@newskip \csname tr@y\roman@c@\endcsname + \ifnum\count@<\maxtrills\repeat + \expandafter\message\expandafter{maxtrills=\the\maxtrills}% + \chardef\@oldmaxtrills=\maxtrills\relax% + \fi +}% +% +% registers for octave line +\def\setmaxoctlines#1{% + \ifnum#1>\@oldmaxoctlines + \chardef\maxoctlines=#1\relax + \ifnum#1>\@c + \errmessage{The maximum reference number of elements is limited to \the\@c} + \chardef\maxoctlines=\@c + \fi + \count@\@oldmaxoctlines \loop + \advance\count@ by\@ne + % starting horizontal pos + \expandafter \noexpand@newskip \csname o@x\roman@c@\endcsname + \csname o@x\roman@c@\endcsname\maxdimen\relax + % height of octline + \expandafter \noexpand@newskip \csname o@y\roman@c@\endcsname + % sense of octline + \expandafter \noexpand@newtoks \csname o@sw\roman@c@\endcsname + \ifnum\count@<\maxoctlines\repeat + \expandafter\message\expandafter{maxoctlines=\the\maxoctlines}% + \chardef\@oldmaxoctlines=\maxoctlines\relax% + \fi +}% +% +\chardef\@oldmaxinstruments=\z@ +\chardef\@oldmaxcxxviiibeams=\z@ +\chardef\@oldmaxcclvibeams=\z@ +\chardef\@oldmaxgroups=\z@ +\chardef\@oldmaxslurs=\z@ +\chardef\@oldmaxtrills=\z@ +\chardef\@oldmaxoctlines=\z@ +% +% actual setup (=register allocation) of the maximum element numbers +% should be done after fonts definition. +% +%%% [T115] new register allocation code -- until here -- + + %%% fonts %% @@ -673,86 +875,42 @@ \newcount\N@s +% [T115] moved out to the new register allocation code (except for \s@Y) % horizontal start position of slur - -\newdimen\s@xi -\newdimen\s@xii -\newdimen\s@xiii -\newdimen\s@xiv -\newdimen\s@xv -\newdimen\s@xvi - +% \newdimen\s@xi % sense u,d and x (flag) for pending slurs - -\newtoks\s@si \s@si={x} -\newtoks\s@sii \s@sii={x} -\newtoks\s@siii\s@siii={x} -\newtoks\s@siv \s@siv={x} -\newtoks\s@sv \s@sv={x} -\newtoks\s@svi \s@svi={x} - +% \newtoks\s@si \s@si={x} % vertical offset of slur - -\newdimen\s@Y -\newdimen\s@Yi -\newdimen\s@Yii -\newdimen\s@Yiii -\newdimen\s@Yiv -\newdimen\s@Yv -\newdimen\s@Yvi - +\newdimen\s@Y % this register is for common use +% \newdimen\s@Yi % altportee of slur - -\newskip\s@ai -\newskip\s@aii -\newskip\s@aiii -\newskip\s@aiv -\newskip\s@av -\newskip\s@avi - +% \newskip\s@ai % vertical start position of slur [steps of internote] - -\newcount\s@yi -\newcount\s@yii -\newcount\s@yiii -\newcount\s@yiv -\newcount\s@yv -\newcount\s@yvi - - +% \newcount\s@yi % instrument number of that slur (to retrieve internote) - -\newcount\s@Ni -\newcount\s@Nii -\newcount\s@Niii -\newcount\s@Niv -\newcount\s@Nv -\newcount\s@Nvi - +% \newcount\s@Ni % vertical end position of slur [steps of internote], used from \breakslur % the value \maxdimen is used to decide, if \breakslur is used or not (flag) - -\newcount\s@zi \s@zi\maxdimen -\newcount\s@zii \s@zii\maxdimen -\newcount\s@ziii\s@ziii\maxdimen -\newcount\s@ziv \s@ziv\maxdimen -\newcount\s@zv \s@zv\maxdimen -\newcount\s@zvi \s@zvi\maxdimen - +% \newcount\s@zi \s@zi\maxdimen %++ickd: dotted indicator for pending slurs - -\newtoks\s@di -\newtoks\s@dii -\newtoks\s@diii -\newtoks\s@div -\newtoks\s@dv -\newtoks\s@dvi +% \newtoks\s@di % moved out to the new register allocation code %++ickd \def\roman@n@i{\romannumeral\n@i\endcsname} +% +% [T115] make slurs independent from \maxinstruments +\def\test@slurnum{% + \ifnum\n@i<\z@ \n@i\@c \fi + \ifnum\n@i<\maxslurs \else + \count@\maxslurs \advance\count@\m@ne + \errmessage{Wrong slur reference number \the\n@i! (valid: 0 to \the\count@)}% [T115] + \n@i\z@% [T115] + \fi + \advance\n@i\@ne}% +% \def\s@l@ctslur#1\relax{% - \n@i#1\relax\test@num + \n@i#1\relax\test@slurnum% [T115] make it independent from beams \edef\s@a{\csname s@a\roman@n@i}% dimen (altportee) \edef\s@x{\csname s@x\roman@n@i}% dimen (hor start pos) \edef\s@y{\csname s@y\roman@n@i}% count (startnote [internote]) @@ -1548,12 +1706,8 @@ \def\setsize#1#2{\n@v#1\relax % select instrument \expandafter\edef\csname staffspacing\romannumeral\n@v\endcsname{#2}} -\let\staffspacingi\@ne -\let\staffspacingii\@ne -\let\staffspacingiii\@ne -\let\staffspacingiv\@ne -\let\staffspacingv\@ne -\let\staffspacingvi\@ne +% [T115] moved out to the new register allocation code +% \let\staffspacingi\@ne % number of staffs @@ -1572,6 +1726,9 @@ \def\interstaff#1{\def\interfacteur{#1}} \def\s@l@ctinstr{% + \ifnum\noinstrum@nt>\maxinstruments % [T115] -- from here -- + \errmessage{Wrong instrument reference number \the\noinstrum@nt, maxinstruments=\the\maxinstruments} + \fi % [T115] -- until here -- \edef\altitude{\csname k@i\romannumeral\noinstrum@nt\endcsname}% \edef\st@ffs{\csname n@p\romannumeral\noinstrum@nt\endcsname}% \edef\nblines{\csname n@l\romannumeral\noinstrum@nt\endcsname}% @@ -1612,12 +1769,9 @@ \def\songbottom{\groupbottom1} \def\songtop{\grouptop1} -\let\lowersonginstrumi\maxdimen -\let\lowersonginstrumii\maxdimen -\let\lowersonginstrumiii\maxdimen -\let\uppersonginstrumi\z@ -\let\uppersonginstrumii\z@ -\let\uppersonginstrumiii\z@ +% [T115] moved out to the new register allocation code +% \let\lowersonginstrumi\maxdimen +% \let\uppersonginstrumi\z@ \def\g@loop{\group@no\z@ \loop\ifnum\group@no<\maxgroups \s@l@ctgroup} @@ -1631,7 +1785,10 @@ \def\test@grnum{% \ifnum\group@no<\z@ \group@no\@c \fi \ifnum\group@no<\maxgroups \else - \errmessage{Wrong group number=\the\group@no! max=\the\maxgroups}\group@no\z@ \fi + \count@\maxgroups \advance\count@\m@ne + \errmessage{Wrong group reference number \the\group@no! (valid: 0 to \the\count@)}% [T115] + \group@no\z@% [T115] + \fi \advance\group@no\@ne} % \nobarmessages prevents bar messages @@ -1673,14 +1830,10 @@ %%% distance between instruments (added to \interportee) -\newdimen\interinstrument - -\let\interinstrumenti\interinstrument -\let\interinstrumentii\interinstrument -\let\interinstrumentiii\interinstrument -\let\interinstrumentiv\interinstrument -\let\interinstrumentv\interinstrument -\let\interinstrumentvi\interinstrument +% [T115] moved out to the above of the new register allocation code +% \newdimen\interinstrument +% [T115] moved out to the new register allocation code +% \let\interinstrumenti\interinstrument \def\setinterinstrument#1#2{\n@v#1\relax % select instrument \expandafter\def\csname interinstrument\romannumeral\n@v\endcsname{#2}} @@ -1896,7 +2049,7 @@ \repeat % cutslur \ifnum\N@s>\z@% % any pending slurs ? - \n@viii\maxinstruments % test all possible numbers + \n@viii\maxslurs % test all possible slur numbers [T115] (Hiroaki) \advance\n@viii\m@ne \loop\ifnum\n@viii>\m@ne \s@l@ctslur\n@viii\relax @@ -2544,6 +2697,14 @@ \def\treblelowoct{\trebleclef\raise -7\internote\hbox\@to\z@{\smalltype\it\kern -2.3\Interligne 8\hss}} \def\basslowoct{\bassclef\raise -6\internote\hbox\@to\z@{\smalltype\it\kern -2.5\Interligne 8\hss}} +% [T115] reqest from Hermann Hinsch +\def\smalltrebleoct{\smalltrebleclef\raise 7.2\internote\hbox\@to\z@{\smalltype\it\kern -1.8\Interligne 8\hss}} +\def\smalltreblelowoct{\smalltrebleclef\raise-6.8\internote\hbox\@to\z@{\smalltype\it\kern -2.1\Interligne 8\hss}} +\def\smallbassoct{\smallbassclef\raise 2\internote\hbox\@to\z@{\smalltype\it\kern -2.0\Interligne 8\hss}} +\def\smallbasslowoct{\smallbassclef\raise-6.2\internote\hbox\@to\z@{\smalltype\it\kern -2.2\Interligne 8\hss}} +% [T115] reqest from Hermann Hinsch: end + + \newskip\clef@skip \def\changeclefs{\t@rmskip\writ@newclefs} @@ -2664,7 +2825,7 @@ \def\setname#1#2{\n@v#1\relax % select instrument % \let\Writ@names\writ@names - \expandafter\edef\csname instrument\romannumeral\n@v\endcsname{#2}} + \expandafter\def\csname instrument\romannumeral\n@v\endcsname{#2}}% [T115] changed from \edef to \def (Hiroaki) \def\writ@names{\n@loop \setbox\toks@box\null\relax @@ -3301,14 +3462,17 @@ % \b@p slope (-9) - (9) % \b@n number of pending beamlines (-4) - (4) -\def\test@num{% +\def\test@beamnum{% [T115] new macro to make it independent from slur \ifnum\n@i<\z@ \n@i\@c \fi \ifnum\n@i<\maxinstruments \else - \n@i\z@ \errmessage{Wrong slur or beam number!}\fi - \advance\n@i\@ne} + \count@\maxinstruments \advance\count@\m@ne + \errmessage{Wrong beam reference number \the\n@i! (valid: 0 to \the\count@)} + \n@i\z@ + \fi + \advance\n@i\@ne}% \def\s@l@ctbeam#1\relax{% - \n@i#1\relax\test@num + \n@i#1\relax\test@beamnum % [T115] make it independent from slur \edef\b@x{\csname b@x\romannumeral\n@i\endcsname}% \edef\b@z{\csname b@z\romannumeral\n@i\endcsname}% \edef\b@n{\csname b@n\romannumeral\n@i\endcsname}% @@ -3750,7 +3914,7 @@ % \n@ii positive signature limit, \n@ii-8 negative signature limit \advance\n@ii-\a@s \advance\n@ii\si@ \divide\n@ii\s@v@n \@Tii - \fi \advance\n@v\@l \advance\n@v\n@vi \@Ti + \fi \advance\n@v\@l \advance\n@v\n@vi \expandafter\@Ti % [T115] (Hiroaki) \fi} \def\@nod{Can't double } @@ -3933,7 +4097,10 @@ \let\Trille\TrilleX \def\C@trille#1#2{\zcharnote{#1}{\y@v#2\noteskip \trill@}} -\let\maxtrilles\si@ +\let\maxtrilles\si@ +% \maxtrilles and \@itrille[i] are only for obsolete Legacy \trillC +% and \TrillC; not related with new register allocation code. Leave +% it as-is. [T115] \newskip\@itrillei \newskip\@itrilleii @@ -3973,28 +4140,12 @@ %%%%%% -\let\maxtrills\si@ - -\newskip\tr@xi \tr@xi\maxdimen\relax % starting horizontal pos -\newskip\tr@xii \tr@xii\maxdimen\relax % starting horizontal pos -\newskip\tr@xiii \tr@xiii\maxdimen\relax % starting horizontal pos -\newskip\tr@xiv \tr@xiv\maxdimen\relax % starting horizontal pos -\newskip\tr@xv \tr@xv\maxdimen\relax % starting horizontal pos -\newskip\tr@xvi \tr@xvi\maxdimen\relax % starting horizontal pos - -\newtoks\tr@swi % heading of trill -\newtoks\tr@swii % heading of trill -\newtoks\tr@swiii % heading of trill -\newtoks\tr@swiv % heading of trill -\newtoks\tr@swv % heading of trill -\newtoks\tr@swvi % heading of trill - -\newskip\tr@yi % height of trill -\newskip\tr@yii % height of trill -\newskip\tr@yiii % height of trill -\newskip\tr@yiv % height of trill -\newskip\tr@yv % height of trill -\newskip\tr@yvi % height of trill +% \let\maxtrills\si@ % here disabled to avoid conflict with new register allocation code +% [T115] moved out to the new register allocation code +% \newskip\tr@xi \tr@xi\maxdimen\relax % starting horizontal pos +% \newtoks\tr@swi % heading of trill +% \newskip\tr@yi % height of trill + \newcount\tr@number \def\tr@loop{\tr@number\z@ \loop\ifnum\tr@number<\maxtrills @@ -4004,7 +4155,10 @@ \def\s@l@cttrill#1\relax{% \n@i#1\relax \ifnum\n@i<\z@ \n@i\@c \fi \ifnum\n@i<\maxtrills \else - \n@i\z@ \errmessage{Wrong trill number!}\fi + \count@\maxtrills \advance\count@\m@ne + \errmessage{Wrong trill reference number \the\n@i! (valid: 0 to \the\count@)}% [T115] + \n@i\z@ % [T115] + \fi \advance\n@i\@ne \xdef\tr@x{\csname tr@x\roman@n@i}% \xdef\tr@y{\csname tr@y\roman@n@i}% @@ -4072,29 +4226,12 @@ %%%%%% -\let\maxoctlines\si@ - -\newskip\o@xi \o@xi\maxdimen\relax % starting horizontal pos -\newskip\o@xii \o@xii\maxdimen\relax % starting horizontal pos -\newskip\o@xiii \o@xiii\maxdimen\relax % starting horizontal pos -\newskip\o@xiv \o@xiv\maxdimen\relax % starting horizontal pos -\newskip\o@xv \o@xv\maxdimen\relax % starting horizontal pos -\newskip\o@xvi \o@xvi\maxdimen\relax % starting horizontal pos - -\newskip\o@yi % height of octline -\newskip\o@yii % height of octline -\newskip\o@yiii % height of octline -\newskip\o@yiv % height of octline -\newskip\o@yv % height of octline -\newskip\o@yvi % height of octline - +% \let\maxoctlines\si@ % here disabled to avoid conflict with new register allocation code, except for \o@swz +% [T115] moved out to the new register allocation code +% \newskip\o@xi \o@xi\maxdimen\relax % starting horizontal pos +% \newskip\o@yi % height of octline \newtoks\o@swz % sense of octline for \octfin[up][down] without number -\newtoks\o@swi % sense of octline -\newtoks\o@swii % sense of octline -\newtoks\o@swiii % sense of octline -\newtoks\o@swiv % sense of octline -\newtoks\o@swv % sense of octline -\newtoks\o@swvi % sense of octline +% \newtoks\o@swz % sense of octline for \octfin[up][down] without number \newcount\o@number @@ -4105,7 +4242,10 @@ \def\s@l@ctoctline#1\relax{% \n@i#1\relax \ifnum\n@i<\z@ \n@i\@c \fi \ifnum\n@i<\maxoctlines \else - \n@i\z@ \errmessage{Wrong octaviation line number!}\fi + \count@\maxoctlines \advance\count@\m@ne + \errmessage{Wrong octaviation line reference number \the\n@i! (valid: 0 to \the\count@)}% [T115] + \n@i\z@% [T115] + \fi \advance\n@i\@ne \xdef\o@x{\csname o@x\roman@n@i}% \xdef\o@y{\csname o@y\roman@n@i}% @@ -4341,12 +4481,8 @@ \def\setsongraise#1#2{\n@v#1\relax % select instrument \expandafter\def\csname T@R\romannumeral\n@v\endcsname{#2}} -\let\T@Ri\z@ -\let\T@Rii\z@ -\let\T@Riii\z@ -\let\T@Riv\z@ -\let\T@Rv\z@ -\let\T@Rvi\z@ +% [T115] moved out to the new register allocation code +% \let\T@Ri\z@ \def\qlrlap#1{\rlap{\hbox to \qn@width{\hss#1\hss}}} \def\zsong{\let\@Ti\rlap \C@t} @@ -4439,30 +4575,43 @@ \def\downtrio{\n@vi\@ne \let\@text\@ne \unbkt} %%% standard settings - +% [115] make them compatible to >12 instruments \def\resetlayout{\let\interfacteur\nin@ \stafftopmarg\thr@@\Interligne \staffbotmarg\thr@@\Interligne - \let\n@li\fiv@ \let\n@lii\fiv@ \let\n@liii\fiv@ - \let\n@liv\fiv@ \let\n@lv\fiv@ \let\n@lvi\fiv@ - \noinstrum@nt1\s@l@ctinstr\internote\Internote + \count@\z@ \loop + \advance\count@ by\@ne + \expandafter \let\csname n@l\roman@c@\endcsname \fiv@ + \ifnum\count@<\maxinstruments\repeat \resetclefsymbols} \def\resetclefsymbols{% - \let\bassc@si\z@ \let\bassc@sii\z@ \let\bassc@siii\z@ - \let\bassc@siv\z@ \let\bassc@sv\z@ \let\bassc@svi\z@ - \let\altoc@si\z@ \let\altoc@sii\z@ \let\altoc@siii\z@ - \let\altoc@siv\z@ \let\altoc@sv\z@ \let\altoc@svi\z@ - \let\treblec@si\z@ \let\treblec@sii\z@ \let\treblec@siii\z@ - \let\treblec@siv\z@ \let\treblec@sv\z@ \let\treblec@svi\z@ + \count@\z@ \loop + \advance\count@ by\@ne + \expandafter \let\csname treblec@s\roman@c@\endcsname \z@ + \expandafter \let\csname altoc@s\roman@c@\endcsname \z@ + \expandafter \let\csname bassc@s\roman@c@\endcsname \z@ + \ifnum\count@<\maxinstruments\repeat } -\resetlayout -\let\nbinstruments\maxinstruments -\normalnotesize +% [T115] setup the default maximum element numbers to the same values of T.114 +\setmaxinstruments\si@ +\setmaxcxxviiibeams\si@ % 128th beam +\setmaxcclvibeams\z@ % 256th beam +\setmaxgroups\thr@@ % groups of inst's or choirs +\setmaxslurs\maxinstruments +\setmaxtrills\maxinstruments +\setmaxoctlines\maxinstruments +% + +% [T115] new register allocation code requires some changes +%\resetlayout % no need +%\let\nbinstruments\maxinstruments % no need +%\normalnotesize % already executed in \setmaxinstruments \normalmusicsize -\normalnotesize% needs rerun to initialize \metron stem length (a very historical bug since T.103 or earlier) (T.114, Hiroaki) -\resetlayout +\normalnotesize % important: execute it again after the first execute of \normalmusicsize --- to initialize \metron stem length. but why? +%\resetlayout % no need \def\nbinstruments{1} +\noinstrum@nt1\s@l@ctinstr\internote\Internote %%% % @@ -4724,4 +4873,3 @@ \catcode`\@=\catcodeat \endinput - |