diff options
author | Karl Berry <karl@freefriends.org> | 2015-06-16 22:39:24 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2015-06-16 22:39:24 +0000 |
commit | c503311d0761d89aad2df2f14cec502d09aff82f (patch) | |
tree | e96782b037ad5b008bde0a36eaa8279802ac7911 /Master/texmf-dist/tex/generic/musixtex | |
parent | d8d7232f205cac9d8cda4988626b8b727ffda1e1 (diff) |
musixtex (30may15)
git-svn-id: svn://tug.org/texlive/trunk@37576 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic/musixtex')
-rw-r--r-- | Master/texmf-dist/tex/generic/musixtex/musixhv.tex | 16 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/musixtex/musixplt.tex | 16 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/musixtex/musixppff.tex | 24 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/musixtex/musixtex.tex | 159 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/musixtex/musixtmr.tex | 16 |
5 files changed, 140 insertions, 91 deletions
diff --git a/Master/texmf-dist/tex/generic/musixtex/musixhv.tex b/Master/texmf-dist/tex/generic/musixtex/musixhv.tex index 4e64d67951c..aea62833bb7 100644 --- a/Master/texmf-dist/tex/generic/musixtex/musixhv.tex +++ b/Master/texmf-dist/tex/generic/musixtex/musixhv.tex @@ -23,7 +23,7 @@ % % Copyright 2015 Bob Tennent rdt@cs.queensu.ca % -\immediate\write16{MusiXhv\space<2015/02/24>} +\immediate\write16{MusiXhv\space<2015/05/04>} % % 7pt "Roman" (sans serif), bold, "italic" (oblique), "bold-italic" (bold-oblique), and small-cap \font\sevenrm=phvr8r at 7pt @@ -113,14 +113,16 @@ \let\BIGfont=\twfvrm % % +\font\ppfftwelve=phvbo8r at 8pt \font\ppffsixteen=phvbo8r at 10pt \font\ppfftwenty=phvbo8r at 12pt \font\ppfftwentyfour=phvbo8r at 14pt \font\ppfftwentynine=phvbo8r at 17pt -\font\tinyppff=phvbo8r at 8pt -\font\smallppff=phvbo8r at 10pt -\font\normppff=phvbo8r at 12pt -\font\medppff=phvbo8r at 14pt +% +\def\tinydyn{\let\ppff\tinyppff} +\def\smalldyn{let\ppff\smallppff} +\def\normdyn{\let\ppff\normppff} +\def\meddyn{\let\ppff\medppff} % \def\f{{\ppff f}} \def\ff{{\ppff ff}} @@ -135,10 +137,6 @@ \edef\catcodeat{\the\catcode`\@}\catcode`\@=11 % -\def\smalldyn{\let\ppff\smallppff \let\p@@f\ppff}% -\def\normdyn{\let\ppff\normppff \let\p@@f\ppff}% -\def\meddyn{\let\ppff\medppff \let\p@@f\ppff}% -% \def\sF{{\ppff s\p@kern f}} \def\sfz{{\ppff s\p@kern f\f@kern z}} \def\sfzp{{\ppff s\p@kern f\f@kern z\p@kern p}} diff --git a/Master/texmf-dist/tex/generic/musixtex/musixplt.tex b/Master/texmf-dist/tex/generic/musixtex/musixplt.tex index 89e77db5a2d..e56f88833bf 100644 --- a/Master/texmf-dist/tex/generic/musixtex/musixplt.tex +++ b/Master/texmf-dist/tex/generic/musixtex/musixplt.tex @@ -23,7 +23,7 @@ % % Copyright 2015 Bob Tennent rdt@cs.queensu.ca % -\immediate\write16{MusiXplt\space<2015/02/23>} +\immediate\write16{MusiXplt\space<2015/05/04>} % % 7pt roman, bold, italic, bold italic, slanted and small-cap \font\sevenrm=pplr8r at 7pt @@ -114,15 +114,17 @@ \let\BIGfont=\twfvsc % % +\font\ppfftwelve=pplbi8r at 8pt \font\ppffsixteen=pplbi8r at 10pt \font\ppfftwenty=pplbi8r at 12pt \font\ppfftwentyfour=pplbi8r at 14pt \font\ppfftwentynine=pplbi8r at 17pt -\font\tinyppff=pplbi8r at 8pt -\font\smallppff=pplbi8r at 10pt -\font\normppff=pplbi8r at 12pt -\font\medppff=pplbi8r at 14pt % +\def\tinydyn{\let\ppff\tinyppff} +\def\smalldyn{let\ppff\smallppff} +\def\normdyn{\let\ppff\normppff} +\def\meddyn{\let\ppff\medppff} + \def\f{{\ppff f}} \def\ff{{\ppff ff}} \def\fp{{\ppff fp}} @@ -136,10 +138,6 @@ \edef\catcodeat{\the\catcode`\@}\catcode`\@=11 % -\def\smalldyn{\let\ppff\smallppff \let\p@@f\ppff}% -\def\normdyn{\let\ppff\normppff \let\p@@f\ppff}% -\def\meddyn{\let\ppff\medppff \let\p@@f\ppff}% -% \def\sF{{\ppff s\p@kern f}} \def\sfz{{\ppff s\p@kern f\f@kern z}} \def\sfzp{{\ppff s\p@kern f\f@kern z\p@kern p}} diff --git a/Master/texmf-dist/tex/generic/musixtex/musixppff.tex b/Master/texmf-dist/tex/generic/musixtex/musixppff.tex index bfdf8ae638b..e547fea6e6f 100644 --- a/Master/texmf-dist/tex/generic/musixtex/musixppff.tex +++ b/Master/texmf-dist/tex/generic/musixtex/musixppff.tex @@ -12,18 +12,25 @@ %% ... %% %% -\immediate\write16{MusiXppff \noexpand\ppff font replacement <2015/02/23>}% +\immediate\write16{MusiXppff \noexpand\ppff font replacement <2015/05/04>}% \font\xppffsixteen=xppff10 \font\xppfftwenty=xppff10 scaled \magstep1 \font\xppfftwentyfour=xppff10 scaled \magstep2 \font\xppfftwentynine=xppff10 scaled \magstep3 +\font\tinyxppff=xppff10 at 8pt \font\smallxppff=xppff10 \font\normxppff=xppff10 scaled \magstep1 \font\medxppff=xppff10 scaled \magstep2 \edef\catcodeat{\the\catcode`\@}\catcode`\@=11 +\def\xppff{% +\ifdim\internote<\p@seven6\Internote \tinyxppff +\else\ifdim\internote<.95\Internote \smallxppff +\else\ifdim\internote<1.19\Internote \normxppff +\else\medxppff\fi\fi\fi} + \def\f{{\xppff f}}% \def\ff{{\xppff ff}}% \def\fp{{\xppff fp}}% @@ -57,8 +64,6 @@ \let\meternorfont\tenbf \let\metersmallfont\eightbf % T116 RDT \let\meterbigfont\twelvebf \let\meterlargefont\frtbf \let\meterLargefont\svtbf - \let\ppff\ppffsixteen - \let\xppff\xppffsixteen \else\ifnum\musicsize=\@xxiv \let\musicLargefont\musictwentynine \let\musiclargefont\musictwentynine @@ -75,8 +80,6 @@ \let\meternorfont\frtbf \let\metersmallfont\twelvebf % T116 RDT \let\meterbigfont\svtbf \let\meterlargefont\twtybf \let\meterlargefont\twfvbf - \let\ppff\ppfftwentyfour - \let\xppff\xppfftwentyfour \else\ifnum\musicsize=\@xxix \let\musicLargefont\musictwentynine \let\musiclargefont\musictwentynine @@ -95,8 +98,6 @@ \let\meternorfont\svtbf \let\metersmallfont\frtbf % T116 RDT \let\meterbigfont\twtybf \let\meterlargefont\twfvbf \let\meterLargefont\twfvbf - \let\ppff\ppfftwentynine - \let\xppff\xppfftwentynine \else \ifnum\musicsize=\tw@nty \else\ifnum\musicsize=\z@ @@ -119,14 +120,13 @@ \let\meternorfont\twelvebf \let\metersmallfont\tenbf % T116 RDT \let\meterbigfont\frtbf \let\meterlargefont\svtbf \let\meterLargefont\twtybf - \let\ppff\ppfftwenty - \let\xppff\xppfftwenty \fi\fi\fi }% % -\def\smalldyn{\let\ppff\smallppff\let\xppff\smallxppff\let\p@@f\ppff}% -\def\normdyn{\let\ppff\normppff\let\xppff\normxppff\let\p@@f\ppff}% -\def\meddyn{\let\ppff\medppff\let\xppff\medxppff\let\p@@f\ppff}% +\def\tinydyn{\let\ppff\tinyppff\let\xppff\tinyxppff}% +\def\smalldyn{\let\ppff\smallppff\let\xppff\smallxppff}% +\def\normdyn{\let\ppff\normppff\let\xppff\normxppff}% +\def\meddyn{\let\ppff\medppff\let\xppff\medxppff}% \catcode`\@=\catcodeat diff --git a/Master/texmf-dist/tex/generic/musixtex/musixtex.tex b/Master/texmf-dist/tex/generic/musixtex/musixtex.tex index fedf981ab04..c6e5135a7db 100644 --- a/Master/texmf-dist/tex/generic/musixtex/musixtex.tex +++ b/Master/texmf-dist/tex/generic/musixtex/musixtex.tex @@ -25,15 +25,26 @@ \def\mufl@x{0.83}% \def\mxmajorvernumber{1} -\def\mxminorvernumber{16} +\def\mxminorvernumber{17} \def\mxvernumber{\mxmajorvernumber\mxminorvernumber}% make it possible to compare with \ifnum \def\mxversuffix{}% \edef\mxversion{\mxmajorvernumber.\mxminorvernumber\mxversuffix} -\def\mxdate{2015-04-21} +\def\mxdate{2015-05-25} \immediate\write16{MusiXTeX(c) \mxversion\space<\mxdate>}% \everyjob{\immediate\write16{MusiXTeX(c) \mxversion\space<\mxdate>}}% +% T117: + +% RDT re-defined \txtfont for non-normal staff sizes +% RDT defined \tinyppff and \ppfftwelve, and re-defined \ppff to be staffsize dependent +% RDT introduced \tqqb \tqqh \tqqqb \tqqqh abbreviations +% and synonyms \tqql \tqqu \tqqql \tqqqu +% RDT introduced ornaments \tr, \trt +% RDT re-defined \triolet to be consistent with musixdoc (prints \txt, not nec. 3) +% RDT introduced \cpause etc. and corrected definitions of \centerpause etc. +% RDT introduced double-dotted rests \qppp, \dspp, \qspp, etc. + % T116: % RDT corrected the definitions of \nnotes and \nnnotes @@ -537,109 +548,109 @@ % Seven point fonts: roman, bold, and italic. %% -\ifx\undefined\sevenrm +%\ifx\undefined\sevenrm % T117 RDT unconditional font definitions \font\sevenrm=cmr7 \font\sevenbf=cmbx7 \font\sevenit=cmti7 -\fi +%\fi %% % Eight point fonts: roman, bold, and italic; tt and sl needed for musixsty %% -\ifx\undefined\eightrm +%\ifx\undefined\eightrm \font\eightrm=cmr8 \font\eightbf=cmbx8 \font\eightit=cmti8 \font\eighttt=cmtt8 \font\eightsl=cmsl8 -\fi +%\fi %% % Nine point fonts %% -\ifx\undefined\ninerm +%\ifx\undefined\ninerm \font\ninerm=cmr9 \font\ninebf=cmbx9 \font\nineit=cmti9 \font\ninett=cmtt9 \font\ninesl=cmsl9 -\fi +%\fi %% % Ten point fonts %% -\ifx\undefined\tenrm +%\ifx\undefined\tenrm \font\tenrm=cmr10 \font\tenbf=cmbx10 \font\tenit=cmti10 \font\tentt=cmtt10 \font\tensl=cmsl10 -\fi +%\fi %% % Eleven point fonts %% -\ifx\undefined\elevenrm +%\ifx\undefined\elevenrm \font\elevenrm=cmr9 scaled \magstephalf \font\elevenbf=cmbx9 scaled \magstephalf \font\elevenit=cmti9 scaled \magstephalf \font\eleventt=cmtt9 scaled \magstephalf \font\elevensl=cmsl9 scaled \magstephalf -\fi +%\fi %% % Twelve point fonts %% -\ifx\undefined\twelverm +%\ifx\undefined\twelverm \font\twelverm=cmr12 \font\twelvebf=cmbx12 \font\twelveit=cmti12 \font\twelvett=cmtt12 \font\twelvesl=cmsl12 -\fi +%\fi % 14pt: roman, bold, italic and small caps; tt and sl needed for musixsty -\ifx\undefined\frtrm +%\ifx\undefined\frtrm \font\frtrm=cmr12 scaled \magstep1 \font\frtbf=cmbx12 scaled \magstep1 \font\frtit=cmti12 scaled \magstep1 \font\frtsc=cmcsc10 scaled \magstep2 \font\frttt=cmtt12 scaled \magstep1 \font\frtsl=cmsl12 scaled \magstep1 -\fi +%\fi % % 17pt -\ifx\undefined\svtrm +%\ifx\undefined\svtrm \font\svtrm=cmr12 scaled \magstep2 \font\svtbf=cmbx12 scaled \magstep2 \font\svtit=cmti12 scaled \magstep2 \font\svtsc=cmcsc10 scaled \magstep3 \font\svttt=cmtt12 scaled \magstep2 -\fi +%\fi % % 20pt -\ifx\undefined\twtyrm +%\ifx\undefined\twtyrm \font\twtyrm=cmr12 scaled \magstep3 \font\twtybf=cmbx12 scaled \magstep3 \font\twtyit=cmti12 scaled \magstep3 \font\twtysc=cmcsc10 scaled \magstep4 \font\twtytt=cmtt12 scaled \magstep3 \font\twtysl=cmsl12 scaled \magstep3 -\fi +%\fi % % 25pt -\ifx\undefined\twfvrm +%\ifx\undefined\twfvrm \font\twfvrm=cmr12 scaled \magstep4 \font\twfvbf=cmbx12 scaled \magstep4 \font\twfvit=cmti12 scaled \magstep4 \font\twfvsc=cmcsc10 scaled \magstep5 \font\twfvtt=cmtt12 scaled \magstep4 \font\twfvsl=cmsl12 scaled \magstep4 -\fi +%\fi % % Large fonts for titles % (If you prefer Roman, use ..rm instead of ..bf) @@ -699,17 +710,22 @@ % Bold italic fonts for dynamic markings. %% +\font\ppfftwelve=cmbxti10 at 8pt % T117 RDT \font\ppffsixteen=cmbxti10 \font\ppfftwenty=cmbxti10 scaled \magstep1 \font\ppfftwentyfour=cmbxti10 scaled \magstep2 \font\ppfftwentynine=cmbxti10 scaled \magstep3 -\font\smallppff=cmbxti10 -\font\normppff=cmbxti10 scaled \magstep1 -\font\medppff=cmbxti10 scaled \magstep2 -\def\smalldyn{\let\ppff\smallppff\let\p@@f\ppff} -\def\normdyn{\let\ppff\normppff\let\p@@f\ppff} -\def\meddyn{\let\ppff\medppff\let\p@@f\twelveit} +\def\ppff{\ifdim\internote<\p@seven6\Internote\tinyppff% T117 RDT +\else\ifdim\internote<.95\Internote\smallppff% +\else\ifdim\internote<1.19\Internote\normppff% +\else\medppff\fi\fi\fi}% + +\def\tinydyn{\let\ppff\tinyppff} % T117 RDT +\def\smalldyn{let\ppff\smallppff} +\def\normdyn{\let\ppff\normppff} +\def\meddyn{\let\ppff\medppff} + \font\musiceleven=musix11 \font\musicthirteen=musix13 @@ -1547,7 +1563,10 @@ \let\meternorfont\tenbf \let\metersmallfont\eightbf % T116 RDT \let\meterbigfont\twelvebf \let\meterlargefont\frtbf \let\meterLargefont\svtbf - \let\ppff\ppffsixteen + \let\tinyppff\ppfftwelve % T117 RDT + \let\smallppff\ppfftwelve + \let\normppff\ppffsixteen + \let\medppff\ppfftwenty \else\ifnum\musicsize=\@xxiv \let\musicLargefont\musictwentynine \let\musiclargefont\musictwentynine @@ -1564,7 +1583,10 @@ \let\meternorfont\frtbf \let\metersmallfont\twelvebf % T116 RDT \let\meterbigfont\svtbf \let\meterlargefont\twtybf \let\meterlargefont\twfvbf - \let\ppff\ppfftwentyfour + \let\tinyppff\ppffsixteen % T117 RDT + \let\smallppff\ppfftwenty + \let\normppff\ppfftwentyfour + \let\medppff\ppfftwentynine \else\ifnum\musicsize=\@xxix \let\musicLargefont\musictwentynine \let\musiclargefont\musictwentynine @@ -1583,8 +1605,11 @@ \let\meternorfont\svtbf \let\metersmallfont\frtbf % T116 RDT \let\meterbigfont\twtybf \let\meterlargefont\twfvbf \let\meterLargefont\twfvbf - \let\ppff\ppfftwentynine - \else + \let\tinyppff\ppfftwenty % T117 RDT + \let\smallppff\ppfftwentyfour + \let\normppff\ppfftwentynine + \let\medppff\ppfftwentynine +\else \ifnum\musicsize=\tw@nty \else\ifnum\musicsize=\z@ \else\errmessage{\noexpand\musicsize=\the\musicsize\space not supported, @@ -1606,10 +1631,11 @@ \let\meternorfont\twelvebf \let\metersmallfont\tenbf % T116 RDT \let\meterbigfont\frtbf \let\meterlargefont\svtbf \let\meterLargefont\twtybf - \let\ppff\ppfftwenty - \fi\fi\fi -}% - + \let\tinyppff\ppfftwelve % T117 RDT + \let\smallppff\ppffsixteen + \let\normppff\ppfftwenty + \let\medppff\ppfftwentyfour +\fi\fi\fi}% \def\comput@specifics{\comput@fonts\comput@sizes} @@ -3386,6 +3412,15 @@ \def\tqu{\q@symbol\@tqh} % T116 RDT \def\tqb{\q@symbol\@tqb} \def\tql{\q@symbol\@tqb} % T116 RDT +\def\tqqh#1#2{\tbbu{#1}\tqh{#1}{#2}} % T117 RDT +\def\tqqu#1#2{\tbbu{#1}\tqu{#1}{#2}} % T117 RDT +\def\tqqb#1#2{\tbbl{#1}\tqb{#1}{#2}} % T117 RDT +\def\tqql#1#2{\tbbl{#1}\tql{#1}{#2}} % T117 RDT +\def\tqqqh#1#2{\tbbbu{#1}\tqqh{#1}{#2}} % T117 RDT +\def\tqqqu#1#2{\tbbbu{#1}\tqqu{#1}{#2}} % T117 RDT +\def\tqqqb#1#2{\tbbbl{#1}\tqqb{#1}{#2}} % T117 RDT +\def\tqqql#1#2{\tbbbl{#1}\tqql{#1}{#2}} % T117 RDT + \def\ztqh{\advancefalse\q@symbol\@tqh} \def\ztqu{\advancefalse\q@symbol\@tqh} % T116 RDT \def\ztqb{\advancefalse\q@symbol\@tqb} @@ -3719,19 +3754,23 @@ \ifodd\n@i \else\advance\n@i#1\fi \pl@base \raise\y@i\hbox{\musixchar#2}\fi\fi} -%%% rests +%%% rests \def\wholeshift#1{\roffset{\p@ne25}{#1}} \def\centerbar#1{\y@ii\lin@pos \advance\y@ii-\lastbarpos \advance\y@ii\cut@v - \kern-\h@lf\y@ii\lrlap{#1}\kern\h@lf\y@ii}% + \kern-\h@lf\y@ii\lrlap{#1}\kern\h@lf\y@ii}% + -\def\centerPAUSe{\centerbar\PAUSe} -\def\centerPAuse{\centerbar\PAuse} -%\def\centerpause{\let\adv@box\hbox \centerbar\pause} -%\def\centerhpause{\let\adv@box\hbox \centerbar\hpause} -\def\centerpause{\centerbar\pause} -\def\centerhpause{\centerbar\hpause} +\def\cpause{\hbox{\ccn{6}{\musixchar61}}} +\def\chpause{\hbox{\ccn{4}{\musixchar60}}} +\def\cPAuse{\hbox{\ccn{0}{\musixchar58}}} +\def\cPAUSe{\hbox{\ccn{0}{\musixchar59}}} + +\def\centerpause{\centerbar{\cpause}} +\def\centerhpause{\centerbar{\chpause}} +\def\centerPAuse{\centerbar{\cPAuse}} +\def\centerPAUSe{\centerbar{\cPAUSe}} \def\C@ps#1#2#3{\n@viii#3\multiply\n@viii\tw@ \advance\n@viii#2\raise\n@viii\internote \hbox{\musixchar#1}} @@ -3747,16 +3786,15 @@ \def\pause{\check@staff \adv@box{\raise\si@\internote\hbox{\musixchar61}}\fi} -\def\pausep{%\check@staff - \wholeshift{\pt5}\pause} +\def\pausep{\wholeshift{\pt5}\pause} \def\liftpause{\C@ps\@l@v@n\si@} \def\liftpausep{\C@pspt\@l@v@n\si@} \def\hpause{\check@staff \adv@box{\raise\f@ur\internote\hbox{\musixchar60}}\fi} \let\hp\hpause -\def\hpausep{%\check@staff - \wholeshift{\pt5}\hpause} +\def\hpausep{\wholeshift{\pt5}\hpause} +\let\hpp\hpausep \def\lifthpause{\C@ps\t@n\f@ur} \def\lifthpausep{\C@pspt\t@n\f@ur} @@ -3780,7 +3818,17 @@ \def\hsp{\adv@restbox{\check@staff\pt5\musixchar65\fi}} \def\qqsp{\adv@restbox{\check@staff\pt5\musixchar66\fi}} -\let\hpp\hpausep +% double-dotted rests T117 RDT + +\def\pausepp{\wholeshift{\ppt5}\pause} +\def\hpausepp{\wholeshift{\ppt5}\hpause} +\let\hppp\hpausepp +\def\qppp{\adv@restbox{\check@staff\ppt5\musixchar62\fi}} +\def\dspp{\adv@restbox{\check@staff\ppt5\musixchar63\fi}} +\def\qspp{\adv@restbox{\check@staff\ppt5\musixchar64\fi}} +\def\hspp{\adv@restbox{\check@staff\ppt5\musixchar65\fi}} +\def\qqspp{\adv@restbox{\check@staff\ppt5\musixchar66\fi}} + %%% accidentals @@ -3919,6 +3967,8 @@ \def\mordent{\n@iv89\@Char} \def\Mordent{\n@iv119\@Char} \def\doublethumb{\n@iv121\@Char} +\def\tr#1{\zcn{#1}{\ppff tr}} +\def\trt#1{\loffset{0.65}{\shake{#1}}\roffset{0.65}{\mordent{#1}}} %%% accents @@ -4149,7 +4199,7 @@ %%% octave lines \def\octnumberup{\octnumberdefault\vrule width 0pt height2ex} -\def\octnumberdefault{\ppffsixteen8} +\def\octnumberdefault{\smallppff8} % T117 RDT \def\octnumberdown{\octnumberdefault$^a$\txtfont\kern 0.3em bassa\vrule width 0pt depth \Internote} \def\octfinup{\check@staff @@ -4251,12 +4301,17 @@ \def\metronequiv#1#2{{\stemlength\f@ur\noteskip\t@n\p@ #1 1\ = #2 1}} -\def\txtfont{\eightit} % T116 RDT +\def\txtfont{% % T117 RDT +\ifdim\internote<.95\Internote \sevenit +\else\ifdim\internote<1.19\Internote \eightit +\else\ifdim\internote<1.43\Internote \tenit +\else\twelveit\fi\fi\fi} + \def\txt{3} \def\xtuplet#1#2{\n@iv#1\advance\n@iv\m@ne {\sign@skip=\n@iv\noteskip \sign@skip=0.5\sign@skip \xdef\half@sign@skip{\the\sign@skip}}% \zcharnote{#2}{\kern\h@lf\qn@width\kern \half@sign@skip\lrlap{\txtfont#1\/\/}}} -\def\triolet{\xtuplet3} +\def\triolet{\xtuplet\txt} % T117 RDT % % Following definitions based on tuplet.tex - conventional tuplet brackets for MusiXTeX. diff --git a/Master/texmf-dist/tex/generic/musixtex/musixtmr.tex b/Master/texmf-dist/tex/generic/musixtex/musixtmr.tex index ce99403f0d3..572320ae41d 100644 --- a/Master/texmf-dist/tex/generic/musixtex/musixtmr.tex +++ b/Master/texmf-dist/tex/generic/musixtex/musixtmr.tex @@ -20,7 +20,7 @@ %% %% History: see trailer. % -\immediate\write16{MusiXTimesFonts\space<2015/02/23>} +\immediate\write16{MusiXTimesFonts\space<2015/05/04>} % % 8pt roman, bold, italic, bold italic, slanted and small-cap \font\eightrm=ptmr8r at 8pt @@ -104,14 +104,16 @@ \let\BIGfont=\twfvrm % % +\font\ppfftwelve=ptmbi8r at 8pt \font\ppffsixteen=ptmbi8r at 10pt \font\ppfftwenty=ptmbi8r scaled \magstep 1 \font\ppfftwentyfour=ptmbi8r scaled \magstep2 \font\ppfftwentynine=ptmbi8r scaled \magstep3 -\font\tinyppff=ptmbi8r at 8pt -\font\smallppff=ptmbi8r at 10pt -\font\normppff=ptmbi8r scaled \magstep 1 -\font\medppff=ptmbi8r scaled \magstep2 +% +\def\tinydyn{\let\ppff\tinyppff} +\def\smalldyn{let\ppff\smallppff} +\def\normdyn{\let\ppff\normppff} +\def\meddyn{\let\ppff\medppff} % \def\f{{\ppff f}} \def\ff{{\ppff ff}} @@ -126,10 +128,6 @@ \edef\catcodeat{\the\catcode`\@}\catcode`\@=11 % -\def\smalldyn{\let\ppff\smallppff \let\p@@f\ppff}% -\def\normdyn{\let\ppff\normppff \let\p@@f\ppff}% -\def\meddyn{\let\ppff\medppff \let\p@@f\ppff}% -% \def\sF{{\ppff s\p@kern f}} \def\sfz{{\ppff s\p@kern f\f@kern z}} \def\sfzp{{\ppff s\p@kern f\f@kern z\p@kern p}} |