From 4fc0fce826bc3e62885c787654e6a39740d0f31d Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 7 Apr 2016 17:14:54 +0000 Subject: musixtex 1.22 (25feb16) git-svn-id: svn://tug.org/texlive/trunk@40306 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/generic/musixtex/musixec.tex | 145 ++----- Master/texmf-dist/tex/generic/musixtex/musixhv.tex | 158 +++---- .../texmf-dist/tex/generic/musixtex/musixlit.tex | 15 +- .../texmf-dist/tex/generic/musixtex/musixplt.tex | 191 +++------ .../texmf-dist/tex/generic/musixtex/musixsty.tex | 1 + .../texmf-dist/tex/generic/musixtex/musixtex.tex | 467 ++++++++++++++------- .../texmf-dist/tex/generic/musixtex/musixtmr.tex | 147 ++----- 7 files changed, 525 insertions(+), 599 deletions(-) (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/generic/musixtex/musixec.tex b/Master/texmf-dist/tex/generic/musixtex/musixec.tex index 72252737185..5ec8d0936c4 100644 --- a/Master/texmf-dist/tex/generic/musixtex/musixec.tex +++ b/Master/texmf-dist/tex/generic/musixtex/musixec.tex @@ -21,14 +21,11 @@ % the Free Software Foundation, Inc., 59 Temple Place - Suite 330, % Boston, MA 02111-1307, USA. % -% Copyright 2015 Bob Tennent rdt@cs.queensu.ca +% Copyright 2015-2016 Bob Tennent rdt@cs.queensu.ca % -\immediate\write16{MusiXec\space<2015/07/28>} +\immediate\write16{MusiXec\space<2016/02/22>} % -\newif\iflongDCfontnames -\newif\iflongECfontnames -\longDCfontnamesfalse % obsolete \longECfontnamestrue \def\fontid{ec} @@ -38,7 +35,6 @@ \font\sevenit=ecti0800 at 7pt \font\sevenbi=ecbi0700 \font\sevensc=ecsc0700 -\font\sevensl=ecsl0700 % % 8pt \font\eightrm=ecrm0800 @@ -46,8 +42,6 @@ \font\eightit=ecti0800 \font\eightbi=ecbi0800 \font\eightsc=ecsc0800 -\font\eightsl=ecsl0800 -\font\eighttt=ectt0800 % % 9pt \font\ninerm=ecrm0900 @@ -55,8 +49,6 @@ \font\nineit=ecti0900 \font\ninebi=ecbi0900 \font\ninesc=ecsc0900 -\font\ninesl=ecsl0900 -\font\ninett=ectt0900 % % 10pt \font\tenrm=ecrm1000 @@ -64,8 +56,6 @@ \font\tenit=ecti1000 \font\tenbi=ecbi1000 \font\tensc=ecsc1000 -\font\tensl=ecsl1000 -\font\tentt=ectt1000 % % 11pt \font\elevenrm=ecrm1095 @@ -73,8 +63,6 @@ \font\elevenit=ecti1095 \font\elevenbi=ecbi1095 \font\elevensc=ecsc1095 -\font\elevensl=ecsl1095 -\font\eleventt=ectt1095 % % 12pt \font\twelverm=ecrm1200 @@ -82,8 +70,6 @@ \font\twelveit=ecti1200 \font\twelvebi=ecbi1200 \font\twelvesc=ecsc1200 -\font\twelvesl=ecsl1200 -\font\twelvett=ectt1200 % % 14pt \font\frtrm=ecrm1440 @@ -91,8 +77,6 @@ \font\frtit=ecti1440 \font\frtbi=ecbi1440 \font\frtsc=ecsc1440 -\font\frtsl=ecsl1440 -\font\frttt=ectt1440 % % 17pt \font\svtrm=ecrm1728 @@ -100,8 +84,6 @@ \font\svtit=ecti1728 \font\svtbi=ecbi1728 \font\svtsc=ecsc1728 -\font\svtsl=ecsl1728 -\font\svttt=ectt1728 % % 20pt \font\twtyrm=ecrm2074 @@ -109,8 +91,6 @@ \font\twtyit=ecti2074 \font\twtybi=ecbi2074 \font\twtysc=ecsc2074 -\font\twtysl=ecsl2074 -\font\twtytt=ectt2074 % % 25pt \font\twfvrm=ecrm2488 @@ -118,103 +98,43 @@ \font\twfvit=ecti2488 \font\twfvbi=ecbi2488 \font\twfvsc=ecsc2488 -\font\twfvsl=ecsl2488 -\font\twfvtt=ectt2488 % -% Large fonts for titles -\let\bigfont=\frtbf -\let\Bigfont=\svtbf -\let\BIgfont=\twtybf -\let\BIGfont=\twfvbf % % +\font\ppfftwelve=ecbi0800 \font\ppffsixteen=ecbi1000 \font\ppfftwenty=ecbi1200 \font\ppfftwentyfour=ecbi1440 \font\ppfftwentynine=ecbi1728 -\font\tinyppff=ecbi0800 -\font\smallppff=ecbi1000 -\font\normppff=ecbi1200 -\font\medppff=ecbi1440 -% -\def\smalltype{% - \let\rm\eightrm - \let\bf\eightbf - \let\it\eightit - \let\bi\eightbi - \let\sc\eightsc - \let\sl\eightsl - \rm} -\def\Smalltype{% - \let\rm\ninerm - \let\bf\ninebf - \let\it\nineit - \let\bi\ninebi - \let\sc\ninesc - \let\sl\ninesl - \rm} -\def\normtype{% - \let\rm\tenrm - \let\bf\tenbf - \let\it\tenit - \let\bi\tenbi - \let\sc\tensc - \let\sl\tensl - \rm} -\def\medtype{% - \let\rm\twelverm - \let\bf\twelvebf - \let\it\twelveit - \let\bi\twelvebi - \let\sc\twelvesc - \let\sl\twelvesl - \rm} -\def\bigtype{% - \let\rm\bigfont - \let\bf\bigfont - \let\it\bigfont - \let\bi\bigfont - \let\sc\bigfont - \let\sl\bigfont - \bf} -\def\Bigtype{% - \let\rm\Bigfont - \let\bf\Bigfont - \let\it\Bigfont - \let\bi\Bigfont - \let\sc\Bigfont - \let\sl\Bigfont - \bf} -\def\BIgtype{% - \let\rm\BIgfont - \let\bf\BIgfont - \let\it\BIgfont - \let\bi\Bigfont - \let\sc\Bigfont - \let\sl\Bigfont - \bf} -\def\BIGtype{% - \let\rm\BIGfont - \let\bf\BIGfont - \let\it\BIGfont - \let\bi\BIGfont - \let\sc\BIGfont - \let\sl\BIGfont - \bf} -% -\def\txtfont{\eightit} -\def\txt{\txtfont3} -\def\tuplettxt{\txtfont3} - -\edef\catcodeat{\the\catcode`\@}\catcode`\@=11 -\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}}} -\catcode`\@=\catcodeat +% +% +% tt fonts needed by musixsty +% +\font\eighttt=ectt0800 +\font\ninett=ectt0900 +\font\tentt=ectt1000 +\font\twelvett=ectt1200 +\font\frttt=ectt1440 +\font\svttt=ectt1728 +\font\twtytt=ectt2074 +\font\twfvtt=ectt2488 +% +% sl fonts needed by musixsty +% +\font\eightsl=ecsl0800 +\font\ninesl=ecsl0900 +\font\tensl=ecsl1000 +\font\twelvesl=ecsl1200 +\font\frtsl=ecsl1440 +\font\svtsl=ecsl1728 +\font\twtysl=ecsl2074 +\font\twfvsl=ecsl2488 % -% Redefine accented characters for etex, suggested by David Carlisle: +% Redefine accented characters for etex % +\edef\catcodeat{\the\catcode`\@}\catcode`\@=11 + \ifx\documentclass\undefined \def\ProvidesFile#1[#2]{} \def\DeclareFontEncoding#1#2#3{} @@ -235,7 +155,14 @@ \expandafter\def\csname T1\string#1-\string#3\endcsname{\char#4\relax}} \input t1enc.def + +% \c requires special treatment +\def\c#1{\leavevmode\ifx c#1\char231 \else\setbox\z@\hbox{#1}\ifdim\ht\z@=1ex\accent11 #1% + \else{\ooalign{\unhbox\z@\crcr + \hidewidth\char11\hidewidth}}\fi\fi} \fi +\catcode`\@=\catcodeat + \normtype \endinput diff --git a/Master/texmf-dist/tex/generic/musixtex/musixhv.tex b/Master/texmf-dist/tex/generic/musixtex/musixhv.tex index df435b45a7a..651f57e7ba2 100644 --- a/Master/texmf-dist/tex/generic/musixtex/musixhv.tex +++ b/Master/texmf-dist/tex/generic/musixtex/musixhv.tex @@ -21,9 +21,9 @@ % the Free Software Foundation, Inc., 59 Temple Place - Suite 330, % Boston, MA 02111-1307, USA. % -% Copyright 2015 Bob Tennent rdt@cs.queensu.ca +% Copyright 2015-2016 Bob Tennent rdt@cs.queensu.ca % -\immediate\write16{MusiXhv\space<2015/07/25>} +\immediate\write16{MusiXhv\space<2016/02/22>} % % 7pt "Roman" (sans serif), bold, "italic" (oblique), "bold-italic" (bold-oblique), and small-cap \font\sevenrm=phvr8t at 7pt @@ -31,7 +31,6 @@ \font\sevenit=phvro8t at 7pt \font\sevenbi=phvbo8t at 7pt \font\sevensc=phvrc8t at 7pt -\font\sevensl=phvro8t at 7pt % % 8pt \font\eightrm=phvr8t at 8pt @@ -39,7 +38,6 @@ \font\eightbi=phvbo8t at 8pt \font\eightsc=phvrc8t at 8pt \font\eightit=phvro8t at 8pt -\font\eightsl=phvro8t at 8pt % % 9pt \font\ninerm=phvr8t at 9pt @@ -47,7 +45,6 @@ \font\nineit=phvro8t at 9pt \font\ninebi=phvbo8t at 9pt \font\ninesc=phvrc8t at 9pt -\font\ninesl=phvro8t at 9pt % % 10pt \font\tenrm=phvr8t at 10pt @@ -55,7 +52,6 @@ \font\tenit=phvro8t at 10pt \font\tenbi=phvbo8t at 10pt \font\tensc=phvrc8t at 10pt -\font\tensl=phvro8t at 10pt % % 11pt \font\elevenrm=phvr8t at 11pt @@ -63,54 +59,49 @@ \font\elevenit=phvro8t at 11pt \font\elevenbi=phvbo8t at 11pt \font\elevensc=phvrc8t at 11pt -\font\elevensl=phvro8t at 11pt % % 12pt -\font\twelverm=phvr8t at 12pt -\font\twelvebf=phvb8t at 12pt -\font\twelveit=phvro8t at 12pt -\font\twelvebi=phvbo8t at 12pt -\font\twelvesc=phvrc8t at 12pt -\font\twelvesl=phvro8t at 12pt +\font\twelverm=phvr8t scaled \magstep1 +\font\twelvebf=phvb8t scaled \magstep1 +\font\twelveit=phvro8t scaled \magstep1 +\font\twelvebi=phvbo8t scaled \magstep1 +\font\twelvesc=phvrc8t scaled \magstep1 % % 14pt -\font\frtrm=phvr8t at 14pt -\font\frtbf=phvb8t at 14pt -\font\frtit=phvro8t at 14pt -\font\frtbi=phvbo8t at 14pt -\font\frtsc=phvrc8t at 14pt -\font\frtsl=phvro8t at 14pt +\font\frtrm=phvr8t scaled \magstep2 +\font\frtbf=phvb8t scaled \magstep2 +\font\frtit=phvro8t scaled \magstep2 +\font\frtbi=phvbo8t scaled \magstep2 +\font\frtsc=phvrc8t scaled \magstep2 % % 17pt -\font\svtrm=phvr8t at 17pt -\font\svtbf=phvb8t at 17pt -\font\svtit=phvro8t at 17pt -\font\svtbi=phvbo8t at 17pt -\font\svtsc=phvrc8t at 17pt -\font\svtsl=phvro8t at 17pt +\font\svtrm=phvr8t scaled \magstep3 +\font\svtbf=phvb8t scaled \magstep3 +\font\svtit=phvro8t scaled \magstep3 +\font\svtbi=phvbo8t scaled \magstep3 +\font\svtsc=phvrc8t scaled \magstep3 % % 20pt -\font\twtyrm=phvr8t at 20pt -\font\twtybf=phvb8t at 20pt -\font\twtyit=phvro8t at 20pt -\font\twtybi=phvbo8t at 20pt -\font\twtysc=phvrc8t at 20pt -\font\twtysl=phvro8t at 20pt +\font\twtyrm=phvr8t scaled \magstep4 +\font\twtybf=phvb8t scaled \magstep4 +\font\twtyit=phvro8t scaled \magstep4 +\font\twtybi=phvbo8t scaled \magstep4 +\font\twtysc=phvrc8t scaled \magstep4 % % 25pt -\font\twfvrm=phvr8t at 25pt -\font\twfvbf=phvb8t at 25pt -\font\twfvit=phvro8t at 25pt -\font\twfvbi=phvbo8t at 25pt -\font\twfvsc=phvrc8t at 25pt -\font\twfvsl=phvro8t at 25pt +\font\twfvrm=phvr8t scaled \magstep5 +\font\twfvbf=phvb8t scaled \magstep5 +\font\twfvit=phvro8t scaled \magstep5 +\font\twfvbi=phvbo8t scaled \magstep5 +\font\twfvsc=phvrc8t scaled \magstep5 +% +% large fonts for titles +% (If you prefer bold, use \bf) % -% Large fonts for titles -% (If you prefer bold, use ..bf instead of ..rm) -\let\bigfont=\frtrm -\let\Bigfont=\svtrm -\let\BIgfont=\twtyrm -\let\BIGfont=\twfvrm +\def\bigtype{\bigfont\rm} +\def\Bigtype{\Bigfont\rm} +\def\BIgtype{\BIgfont\rm} +\def\BIGtype{\BIGfont\rm} % % \font\ppfftwelve=phvbo8t at 8pt @@ -119,11 +110,6 @@ \font\ppfftwentyfour=phvbo8t at 14pt \font\ppfftwentynine=phvbo8t at 17pt % -\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}} @@ -135,6 +121,18 @@ \def\ppp{{\ppff ppp}} \def\pppp{{\ppff pppp}} +% sl fonts needed by musixsty +% +\font\eightsl=phvro8t at 8pt +\font\ninesl=phvro8t at 9pt +\font\tensl=phvro8t at 10pt +\font\twelvesl=phvro8t scaled \magstep1 +\font\frtsl=phvro8t scaled \magstep2 +\font\svtsl=phvro8t scaled \magstep3 +\font\twtysl=phvro8t scaled \magstep4 +\font\twfvsl=phvro8t scaled \magstep5 +% +% \edef\catcodeat{\the\catcode`\@}\catcode`\@=11 % \def\sF{{\ppff s\p@kern f}} @@ -145,64 +143,6 @@ \let\mezzopiano\mp@ \catcode`\@=\catcodeat -\def\smalltype{% - \let\rm\eightrm - \let\bf\eightbf - \let\it\eightit - \let\bi\eightbi - \let\sc\eightsc - \rm} -\def\Smalltype{% - \let\rm\ninerm - \let\bf\ninebf - \let\it\nineit - \let\bi\ninebi - \let\sc\ninesc - \rm} -\def\normtype{% - \let\rm\tenrm - \let\bf\tenbf - \let\it\tenit - \let\bi\tenbi - \let\sc\tensc - \rm} -\def\medtype{% - \let\rm\twelverm - \let\bf\twelvebf - \let\it\twelveit - \let\bi\twelvebi - \let\sc\twelvesc - \rm} -\def\bigtype{% - \let\rm\bigfont - \let\bf\bigfont - \let\it\bigfont - \let\bi\bigfont - \let\sc\bigfont - \sc} -\def\Bigtype{% - \let\rm\Bigfont - \let\bf\Bigfont - \let\it\Bigfont - \let\bi\Bigfont - \let\sc\Bigfont - \sc} -\def\BIgtype{% - \let\rm\BIgfont - \let\bf\BIgfont - \let\it\BIgfont - \let\bi\Bigfont - \let\sc\Bigfont - \sc} -\def\BIGtype{% - \let\rm\BIGfont - \let\bf\BIGfont - \let\it\BIGfont - \let\bi\BIGfont - \let\sc\BIGfont - \sc} -% - % % Redefine accented characters for etex, suggested by David Carlisle: % @@ -226,6 +166,12 @@ \expandafter\def\csname T1\string#1-\string#3\endcsname{\char#4\relax}} \input t1enc.def + +\edef\catcodeat{\the\catcode`\@}\catcode`\@=11 +\def\c#1{\leavevmode\ifx c#1\char231 \else\setbox\z@\hbox{#1}\ifdim\ht\z@=1ex\accent11 #1% + \else{\ooalign{\unhbox\z@\crcr + \hidewidth\char11\hidewidth}}\fi\fi} +\catcode`\@=\catcodeat \fi \normtype diff --git a/Master/texmf-dist/tex/generic/musixtex/musixlit.tex b/Master/texmf-dist/tex/generic/musixtex/musixlit.tex index bee5ab5edbc..410a0a28d63 100644 --- a/Master/texmf-dist/tex/generic/musixtex/musixlit.tex +++ b/Master/texmf-dist/tex/generic/musixtex/musixlit.tex @@ -17,7 +17,7 @@ % Boston, MA 02111-1307, USA. % -\immediate\write16{MusiXLITurgical 0.36\space<1 March 1995>}% +\immediate\write16{MusiXLITurgical 0.37\space<23 Dec 2015>}% \ifx\undefined\oldGclef \else \endinput \fi @@ -35,11 +35,14 @@ \def\cnhu{\def\q@u{\musixchar101}\@nq} \def\cnhl{\def\q@u{\musixchar102}\@nq} -\def\Hpause#1#2{\zcharnote{#1}{\def\s@r{% - \vrule\@width.6\p@\@height1\h@lf\internote\@depth1\h@lf\internote}% - \s@r - \vrule\@width#2\noteskip\@height\h@lf\internote\@depth\h@lf\internote - \s@r}} + +% Moved to musixtex.tex. RDT 2015-12-23 +%\def\Hpause#1#2{\zcharnote{#1}{\def\s@r{% +% \vrule\@width.6\p@\@height1\h@lf\internote\@depth1\h@lf\internote}% +% \s@r +% \vrule\@width#2\noteskip\@height\h@lf\internote\@depth\h@lf\internote +% \s@r}} + \def\Hlonga#1#2{\zcharnote{#1}{\def\s@r{% \vrule\@width.6\p@\@height1\h@lf\internote\@depth1\h@lf\internote}% \s@r diff --git a/Master/texmf-dist/tex/generic/musixtex/musixplt.tex b/Master/texmf-dist/tex/generic/musixtex/musixplt.tex index cb2adba1ee5..27ff21bf849 100644 --- a/Master/texmf-dist/tex/generic/musixtex/musixplt.tex +++ b/Master/texmf-dist/tex/generic/musixtex/musixplt.tex @@ -21,98 +21,89 @@ % the Free Software Foundation, Inc., 59 Temple Place - Suite 330, % Boston, MA 02111-1307, USA. % -% Copyright 2015 Bob Tennent rdt@cs.queensu.ca +% Copyright 2015-2016 Bob Tennent rdt@cs.queensu.ca % -\immediate\write16{MusiXplt\space<2015/07/25>} +\immediate\write16{MusiXplt\space<2016/02/22>} % % 7pt roman, bold, italic, bold italic, slanted and small-cap \font\sevenrm=pplr8t at 7pt \font\sevenbf=pplb8t at 7pt \font\sevenit=pplri8t at 7pt \font\sevenbi=pplbi8t at 7pt -\font\sevensc=pplrc8t at 7pt -\font\sevensl=pplro8t at 7pt +\font\sevensc=pplrc9d at 7pt % % 8pt roman, bold, italic, bold italic, slanted and small-cap \font\eightrm=pplr8t at 8pt \font\eightbf=pplb8t at 8pt \font\eightit=pplri8t at 8pt \font\eightbi=pplbi8t at 8pt -\font\eightsc=pplrc8t at 8pt -\font\eightsl=pplro8t at 8pt +\font\eightsc=pplrc9d at 8pt % % 9pt \font\ninerm=pplr8t at 9pt \font\ninebf=pplb8t at 9pt \font\nineit=pplri8t at 9pt \font\ninebi=pplbi8t at 9pt -\font\ninesc=pplrc8t at 9pt -\font\ninesl=pplro8t at 9pt +\font\ninesc=pplrc9d at 9pt % % 10pt \font\tenrm=pplr8t at 10pt \font\tenbf=pplb8t at 10pt \font\tenit=pplri8t at 10pt \font\tenbi=pplbi8t at 10pt -\font\tensc=pplrc8t at 10pt -\font\tensl=pplro8t at 10pt +\font\tensc=pplrc9d at 10pt % % 11pt -\font\elevenrm=pplr8t at 11pt -\font\elevenbf=pplb8t at 11pt -\font\elevenit=pplri8t at 11pt -\font\elevenbi=pplbi8t at 11pt -\font\elevensc=pplrc8t at 11pt -\font\elevensl=pplro8t at 11pt +\font\elevenrm=pplr8t scaled \magstephalf +\font\elevenbf=pplb8t scaled \magstephalf +\font\elevenit=pplri8t scaled \magstephalf +\font\elevenbi=pplbi8t scaled \magstephalf +\font\elevensc=pplrc9d scaled \magstephalf % % 12pt -\font\twelverm=pplr8t at 12pt -\font\twelvebf=pplb8t at 12pt -\font\twelveit=pplri8t at 12pt -\font\twelvebi=pplbi8t at 12pt -\font\twelvesc=pplrc8t at 12pt -\font\twelvesl=pplro8t at 12pt +\font\twelverm=pplr8t scaled \magstep1 +\font\twelvebf=pplb8t scaled \magstep1 +\font\twelveit=pplri8t scaled \magstep1 +\font\twelvebi=pplbi8t scaled \magstep1 +\font\twelvesc=pplrc9d scaled \magstep1 % % 14pt -\font\frtrm=pplr8t at 14pt -\font\frtbf=pplb8t at 14pt -\font\frtit=pplri8t at 14pt -\font\frtbi=pplbi8t at 14pt -\font\frtsc=pplrc8t at 14pt -\font\frtsl=pplro8t at 14pt +\font\frtrm=pplr8t scaled \magstep2 +\font\frtbf=pplb8t scaled \magstep2 +\font\frtit=pplri8t scaled \magstep2 +\font\frtbi=pplbi8t scaled \magstep2 +\font\frtsc=pplrc9d scaled \magstep2 % % 17pt -\font\svtrm=pplr8t at 17pt -\font\svtbf=pplb8t at 17pt -\font\svtit=pplri8t at 17pt -\font\svtbi=pplbi8t at 17pt -\font\svtsc=pplrc8t at 17pt -\font\svtsl=pplro8t at 17pt +\font\svtrm=pplr8t scaled \magstep3 +\font\svtbf=pplb8t scaled \magstep3 +\font\svtit=pplri8t scaled \magstep3 +\font\svtbi=pplbi8t scaled \magstep3 +\font\svtsc=pplrc9d scaled \magstep3 % % 20pt -\font\twtyrm=pplr8t at 20pt -\font\twtybf=pplb8t at 20pt -\font\twtyit=pplri8t at 20pt -\font\twtybi=pplbi8t at 20pt -\font\twtysc=pplrc8t at 20pt -\font\twtysl=pplro8t at 20pt +\font\twtyrm=pplr8t scaled \magstep4 +\font\twtybf=pplb8t scaled \magstep4 +\font\twtyit=pplri8t scaled \magstep4 +\font\twtybi=pplbi8t scaled \magstep4 +\font\twtysc=pplrc9d scaled \magstep4 % % 25pt -\font\twfvrm=pplr8t at 25pt -\font\twfvbf=pplb8t at 25pt -\font\twfvit=pplri8t at 25pt -\font\twfvbi=pplbi8t at 25pt -\font\twfvsc=pplrc8t at 25pt -\font\twfvsl=pplro8t at 25pt -% -% Large fonts for titles -% (If you prefer bold, use ..bf instead of ..sc) -% (If you prefer roman, use ..rm instead of ..sc) -\let\bigfont=\frtsc -\let\Bigfont=\svtsc -\let\BIgfont=\twtysc -\let\BIGfont=\twfvsc +\font\twfvrm=pplr8t scaled \magstep5 +\font\twfvbf=pplb8t scaled \magstep5 +\font\twfvit=pplri8t scaled \magstep5 +\font\twfvbi=pplbi8t scaled \magstep5 +\font\twfvsc=pplrc9d scaled \magstep5 +% +% +% large fonts for titles +% (If you prefer bold, use \bf) +% (If you prefer roman, use \rm) % +\def\bigtype{\bigfont\sc} +\def\Bigtype{\Bigfont\sc} +\def\BIgtype{\BIgfont\sc} +\def\BIGtype{\BIGfont\sc} % \font\ppfftwelve=pplbi8t at 8pt \font\ppffsixteen=pplbi8t at 10pt @@ -120,11 +111,6 @@ \font\ppfftwentyfour=pplbi8t at 14pt \font\ppfftwentynine=pplbi8t at 17pt % -\def\tinydyn{\let\ppff\ppfftwelve} % version 1.18 RDT -\def\smalldyn{\let\ppff\ppffsixteen} -\def\normdyn{\let\ppff\ppfftwenty} -\def\meddyn{\let\ppff\ppfftwentyfour} -% \def\f{{\ppff f}} \def\ff{{\ppff ff}} \def\fp{{\ppff fp}} @@ -135,7 +121,20 @@ \def\pp{{\ppff pp}} \def\ppp{{\ppff ppp}} \def\pppp{{\ppff pppp}} - +% +% +% sl fonts needed by musixsty +% +\font\eightsl=pplro8t at 8pt +\font\ninesl=pplro8t at 9pt +\font\tensl=pplro8t at 10pt +\font\twelvesl=pplro8t scaled \magstep1 +\font\frtsl=pplro8t scaled \magstep2 +\font\svtsl=pplro8t scaled \magstep3 +\font\twtysl=pplro8t scaled \magstep4 +\font\twfvsl=pplro8t scaled \magstep5 +% +% \edef\catcodeat{\the\catcode`\@}\catcode`\@=11 % \def\sF{{\ppff s\p@kern f}} @@ -144,72 +143,9 @@ \def\mp@{{\ppff mp}} \let\mezzopiano\mp@ + \catcode`\@=\catcodeat -\def\smalltype{% - \let\rm\eightrm - \let\bf\eightbf - \let\it\eightit - \let\bi\eightbi - \let\sc\eightsc - \let\sl\eightsl - \rm} -\def\Smalltype{% - \let\rm\ninerm - \let\bf\ninebf - \let\it\nineit - \let\bi\ninebi - \let\sc\ninesc - \let\sl\ninesl - \rm} -\def\normtype{% - \let\rm\tenrm - \let\bf\tenbf - \let\it\tenit - \let\bi\tenbi - \let\sc\tensc - \let\sl\tensl - \rm} -\def\medtype{% - \let\rm\twelverm - \let\bf\twelvebf - \let\it\twelveit - \let\bi\twelvebi - \let\sc\twelvesc - \let\sl\twelvesl - \rm} -\def\bigtype{% - \let\rm\bigfont - \let\bf\bigfont - \let\it\bigfont - \let\bi\bigfont - \let\sc\bigfont - \let\sl\bigfont - \sc} -\def\Bigtype{% - \let\rm\Bigfont - \let\bf\Bigfont - \let\it\Bigfont - \let\bi\Bigfont - \let\sc\Bigfont - \let\sl\Bigfont - \sc} -\def\BIgtype{% - \let\rm\BIgfont - \let\bf\BIgfont - \let\it\BIgfont - \let\bi\Bigfont - \let\sc\Bigfont - \let\sl\Bigfont - \sc} -\def\BIGtype{% - \let\rm\BIGfont - \let\bf\BIGfont - \let\it\BIGfont - \let\bi\BIGfont - \let\sc\BIGfont - \let\sl\BIGfont - \sc} % % Redefine accented characters for etex, suggested by David Carlisle: % @@ -233,6 +169,13 @@ \expandafter\def\csname T1\string#1-\string#3\endcsname{\char#4\relax}} \input t1enc.def + +\edef\catcodeat{\the\catcode`\@}\catcode`\@=11 +% \c needs special treatment +\def\c#1{\leavevmode\ifx c#1\char231 \else\setbox\z@\hbox{#1}\ifdim\ht\z@=1ex\accent11 #1% + \else{\ooalign{\unhbox\z@\crcr + \hidewidth\char11\hidewidth}}\fi\fi} +\catcode`\@=\catcodeat \fi \normtype diff --git a/Master/texmf-dist/tex/generic/musixtex/musixsty.tex b/Master/texmf-dist/tex/generic/musixtex/musixsty.tex index bfd01023565..8683e39ed54 100644 --- a/Master/texmf-dist/tex/generic/musixtex/musixsty.tex +++ b/Master/texmf-dist/tex/generic/musixtex/musixsty.tex @@ -69,6 +69,7 @@ \font\twfvi=cmmi12 scaled \magstep4 \skewchar\twfvi='177 \font\twfvsy=cmsy10 scaled \magstep5 \skewchar\twfvsy='60 % +% % SEVERAL DIFFERENT POINT SIZES % \def\Twfvpoint{\normalbaselineskip=30pt diff --git a/Master/texmf-dist/tex/generic/musixtex/musixtex.tex b/Master/texmf-dist/tex/generic/musixtex/musixtex.tex index 44377fda165..20013df4b23 100644 --- a/Master/texmf-dist/tex/generic/musixtex/musixtex.tex +++ b/Master/texmf-dist/tex/generic/musixtex/musixtex.tex @@ -25,15 +25,34 @@ \def\mufl@x{0.83}% \def\mxmajorvernumber{1} -\def\mxminorvernumber{20} +\def\mxminorvernumber{22} \def\mxvernumber{\mxmajorvernumber\mxminorvernumber}% make it possible to compare with \ifnum \def\mxversuffix{}% \edef\mxversion{\mxmajorvernumber.\mxminorvernumber\mxversuffix} -\def\mxdate{2015-12-13} +\def\mxdate{2016-02-24} \immediate\write16{MusiXTeX(c) \mxversion\space<\mxdate>}% \everyjob{\immediate\write16{MusiXTeX(c) \mxversion\space<\mxdate>}}% +% version 1.22 + +% bi and sc font definitions added; sl and tt definitions for musixsty moved +% explicit font choices for \txtfont replaced by generic commands \smalltype\it etc. +% \pdlud \halfwidthbigwedge and \raise-height font-dependent +% \cbreath and \zbreath use \BIGtype rather than \BIGfont + + +% version 1.21 + +% RDT adjusted the offsets and/or vertical positions for some tremolos +% RDT moved \lastbarpos\lin@pos after calls to \Writ@meters +% to correct \centerbar positioning +% RDT copied the definition of \Hpause from musixlit.tex +% RDT introduced \Changeclefs, \cHpause and \centerHpause +% RDT replaced \smalltype\it by \txtfont in octave clef commands +% RDT moved definitions of \txtfont into \comput@fonts +% RDT added support for piano-pedal bracket notation + % version 1.20 % RDT re-defined tremolo commands to allow for numerical pitches; @@ -41,8 +60,10 @@ % version 1.19: -% RDT corrected typos in the definition of \comput@fonts affecting ppff fonts for \Largemusicsize +% RDT corrected typos in the definition of \comput@fonts +% affecting ppff fonts for \Largemusicsize % RDT introduced definitions for tremolo commands \trml, \trmu, etc. +% RDT turned off lyrics for \metron and \metronequiv notes % version 1.18: @@ -560,168 +581,173 @@ \def\fontid{cm} % deprecated but used in pmx.tex %% -% Seven point fonts: roman, bold, and italic. +% Seven point fonts %% -%\ifx\undefined\sevenrm % version 1.17 RDT unconditional font definitions - \font\sevenrm=cmr7 - \font\sevenbf=cmbx7 - \font\sevenit=cmti7 -%\fi +\font\sevenrm=cmr7 +\font\sevenbf=cmbx7 +\font\sevenit=cmti7 +\font\sevenbi=cmbxti10 at 7pt % version 1.22 RDT +\font\sevensc=cmcsc10 at 7pt %% -% Eight point fonts: roman, bold, and italic; tt and sl needed for musixsty +% Eight point fonts %% -%\ifx\undefined\eightrm - \font\eightrm=cmr8 - \font\eightbf=cmbx8 - \font\eightit=cmti8 - \font\eighttt=cmtt8 - \font\eightsl=cmsl8 -%\fi +\font\eightrm=cmr8 +\font\eightbf=cmbx8 +\font\eightit=cmti8 +\font\eightbi=cmbxti10 at 8pt % version 1.22 RDT +\font\eightsc=cmcsc10 at 8pt %% % Nine point fonts %% -%\ifx\undefined\ninerm - \font\ninerm=cmr9 - \font\ninebf=cmbx9 - \font\nineit=cmti9 - \font\ninett=cmtt9 - \font\ninesl=cmsl9 -%\fi +\font\ninerm=cmr9 +\font\ninebf=cmbx9 +\font\nineit=cmti9 +\font\ninebi=cmbxti10 at 9pt % version 1.22 RDT +\font\ninesc=cmcsc10 at 9pt %% % Ten point fonts %% -%\ifx\undefined\tenrm - \font\tenrm=cmr10 - \font\tenbf=cmbx10 - \font\tenit=cmti10 - \font\tentt=cmtt10 - \font\tensl=cmsl10 -%\fi - +\font\tenrm=cmr10 +\font\tenbf=cmbx10 +\font\tenit=cmti10 +\font\tenbi=cmbxti10 % version 1.22 RDT +\font\tensc=cmcsc10 %% % Eleven point fonts %% -%\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 +\font\elevenrm=cmr9 scaled \magstephalf +\font\elevenbf=cmbx9 scaled \magstephalf +\font\elevenit=cmti9 scaled \magstephalf +\font\elevenbi=cmbxti10 at 11pt % version 1.22 RDT +\font\elevensc=cmcsc10 at 11pt %% % Twelve point fonts %% -%\ifx\undefined\twelverm - \font\twelverm=cmr12 - \font\twelvebf=cmbx12 - \font\twelveit=cmti12 - \font\twelvett=cmtt12 - \font\twelvesl=cmsl12 -%\fi - -% 14pt: roman, bold, italic and small caps; tt and sl needed for musixsty -%\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 +\font\twelverm=cmr12 +\font\twelvebf=cmbx12 +\font\twelveit=cmti12 +\font\twelvebi=cmbxti10 scaled \magstep1 % version 1.22 RDT +\font\twelvesc=cmcsc10 scaled \magstep1 + +% 14pt fonts +\font\frtrm=cmr12 scaled \magstep1 +\font\frtbf=cmbx12 scaled \magstep1 +\font\frtit=cmti12 scaled \magstep1 +\font\frtsc=cmcsc10 scaled \magstep2 +\font\frtbi=cmbxti10 scaled \magstep2 % version 1.22 RDT % % 17pt -%\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 +\font\svtrm=cmr12 scaled \magstep2 +\font\svtbf=cmbx12 scaled \magstep2 +\font\svtit=cmti12 scaled \magstep2 +\font\svtsc=cmcsc10 scaled \magstep3 +\font\svtbi=cmbxti10 scaled \magstep3 % % 20pt -%\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 +\font\twtyrm=cmr12 scaled \magstep3 +\font\twtybf=cmbx12 scaled \magstep3 +\font\twtyit=cmti12 scaled \magstep3 +\font\twtysc=cmcsc10 scaled \magstep4 +\font\twtybi=cmbxti10 scaled \magstep4 % version 1.22 RDT % % 25pt -%\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 -% -% Large fonts for titles -% (If you prefer Roman, use ..rm instead of ..bf) -% (If you prefer small-caps, use ..sc instead of ..bf) -\let\bigfont=\frtbf -\let\Bigfont=\svtbf -\let\BIgfont=\twtybf -\let\BIGfont=\twfvbf +\font\twfvrm=cmr12 scaled \magstep4 +\font\twfvbf=cmbx12 scaled \magstep4 +\font\twfvit=cmti12 scaled \magstep4 +\font\twfvsc=cmcsc10 scaled \magstep5 +\font\twfvbi=cmbxti10 scaled \magstep5 % version 1.22 RDT % %% %% -% Define six font families. +% Define five font families %% - +\def\tinytype{% + \let\rm\sevenrm + \let\bf\sevenbf + \let\it\sevenit + \let\bi\sevenbi + \let\sc\sevensc + \rm} \def\smalltype{% \let\rm\eightrm \let\bf\eightbf \let\it\eightit + \let\bi\eightbi + \let\sc\eightsc \rm} \def\Smalltype{% \let\rm\ninerm \let\bf\ninebf \let\it\nineit + \let\bi\ninebi + \let\sc\ninesc \rm} \def\normtype{% \let\rm\tenrm \let\bf\tenbf \let\it\tenit + \let\bi\tenbi + \let\sc\tensc \rm} \def\medtype{% \let\rm\twelverm \let\bf\twelvebf \let\it\twelveit + \let\bi\twelvebi + \let\sc\twelvesc \rm} -\def\bigtype{% - \let\rm\bigfont - \let\bf\bigfont - \let\it\bigfont +% +% four font families at big/Big/BIg/BIG sizes +% default is \bf here and in musixec, but \sc in musixplt, \rm in musixtmr +% +\def\bigfont{% + \let\rm\frtrm + \let\bf\frtbf + \let\it\frtit + \let\sc\frtsc + \let\bi\frtbi \bf} -\def\Bigtype{% - \let\rm\Bigfont - \let\bf\Bigfont - \let\it\Bigfont +\def\Bigfont{% + \let\rm\svtrm + \let\bf\svtbf + \let\it\svtit + \let\sc\svtsc + \let\bi\svtbi \bf} -\def\BIgtype{% - \let\rm\BIgfont - \let\bf\BIgfont - \let\it\BIgfont +\def\BIgfont{% + \let\rm\twtyrm + \let\bf\twtybf + \let\it\twtyit + \let\sc\twtysc + \let\bi\twtybi \bf} -\def\BIGtype{% - \let\rm\BIGfont - \let\bf\BIGfont - \let\it\BIGfont +\def\BIGfont{% + \let\rm\twfvrm + \let\bf\twfvbf + \let\it\twfvit + \let\sc\twfvsc + \let\bi\twfvbi \bf} -% %% +% large fonts for titles +% (If you prefer Roman, use \rm) +% (If you prefer small-caps, use \sc) +% +\def\bigtype{\bigfont\bf} % default for "big" fonts is \bf +\def\Bigtype{\Bigfont\bf} +\def\BIgtype{\BIgfont\bf} +\def\BIGtype{\BIGfont\bf} +% +% % Bold italic fonts for dynamic markings. %% @@ -736,10 +762,11 @@ \else\ifdim\internote<1.19\Internote\normppff% \else\medppff\fi\fi\fi}% -\def\tinydyn{\let\ppff\tinyppff} % version 1.17 RDT -\def\smalldyn{\let\ppff\smallppff} -\def\normdyn{\let\ppff\normppff} -\def\meddyn{\let\ppff\medppff} + +\def\tinydyn{\let\ppff\ppfftwelve} % version 1.18 RDT +\def\smalldyn{\let\ppff\ppffsixteen} +\def\normdyn{\let\ppff\ppfftwenty} +\def\meddyn{\let\ppff\ppfftwentyfour} \font\musiceleven=musix11 @@ -749,6 +776,31 @@ \font\musictwentyfour=musix24 \font\musictwentynine=musix29 + +% +% tt fonts needed by musixsty % version 1.22 RDT +% +\font\eighttt=cmtt8 +\font\ninett=cmtt9 +\font\tentt=cmtt10 +\font\twelvett=cmtt12 +\font\frttt=cmtt12 scaled \magstep1 +\font\svttt=cmtt12 scaled \magstep2 +\font\twtytt=cmtt12 scaled \magstep3 +\font\twfvtt=cmtt12 scaled \magstep4 +% +% +% sl fonts needed by musixsty % version 1.22 RDT +% +\font\eightsl=cmsl8 +\font\ninesl=cmsl9 +\font\tensl=cmsl10 +\font\twelvesl=cmsl12 +\font\frtsl=cmsl12 scaled \magstep1 +\font\svtsl=cmsl12 scaled \magstep2 +\font\twtysl=cmsl12 scaled \magstep3 +\font\twfvsl=cmsl12 scaled \magstep4 + % piano brackets, slides, guitar chords, lines, (de)crescendi, circles \font\mxsps=musixspx @@ -1355,6 +1407,9 @@ % terminate slur #1 reference number #2 end note % the various types only influence the horizontal offset, if you want to % terminate a \ibslur with a \tslur it becomes a little bit tricky +%% +%% RDT: the "trick", whatever it is, doesn't seem to be working !!!!! +%% e.g. \Notes\ibsluru1g\qa g\ha l\sk\zq g\zq i\tslur1k\qu k\en \def\tslur{\t@slur\h@lf} \def\tsslur{\t@slur{-\p@ne}} @@ -1582,6 +1637,10 @@ \let\smallppff\ppfftwelve \let\normppff\ppffsixteen \let\medppff\ppfftwenty + \def\txtfont{\ifdim\internote<.95\Internote \tinytype\it % version 1.22 RDT + \else\ifdim\internote<1.19\Internote \smalltype\it + \else\ifdim\internote<1.43\Internote \Smalltype\it + \else\normtype\it\fi\fi\fi}% \else\ifnum\musicsize=\@xxiv \let\musicLargefont\musictwentynine \let\musiclargefont\musictwentynine @@ -1602,6 +1661,10 @@ \let\smallppff\ppfftwenty \let\normppff\ppfftwentyfour \let\medppff\ppfftwentynine + \def\txtfont{\ifdim\internote<.95\Internote \smalltype\it % version 1.22 RDT + \else\ifdim\internote<1.19\Internote \Smalltype\it + \else\ifdim\internote<1.43\Internote \normtype\it + \else\medtype\it\fi\fi\fi}% \else\ifnum\musicsize=\@xxix \let\musicLargefont\musictwentynine \let\musiclargefont\musictwentynine @@ -1624,6 +1687,10 @@ \let\smallppff\ppfftwentyfour \let\normppff\ppfftwentynine \let\medppff\ppfftwentynine + \def\txtfont{\ifdim\internote<.95\Internote \normtype\it % version 1.22 RDT + \else\ifdim\internote<1.19\Internote \medtype\it + \else\ifdim\internote<1.43\Internote \bigfont\it + \else\Bigfont\it\fi\fi\fi}% \else \ifnum\musicsize=\tw@nty \else\ifnum\musicsize=\z@ @@ -1650,6 +1717,10 @@ \let\smallppff\ppffsixteen \let\normppff\ppfftwenty \let\medppff\ppfftwentyfour + \def\txtfont{\ifdim\internote<.95\Internote \smalltype\it + \else\ifdim\internote<1.19\Internote \Smalltype\it + \else\ifdim\internote<1.43\Internote \normtype\it + \else\medtype\it\fi\fi\fi}% \fi\fi\fi}% \def\comput@specifics{\comput@fonts\comput@sizes} @@ -1976,11 +2047,12 @@ \noexpand\startpiece }% \fi \barsinpi@c@\z@ \piece@begina \leavevmode \piece@beginb - \piece@beginc \fil@begin \Writ@meters + \piece@beginc \fil@begin \Writ@meters\lastbarpos\lin@pos %%% 1.21: added \lastbarno setting \let\volta@set\empty % tells the kind of volta setting at next bar \let\volta@cut\empty % flag to tell that a volta has been cut at line end \let\volta@type\empty % the current volta setting (same defs as \volta@set) \let\endvolta@set\empty % tells the kind of volta closing at next bar + \let\pdl@cut\empty % flag to signal a pedal rule has been cut at the end of a line % 1.21 RDT } \let\everystaff\empty @@ -1994,7 +2066,7 @@ \comp@internote \leavevmode \barsinlin@\z@ } \def\contpiece{\noindent \piece@conta \writ@staffs \piece@beginc - \Writ@meters \wbarno@x \addspace\afterruleskip + \Writ@meters \wbarno@x\lastbarpos\lin@pos\addspace\afterruleskip %%% 1.21: added \lastbarno setting } % like contpiece but with indentation (parindent) and instrument names @@ -2002,7 +2074,8 @@ \let\fil@indent\empty \def\Contpiece{\piece@conta \piece@beginb \fil@indent \piece@beginc - \Writ@meters} + \Writ@meters\lastbarpos\lin@pos} %%% 1.21: added \lastbarno setting + %%% end score @@ -2011,6 +2084,12 @@ \def\z@suspend{% \z@suspend@autoflag % used in musixcpt only +% cut pedal rule 1.21 RDT + \ifdim\pdl@pos=\z@\else% + \noport@@\z@ + \znotes\selectinstrument{\pdl@instr}\selectstaff{\pdl@staff}\pdlc@\en% + \global\def\pdl@cut{\@one}% + \fi % cutvolta \write@volta@hrule \ifx\volta@type\tw@\let\volta@set\tw@ \let\volta@type\empty @@ -2073,7 +2152,8 @@ \let\T@bil\iftrue \let\everyst@ff\everystaff \let\fil@spc\empty \let\fil@termskip\empty \let\fil@signs\empty \let\fil@barno\empty \let\leftrepeat\leftrepeat@II \let\leftrightrepeat\leftrightrepeat@II - \piece@beginc\Writ@meters\addspace\afterruleskip} + \piece@beginc\Writ@meters\lastbarpos\lin@pos\let\pdl@cut\empty\addspace\afterruleskip} + %%% 1.21: added \lastbarno and \pdl@cut settings % enable left and right extracts (e.g. for footnotes) @@ -2126,7 +2206,7 @@ \def\writethebarno{\fontbarno\the\barno\kernm\qn@width} \def\fontbarno{\it} -\def\wbarno@x{\lastbarpos\lin@pos +\def\wbarno@x{%%%% version 1.21: RDT moved \lastbarpos\lin@pos after calls to \Writ@meters \ifx\volta@set\empty \n@iii\barno \divide\n@iii\freqbarno\relax \ifnum\n@iii=\lastbarno @@ -2142,6 +2222,10 @@ \fi \write@volta \fi + \ifx\pdl@cut\empty % 1.21 RDT + \else% pedal rule was cut at the end of the previous line + \global\pdl@pos\lin@pos\let\pdl@cut\empty % reset \ped@pos + \fi \b@rrul@ %+simick \n@iii\barno \divide\n@iii\freqbarno\relax \lastbarno\n@iii } @@ -2303,7 +2387,8 @@ \let\Writ@newsigns\empty \def\updat@context{\writ@newclefs - \T@bil \wbarno@x\Writ@newsigns\Writ@meters\addspace\afterruleskip + \T@bil \wbarno@x\Writ@newsigns\Writ@meters\lastbarpos\lin@pos\addspace\afterruleskip +%%% 1.21: added \lastbarno setting \else\Writ@newsigns\z@suspend\contpiece \fi} \def\changecontext{\showallbarrules\n@wbar\updat@context} @@ -2345,7 +2430,7 @@ % \write@volta@hrule %-simick }% -\def\@bar{\n@wbar\wbarno@x\addspace\afterruleskip} +\def\@bar{\n@wbar\wbarno@x\lastbarpos\lin@pos\addspace\afterruleskip} \def\zn@wbar{\t@rmskip\advance\barsinpi@c@\@ne \let\z@sw\@ne} @@ -2673,25 +2758,31 @@ \def\smallbassclef{\keychar74} \def\smallaltoclef{\keychar76} -\def\trebleoct{\trebleclef\raise 9\internote\hbox\@to\z@{\smalltype\it\kern -1.8\Interligne 8\hss}} -\def\bassoct{\bassclef\raise 2\internote\hbox\@to\z@{\smalltype\it\kern -2.3\Interligne 8\hss}} -\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}} +%% version 1.21: replaced \smalltype\it by \txtfont (size-dependent) +%% and adjusted the kerns RDT +%% + +\def\trebleoct{\trebleclef\raise 9\internote\hbox\@to\z@{\txtfont\kern -3.6\internote 8\hss}} +\def\bassoct{\bassclef\raise 2\internote\hbox\@to\z@{\txtfont\kern -4.6\internote 8\hss}} +\def\treblelowoct{\trebleclef\raise -7.5\internote\hbox\@to\z@{\txtfont\kern -4.6\internote 8\hss}} +\def\basslowoct{\bassclef\raise -6\internote\hbox\@to\z@{\txtfont\kern -5.0\internote 8\hss}} % [version 1.15] 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}} +\def\smalltrebleoct{\smalltrebleclef\raise 7.2\internote\hbox\@to\z@{\txtfont\kern -3.6\internote 8\hss}} +\def\smalltreblelowoct{\smalltrebleclef\raise-6.8\internote\hbox\@to\z@{\txtfont\kern -4.2\internote 8\hss}} +\def\smallbassoct{\smallbassclef\raise 2\internote\hbox\@to\z@{\txtfont\kern -4.0\internote 8\hss}} +\def\smallbasslowoct{\smallbassclef\raise-6.5\internote\hbox\@to\z@{\txtfont\kern -4.4\internote 8\hss}} % [version 1.15] reqest from Hermann Hinsch: end \newskip\clef@skip \def\changeclefs{\t@rmskip\writ@newclefs} - \def\zchangeclefs{\t@rmskip\zwrit@newclefs} +%%% version 1.21: new command to call and reset \atnextbar before outputting new clefs RDT +\def\Changeclefs{\t@rmskip\atnextbar\let\atnextbar\empty\writ@newclefs} + % since the characters are shifted by default(Metafont) they looked % a little bit strange when you mix several staffstaffsizes (flushleft) % I've introduced a hack(kern kernm), that they are (nearly) centered @@ -3787,10 +3878,17 @@ \def\cPAuse{\hbox{\ccn{0}{\musixchar58}}} \def\cPAUSe{\hbox{\ccn{0}{\musixchar59}}} +\def\cHpause#1{% 1.21 RDT +\y@ii\lin@pos \advance\y@ii-\lastbarpos% +\def\v@rtpart{\hbox{\vrule width.6pt height1.5\internote depth1.5\internote}}% +\def\h@rizpart{\hbox{\vrule width0.35\y@ii height.5\internote depth.5\internote}}% +\raise4\internote\hbox{\v@rtpart\h@rizpart\ccn5{\meterfont{#1}}\h@rizpart\v@rtpart}}% + \def\centerpause{\centerbar{\cpause}} \def\centerhpause{\centerbar{\chpause}} \def\centerPAuse{\centerbar{\cPAuse}} \def\centerPAUSe{\centerbar{\cPAUSe}} +\def\centerHpause#1{\centerbar{\cHpause{#1}}} \def\C@ps#1#2#3{\n@viii#3\multiply\n@viii\tw@ \advance\n@viii#2\raise\n@viii\internote \hbox{\musixchar#1}} @@ -3849,6 +3947,11 @@ \def\hspp{\adv@restbox{\check@staff\ppt5\musixchar65\fi}} \def\qqspp{\adv@restbox{\check@staff\ppt5\musixchar66\fi}} +% copied from musixlit.tex: version 1.21 RDT + +\def\Hpause#1#2{\zcharnote{#1}{\def\s@r{% +\vrule\@width.6\p@\@height1\h@lf\internote\@depth1\h@lf\internote}\s@r% +\vrule\@width#2\noteskip\@height\h@lf\internote\@depth\h@lf\internote\s@r}} %%% accidentals @@ -4095,13 +4198,76 @@ \def\raiseped{-5} \def\sPed{\musixchar34} -\def\sPED{\zchar\raiseped\sPed} +\def\sPED{% +\zchar\raiseped\sPed% +\getcurpos\advance\y@v1.6ex\global\pdl@pos\y@v% +\xdef\pdl@instr{\the\noinstrum@nt}\xdef\pdl@staff{\the\noport@@}% save current instrument and staff +} + \def\Ped{\musixchar35} -\def\PED{\zchar\raiseped\Ped} +\def\PED{% +\zchar\raiseped\Ped% +\getcurpos\advance\y@v2.8ex\global\pdl@pos\y@v% +\xdef\pdl@instr{\the\noinstrum@nt}\xdef\pdl@staff{\the\noport@@}% save current instrument and staff +} \def\Dep{\musixchar33} -\def\DEP{\zchar\raiseped\Dep} +\def\DEP{% +\zchar\raiseped\Dep% +\global\pdl@pos\z@% +} \def\sDep{\musixchar104} -\def\sDEP{\zchar\raiseped\sDep} +\def\sDEP{% +\zchar\raiseped\sDep% +\global\pdl@pos\z@% +} + +%%% pedal brackets version 1.21 RDT +%% +%% \pdld pedal down +%% \pdlu pedal up +%% \pdlud pedal up and immediately down + +\newdimen\pdl@pos % cursor position for pedal down +\global\pdl@pos\z@ + +\def\pdld{\hbox{\hroff{% +\raise\raiseped\internote\hbox{\vrule height2ex depth0.5pt width0.5pt}% +\getcurpos\global\pdl@pos\y@v% +% save current instrument and staff +\xdef\pdl@instr{\the\noinstrum@nt}\xdef\pdl@staff{\the\noport@@}% +}}}% + +\def\pdlu{\hbox{\hroff{\getcurpos\advance\y@v-\pdl@pos%% compute length of horizontal rule +\kern-\y@v% +\raise\raiseped\internote\hbox{% +\vrule height-0.5pt depth1pt width\y@v% +\vrule height2ex depth0.5pt width0.5pt %% pedal up +}}}% +\global\pdl@pos\z@}% + +\newbox\bigwedgebox % 1.22 RDT +\def\pdlud{\hbox{\hroff{\getcurpos\advance\y@v-\pdl@pos%% compute length of horizontal rule +\kern-\y@v% +\thinmuskip=2mu% +\setbox\bigwedgebox=\hbox{$\!\bigwedge\!$}% +\def\halfwidthbigwedge{0.5\wd\bigwedgebox}% +\advance\y@v-\halfwidthbigwedge% +\raise\raiseped\internote% +\hbox{% +\vrule height-0.5pt depth1pt width\y@v% draw horizontal rule +\kern\halfwidthbigwedge% +\raise0.33ex\lrlap{$\bigwedge$}% pedal up and down +}% +\getcurpos\advance\y@v\halfwidthbigwedge\global\pdl@pos\y@v% +}}}% + +%% cut pedal rule at line end +%% +% compute length of horizontal rule +\def\pdlc@{\getcurpos\advance\y@v-\pdl@pos% +\kern-\y@v\raise\raiseped\internote\hbox{% +\vrule height-0.5pt depth1pt width\y@v %% draw horizontal rule +}}% %%% fermata @@ -4219,21 +4385,26 @@ %%% tremolos version 1.19 RDT %%% based on code by Werner Icking and Andre van Ryckeghem %%% version 1.20 RDT re-defined using \raise, suggested by JPC +%%% version 1.21 +%%% RDT changed beam numbers to 5, suggested by JPC +%%% RDT adjusted the vertical positions for 16th and 32nd tremolos -\def\trml#1{\raise2\internote\hbox{\loffset{0.5}{\ibl0{#1}9}\roffset{0.5}{\tbl0}}}% -\def\trmu#1{\raise-3\internote\hbox{\loffset{0.5}{\ibu0{#1}9}\roffset{0.5}{\tbu0}}}% -\def\trrml#1{\raise2\internote\hbox{\loffset{0.5}{\ibbl0{#1}9}\roffset{0.5}{\tbl0}}}% -\def\trrmu#1{\raise-3\internote\hbox{\loffset{0.5}{\ibbu0{#1}9}\roffset{0.5}{\tbu0}}}% -\def\trrrml#1{\raise2\internote\hbox{\loffset{0.5}{\ibbbl0{#1}9}\roffset{0.5}{\tbl0}}}% -\def\trrrmu#1{\raise-3\internote\hbox{\loffset{0.5}{\ibbbu0{#1}9}\roffset{0.5}{\tbu0}}}% +\def\trml#1{\raise2\internote\hbox{\loffset{0.5}{\ibl5{#1}9}\roffset{0.5}{\tbl5}}}% +\def\trmu#1{\raise-3\internote\hbox{\loffset{0.5}{\ibu5{#1}9}\roffset{0.5}{\tbu5}}}% +\def\trrml#1{\raise3\internote\hbox{\loffset{0.5}{\ibbl5{#1}9}\roffset{0.5}{\tbl5}}}% +\def\trrmu#1{\raise-4\internote\hbox{\loffset{0.5}{\ibbu5{#1}9}\roffset{0.5}{\tbu5}}}% +\def\trrrml#1{\raise3\internote\hbox{\loffset{0.5}{\ibbbl5{#1}9}\roffset{0.5}{\tbl5}}}% +\def\trrrmu#1{\raise-4\internote\hbox{\loffset{0.5}{\ibbbu5{#1}9}\roffset{0.5}{\tbu5}}}% % whole notes are wider than quarter/half notes: -\def\Trml#1{\raise2\internote\hbox{\loffset0{\ibl0{#1}9}\roffset{1.125}{\tbl0}}}% -\def\Trmu#1{\raise-3\internote\hbox{\loffset{1.125}{\ibu0{#1}9}\roffset0{\tbu0}}}% -\def\Trrml#1{\raise2\internote\hbox{\loffset0{\ibbl0{#1}9}\roffset{1.125}{\tbl0}}}% -\def\Trrmu#1{\raise-3\internote\hbox{\loffset{1.125}{\ibbu0{#1}9}\roffset0{\tbu0}}}% -\def\Trrrml#1{\raise2\internote\hbox{\loffset0{\ibbbl0{#1}9}\roffset{1.125}{\tbl0}}}% -\def\Trrrmu#1{\raise-3\internote\hbox{\loffset{1.125}{\ibbbu0{#1}9}\roffset0{\tbu0}}}% +% version 1.21 RDT adjusted the offsets and vertical positions + +\def\Trml#1{\raise3\internote\hbox{\ibl5{#1}9\roffset{1.25}{\tbl5}}}% +\def\Trmu#1{\raise-4\internote\hbox{\loffset{1.1}{\ibu5{#1}9}\roffset{0.15}{\tbu5}}}% +\def\Trrml#1{\raise3\internote\hbox{\ibbl5{#1}9\roffset{1.25}{\tbl5}}}% +\def\Trrmu#1{\raise-4\internote\hbox{\loffset{1.1}{\ibbu5{#1}9}\roffset{0.15}{\tbu5}}}% +\def\Trrrml#1{\raise3\internote\hbox{\ibbbl5{#1}9\roffset{1.25}{\tbl5}}}% +\def\Trrrmu#1{\raise-4\internote\hbox{\loffset{1.1}{\ibbbu5{#1}9}\roffset{0.15}{\tbu5}}}% %%% octave lines @@ -4341,14 +4512,8 @@ \let\lyricson\relax \let\lyricsoff\relax \def\metron#1#2{{\lyricsoff\stemlength\f@ur\noteskip\t@n\p@ #1 1\ = #2\lyricson}} -\def\metronequiv#1#2{{\stemlength\f@ur\noteskip\t@n\p@ #1 1\ = #2 1}} - +\def\metronequiv#1#2{{\lyricsoff\stemlength\f@ur\noteskip\t@n\p@ #1 1\ = #2 1\lyricson}} -\def\txtfont{% % version 1.17 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 @@ -4492,9 +4657,9 @@ %\check -\def\zbreath{\check@staff\raise\si@\internote\rlap{\BIGfont'}\fi} +\def\zbreath{\check@staff\raise\si@\internote\rlap{\BIGtype'}\fi} \def\cbreath{\check@staff\adv@box{\raise\si@\internote - \hbox\@to\noteskip{\hss\BIGfont'\hss}}\fi} + \hbox\@to\noteskip{\hss\BIGtype'\hss}}\fi} % The following macros can be used to surround a note by parentheses % \l[r]par p produces a left[right] parenthesis at pitch p (Ian Collier) diff --git a/Master/texmf-dist/tex/generic/musixtex/musixtmr.tex b/Master/texmf-dist/tex/generic/musixtex/musixtmr.tex index dbf8552c5e0..59a49cb9214 100644 --- a/Master/texmf-dist/tex/generic/musixtex/musixtmr.tex +++ b/Master/texmf-dist/tex/generic/musixtex/musixtmr.tex @@ -13,14 +13,21 @@ %% Tokyo, Japan %% URL(en): http://homepage1.nifty.com/kuuku/pub/musixtex/index-e.html %% (jp): http://homepage1.nifty.com/kuuku/pub/musixtex/index.html -%% Extensions: Bob Tennent (rdt@cs.queensu.ca) 2015-02-06 +%% Extensions: Bob Tennent (rdt@cs.queensu.ca) 2016-02-22 %% %% reference: musixtex.tex (0.99) 268-508 %% MusiXTeX: (c) Daniel Taupin, et al. %% %% History: see trailer. % -\immediate\write16{MusiXTimesFonts\space<2015/07/25>} +\immediate\write16{MusiXTimesFonts\space<2016/02/22>} +% +% 7pt roman, bold, italic, bold italic, slanted and small-cap +\font\sevenrm=ptmr8t at 7pt +\font\sevenbf=ptmb8t at 7pt +\font\sevenit=ptmri8t at 7pt +\font\sevenbi=ptmbi8t at 7pt +\font\sevensc=ptmrc8t at 7pt % artificial small-caps % % 8pt roman, bold, italic, bold italic, slanted and small-cap \font\eightrm=ptmr8t at 8pt @@ -28,7 +35,6 @@ \font\eightit=ptmri8t at 8pt \font\eightbi=ptmbi8t at 8pt \font\eightsc=ptmrc8t at 8pt % artificial small-caps -\font\eightsl=ptmro8t at 8pt % % 9pt \font\ninerm=ptmr8t at 9pt @@ -36,7 +42,6 @@ \font\nineit=ptmri8t at 9pt \font\ninebi=ptmbi8t at 9pt \font\ninesc=ptmrc8t at 9pt -\font\ninesl=ptmro8t at 9pt % % 10pt \font\tenrm=ptmr8t at 10pt @@ -44,16 +49,14 @@ \font\tenit=ptmri8t at 10pt \font\tenbi=ptmbi8t at 10pt \font\tensc=ptmrc8t at 10pt -\font\tensl=ptmro8t at 10pt % % % 11pt -\font\elevenrm=ptmr8t at 11pt -\font\elevenbf=ptmb8t at 11pt -\font\elevenit=ptmri8t at 11pt -\font\elevenbi=ptmbi8t at 11pt -\font\elevensc=ptmrc8t at 11pt -\font\elevensl=ptmro8t at 11pt +\font\elevenrm=ptmr8t scaled \magstephalf +\font\elevenbf=ptmb8t scaled \magstephalf +\font\elevenit=ptmri8t scaled \magstephalf +\font\elevenbi=ptmbi8t scaled \magstephalf +\font\elevensc=ptmrc8t scaled \magstephalf % % 12pt \font\twelverm=ptmr8t scaled \magstep 1 @@ -61,7 +64,6 @@ \font\twelveit=ptmri8t scaled \magstep 1 \font\twelvebi=ptmbi8t scaled \magstep 1 \font\twelvesc=ptmrc8t scaled \magstep 1 -\font\twelvesl=ptmro8t scaled \magstep 1 % % 14pt \font\frtrm=ptmr8t scaled \magstep2 @@ -69,7 +71,6 @@ \font\frtit=ptmri8t scaled \magstep2 \font\frtbi=ptmbi8t scaled \magstep2 \font\frtsc=ptmrc8t scaled \magstep2 -\font\frtsl=ptmro8t scaled \magstep2 % % 17pt \font\svtrm=ptmr8t scaled \magstep3 @@ -77,7 +78,6 @@ \font\svtit=ptmri8t scaled \magstep3 \font\svtbi=ptmbi8t scaled \magstep3 \font\svtsc=ptmrc8t scaled \magstep3 -\font\svtsl=ptmro8t scaled \magstep3 % % 20pt \font\twtyrm=ptmr8t scaled \magstep4 @@ -85,7 +85,6 @@ \font\twtyit=ptmri8t scaled \magstep4 \font\twtybi=ptmbi8t scaled \magstep4 \font\twtysc=ptmrc8t scaled \magstep4 -\font\twtysl=ptmro8t scaled \magstep4 % % 25pt \font\twfvrm=ptmr8t scaled \magstep5 @@ -93,15 +92,15 @@ \font\twfvit=ptmri8t scaled \magstep5 \font\twfvbi=ptmbi8t scaled \magstep5 \font\twfvsc=ptmrc8t scaled \magstep5 -\font\twfvsl=ptmro8t scaled \magstep5 % -% Large fonts for titles -% (If you prefer Times-bold, use ..bf instead of ..rm) -% (If you prefer small-caps, use ..sc instead of ..rm) -\let\bigfont=\frtrm -\let\Bigfont=\svtrm -\let\BIgfont=\twtyrm -\let\BIGfont=\twfvrm +% large fonts for titles +% (If you prefer Times-bold, use \bf) +% (If you prefer small-caps, use \sc) +% +\def\bigtype{\bigfont\rm} +\def\Bigtype{\Bigfont\rm} +\def\BIgtype{\BIgfont\rm} +\def\BIGtype{\BIGfont\rm} % % \font\ppfftwelve=ptmbi8t at 8pt @@ -110,10 +109,6 @@ \font\ppfftwentyfour=ptmbi8t scaled \magstep2 \font\ppfftwentynine=ptmbi8t scaled \magstep3 % -\def\tinydyn{\let\ppff\ppfftwelve} % version 1.18 RDT -\def\smalldyn{\let\ppff\ppffsixteen} -\def\normdyn{\let\ppff\ppfftwenty} -\def\meddyn{\let\ppff\ppfftwentyfour} % \def\f{{\ppff f}} \def\ff{{\ppff ff}} @@ -126,6 +121,21 @@ \def\ppp{{\ppff ppp}} \def\pppp{{\ppff pppp}} + +% +% sl fonts needed by musixsty +% +\font\eightsl=ptmro8t at 8pt +\font\ninesl=ptmro8t at 9pt +\font\tensl=ptmro8t at 10pt +\font\twelvesl=ptmro8t scaled \magstep1 +\font\frtsl=ptmro8t scaled \magstep2 +\font\svtsl=ptmro8t scaled \magstep3 +\font\twtysl=ptmro8t scaled \magstep4 +\font\twfvsl=ptmro8t scaled \magstep5 +% +% + \edef\catcodeat{\the\catcode`\@}\catcode`\@=11 % \def\sF{{\ppff s\p@kern f}} @@ -134,82 +144,6 @@ \def\mp@{{\ppff mp}} \let\mezzopiano\mp@ -\catcode`\@=\catcodeat - -\def\smalltype{% - \let\rm\eightrm - \let\bf\eightbf - \let\it\eightit - \let\bi\eightbi - \let\sc\eightsc - \let\sl\eightsl - \rm} -\def\Smalltype{% - \let\rm\ninerm - \let\bf\ninebf - \let\it\nineit - \let\bi\ninebi - \let\sc\ninesc - \let\sl\ninesl - \rm} -\def\normtype{% - \let\rm\tenrm - \let\bf\tenbf - \let\it\tenit - \let\bi\tenbi - \let\sc\tensc - \let\sl\tensl - \rm} -\def\medtype{% - \let\rm\twelverm - \let\bf\twelvebf - \let\it\twelveit - \let\bi\twelvebi - \let\sc\twelvesc - \let\sl\twelvesl - \rm} -\def\bigtype{% - \let\rm\bigfont - \let\bf\bigfont - \let\it\bigfont - \let\bi\bigfont - \let\sc\bigfont - \let\sl\bigfont - \rm} -\def\Bigtype{% - \let\rm\Bigfont - \let\bf\Bigfont - \let\it\Bigfont - \let\bi\Bigfont - \let\sc\Bigfont - \let\sl\Bigfont - \rm} -\def\BIgtype{% - \let\rm\BIgfont - \let\bf\BIgfont - \let\it\BIgfont - \let\bi\Bigfont - \let\sc\Bigfont - \let\sl\Bigfont - \rm} -\def\BIGtype{% - \let\rm\BIGfont - \let\bf\BIGfont - \let\it\BIGfont - \let\bi\BIGfont - \let\sc\BIGfont - \let\sl\BIGfont - \rm} -% -% -% PMX changes font assignment in pmx.tex -% \BIGfont=\fontid bx10 scaled\magstep4 -% \Bigfont=\fontid bx10 scaled\magstep2 -%\ifx\pmxversion\undefined\relax\else -% \font\Bigfont=ptmr7t scaled \magstep2 -% \font\BIGfont=ptmr7t scaled \magstep4 -%\fi -% % % Redefine accented characters for etex, suggested by David Carlisle: @@ -234,6 +168,13 @@ \expandafter\def\csname T1\string#1-\string#3\endcsname{\char#4\relax}} \input t1enc.def + +\edef\catcodeat{\the\catcode`\@}\catcode`\@=11 +% \c needs special treatment +\def\c#1{\leavevmode\ifx c#1\char231 \else\setbox\z@\hbox{#1}\ifdim\ht\z@=1ex\accent11 #1% + \else{\ooalign{\unhbox\z@\crcr + \hidewidth\char11\hidewidth}}\fi\fi} +\catcode`\@=\catcodeat \fi \normtype -- cgit v1.2.3