summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-02-28 22:49:36 +0000
committerKarl Berry <karl@freefriends.org>2015-02-28 22:49:36 +0000
commitae750b9d9f9b660a211c98ee92e45a5ec9f42dea (patch)
tree21a2f38bae7bb139c78e4634c9fd7562cef14a0e /Master/texmf-dist/tex/generic
parent3b4f0a07480eef603c2582c56ceef707e9849ce6 (diff)
musixtex (28feb15)
git-svn-id: svn://tug.org/texlive/trunk@36401 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic')
-rw-r--r--Master/texmf-dist/tex/generic/musixtex/musixadf.tex138
-rw-r--r--Master/texmf-dist/tex/generic/musixtex/musixec.tex216
-rw-r--r--Master/texmf-dist/tex/generic/musixtex/musixfll.sty2
-rw-r--r--Master/texmf-dist/tex/generic/musixtex/musixhv.tex209
-rw-r--r--Master/texmf-dist/tex/generic/musixtex/musixplt.tex219
-rw-r--r--Master/texmf-dist/tex/generic/musixtex/musixppff.tex134
-rw-r--r--Master/texmf-dist/tex/generic/musixtex/musixps.tex119
-rw-r--r--Master/texmf-dist/tex/generic/musixtex/musixstr.tex17
-rw-r--r--Master/texmf-dist/tex/generic/musixtex/musixsty.tex463
-rw-r--r--Master/texmf-dist/tex/generic/musixtex/musixtex.tex639
-rw-r--r--Master/texmf-dist/tex/generic/musixtex/musixtmr.tex206
11 files changed, 1709 insertions, 653 deletions
diff --git a/Master/texmf-dist/tex/generic/musixtex/musixadf.tex b/Master/texmf-dist/tex/generic/musixtex/musixadf.tex
new file mode 100644
index 00000000000..33c93ddca85
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/musixtex/musixadf.tex
@@ -0,0 +1,138 @@
+%
+% musixadf.tex - some additional accents for MusiXTeX
+%
+%% Author:
+%% Hiroaki MORIMOTO <CQX05646\atmark nifty.com>
+%% Tokyo, Japan
+%% URL: http://homepage1.nifty.com/kuuku/pub/musixtex/index-e.html
+%
+\immediate\write16{MusiXTeX Additional Accents <2015-02-15> )}%
+%
+\edef\catcodeat{\the\catcode`\@}\catcode`\@=11
+%
+\font\musixadfeleven=xadf11
+\font\musixadfthirteen=xadf13
+\font\musixadfsixteen=xadf16
+\font\musixadftwenty=xadf20
+\font\musixadftwentyfour=xadf24
+\font\musixadftwentynine=xadf29
+%
+\let\comput@fonts@org=\comput@fonts\relax
+\def\comput@fonts{%
+ \comput@fonts@org
+ \ifnum\musicsize=\sixt@@n
+ \let\musixadfLargefont\musixadftwentyfour
+ \let\musixadflargefont\musixadftwenty
+ \let\musixadfnorfont\musixadfsixteen
+ \let\musixadfsmallfont\musixadfthirteen
+ \let\musixadftinyfont\musixadfeleven
+ \else\ifnum\musicsize=\@xxiv
+ \let\musixadfLargefont\musixadftwentynine
+ \let\musixadflargefont\musixadftwentynine
+ \let\musixadfnorfont\musixadftwentyfour
+ \let\musixadfsmallfont\musixadftwenty
+ \let\musixadftinyfont\musixadfsixteen
+ \else\ifnum\musicsize=\@xxix
+ \let\musixadfLargefont\musixadftwentynine
+ \let\musixadflargefont\musixadftwentynine
+ \let\musixadfnorfont\musixadftwentynine
+ \let\musixadfsmallfont\musixadftwentyfour
+ \let\musixadftinyfont\musixadftwenty
+ \else
+ \musicsize\tw@nty
+ \let\musixadfLargefont\musixadftwentynine
+ \let\musixadflargefont\musixadftwentyfour
+ \let\musixadfnorfont\musixadftwenty
+ \let\musixadfsmallfont\musixadfsixteen
+ \let\musixadftinyfont\musixadfthirteen
+ \fi\fi\fi
+}%
+%
+\let\set@Largenotesize@org=\set@Largenotesize\relax
+\let\set@largenotesize@org=\set@largenotesize\relax
+\let\set@normalnotesize@org=\set@normalnotesize\relax
+\let\set@smallnotesize@org=\set@smallnotesize\relax
+\let\set@tinynotesize@org=\set@tinynotesize\relax
+%
+\def\set@Largenotesize{%
+ \set@Largenotesize@org\let\musixadfont\musixadfLargefont}%
+\def\set@largenotesize{%
+ \set@largenotesize@org\let\musixadfont\musixadflargefont}%
+\def\set@normalnotesize{%
+ \set@normalnotesize@org\let\musixadfont\musixadfnorfont}%
+\def\set@smallnotesize{%
+ \set@smallnotesize@org\let\musixadfont\musixadfsmallfont}%
+\def\set@tinynotesize{%
+ \set@tinynotesize@org\let\musixadfont\musixadftinyfont}%
+%
+\def\musixadfchar{\musixadfont\char}%
+%
+\def\uacc@Char@adf#1{\check@staff
+ \inhgetn@i#1\relax \relax
+ \ifnum\n@i<\@ight \ifodd\n@i \else\advance\n@i\@ne \fi \fi
+ \zchar\n@i\C@ChaR@adf
+ \fi}%
+%
+\def\lacc@Char@adf#1{\check@staff
+ \inhgetn@i#1\relax \relax
+ \ifnum\n@i>\@ne \ifodd\n@i \else\advance\n@i\m@ne \fi \fi
+ \zchar\n@i\C@ChaR@adf
+ \fi}%
+\def\C@ChaR@adf{\musixadfont\char\n@iv}%
+%
+\def\@Char@adf#1{\zcharnote{#1}\C@ChaR@adf}%
+%
+% coda sign with serif
+%
+% ___
+% |
+% /~|~\
+% |-+--+--+-|
+% \_|_/
+% |
+% ~~~
+%
+%\def\scoda{\musixadfchar85\relax}%
+\def\adfC@coda#1{\llap{\@Char@adf{#1}\kern\afterruleskip}}%
+\def\scoda{\n@iv85\adfC@coda}%
+\def\replacecoda{\let\coda=\scoda}%
+%
+%
+%
+% upright segno
+%
+%\def\upsegno{\musixadfchar86\relax}%
+\def\upsegno{\n@iv86\@Char@adf}%
+\def\replacesegno{\let\segno=\upsegno}%
+%
+%
+% little swell ...something like <>
+%
+% lower
+\def\llsw{\n@iv31\lacc@Char@adf}
+% upper
+\def\ulsw{\n@iv30\uacc@Char@adf}%
+%
+%
+% a little larger sforzato
+%
+\def\uSfz{\n@iv\tw@nty \uacc@Char@adf}
+\def\lSfz{\n@iv21\lacc@Char@adf}
+\def\dSfz{\lSfz}
+\def\replacesforzato{%
+ \let\usfz=\uSfz\relax
+ \let\lsfz=\lSfz\relax
+}%
+%
+%
+% v-breath
+%
+\def\zuBreath{\check@staff\raise\@ight\internote\rlap{\n@iv33\C@ChaR@adf}\fi}%
+\def\cuBreath{\check@staff\adv@box{\raise\@ight\internote
+ \hbox\@to\noteskip{\hss\n@iv33\C@ChaR@adf\hss}}\fi}%
+\def\zlBreath{\check@staff\raise0\internote\rlap{\n@iv34\C@ChaR@adf}\fi}%
+\def\clBreath{\check@staff\adv@box{\raise0\internote
+ \hbox\@to\noteskip{\hss\n@iv34\C@ChaR@adf\hss}}\fi}%
+%
+\catcode`\@=\catcodeat
+\endinput
diff --git a/Master/texmf-dist/tex/generic/musixtex/musixec.tex b/Master/texmf-dist/tex/generic/musixtex/musixec.tex
new file mode 100644
index 00000000000..ced44c02d20
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/musixtex/musixec.tex
@@ -0,0 +1,216 @@
+% musixec.tex : EC font definitions for MusiXTeX
+%
+% usage:
+%
+% \input musixtex
+% \input musixec
+% ...
+%
+% MusiXec.tex 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.
+%
+% MusiXppl.tex 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.
+%
+% Copyright 2015 Bob Tennent rdt@cs.queensu.ca
+%
+\immediate\write16{MusiXec\space<2015/02/11>}
+%
+
+\newif\iflongDCfontnames
+\newif\iflongECfontnames
+\longDCfontnamesfalse % obsolete
+\longECfontnamestrue
+\def\fontid{ec}
+
+% 7pt
+\font\sevenrm=ecrm0700
+\font\sevenbf=ecbx0700
+\font\sevenit=ecti0800 at 7pt
+\font\sevenbi=ecbi0700
+\font\sevensc=ecsc0700
+\font\sevensl=ecsl0700
+%
+% 8pt
+\font\eightrm=ecrm0800
+\font\eightbf=ecbx0800
+\font\eightit=ecti0800
+\font\eightbi=ecbi0800
+\font\eightsc=ecsc0800
+\font\eightsl=ecsl0800
+\font\eighttt=ectt0800
+%
+% 9pt
+\font\ninerm=ecrm0900
+\font\ninebf=ecbx0900
+\font\nineit=ecti0900
+\font\ninebi=ecbi0900
+\font\ninesc=ecsc0900
+\font\ninesl=ecsl0900
+\font\ninett=ectt0900
+%
+% 10pt
+\font\tenrm=ecrm1000
+\font\tenbf=ecbx1000
+\font\tenit=ecti1000
+\font\tenbi=ecbi1000
+\font\tensc=ecsc1000
+\font\tensl=ecsl1000
+\font\tentt=ectt1000
+%
+% 11pt
+\font\elevenrm=ecrm1095
+\font\elevenbf=ecbx1095
+\font\elevenit=ecti1095
+\font\elevenbi=ecbi1095
+\font\elevensc=ecsc1095
+\font\elevensl=ecsl1095
+\font\eleventt=ectt1095
+%
+% 12pt
+\font\twelverm=ecrm1200
+\font\twelvebf=ecbx1200
+\font\twelveit=ecti1200
+\font\twelvebi=ecbi1200
+\font\twelvesc=ecsc1200
+\font\twelvesl=ecsl1200
+\font\twelvett=ectt1200
+%
+% 14pt
+\font\frtrm=ecrm1440
+\font\frtbf=ecbx1440
+\font\frtit=ecti1440
+\font\frtbi=ecbi1440
+\font\frtsc=ecsc1440
+\font\frtsl=ecsl1440
+\font\frttt=ectt1440
+%
+% 17pt
+\font\svtrm=ecrm1728
+\font\svtbf=ecbx1728
+\font\svtit=ecti1728
+\font\svtbi=ecbi1728
+\font\svtsc=ecsc1728
+\font\svtsl=ecsl1728
+\font\svttt=ectt1728
+%
+% 20pt
+\font\twtyrm=ecrm2074
+\font\twtybf=ecbx2074
+\font\twtyit=ecti2074
+\font\twtybi=ecbi2074
+\font\twtysc=ecsc2074
+\font\twtysl=ecsl2074
+\font\twtytt=ectt2074
+%
+% 25pt
+\font\twfvrm=ecrm2488
+\font\twfvbf=ecbx2488
+\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\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
+
+\normtype
+\endinput
diff --git a/Master/texmf-dist/tex/generic/musixtex/musixfll.sty b/Master/texmf-dist/tex/generic/musixtex/musixfll.sty
deleted file mode 100644
index 08569182b43..00000000000
--- a/Master/texmf-dist/tex/generic/musixtex/musixfll.sty
+++ /dev/null
@@ -1,2 +0,0 @@
-\input musixfll.tex
-\endinput
diff --git a/Master/texmf-dist/tex/generic/musixtex/musixhv.tex b/Master/texmf-dist/tex/generic/musixtex/musixhv.tex
new file mode 100644
index 00000000000..4e64d67951c
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/musixtex/musixhv.tex
@@ -0,0 +1,209 @@
+% musixhv.tex : Helvetica font definitions for MusiXTeX
+%
+% usage:
+%
+% \input musixtex
+% \input musixhv
+% ...
+%
+% MusiXhv.tex 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.
+%
+% MusiXhv.tex 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.
+%
+% Copyright 2015 Bob Tennent rdt@cs.queensu.ca
+%
+\immediate\write16{MusiXhv\space<2015/02/24>}
+%
+% 7pt "Roman" (sans serif), bold, "italic" (oblique), "bold-italic" (bold-oblique), and small-cap
+\font\sevenrm=phvr8r at 7pt
+\font\sevenbf=phvb8r at 7pt
+\font\sevenit=phvro8r at 7pt
+\font\sevenbi=phvbo8r at 7pt
+\font\sevensc=phvrc8t at 7pt
+\font\sevensl=phvro8r at 7pt
+%
+% 8pt
+\font\eightrm=phvr8r at 8pt
+\font\eightbf=phvb8r at 8pt
+\font\eightbi=phvbo8r at 8pt
+\font\eightsc=phvrc8t at 8pt
+\font\eightit=phvro8r at 8pt
+\font\eightsl=phvro8r at 8pt
+%
+% 9pt
+\font\ninerm=phvr8r at 9pt
+\font\ninebf=phvb8r at 9pt
+\font\nineit=phvro8r at 9pt
+\font\ninebi=phvbo8r at 9pt
+\font\ninesc=phvrc8t at 9pt
+\font\ninesl=phvro8r at 9pt
+%
+% 10pt
+\font\tenrm=phvr8r at 10pt
+\font\tenbf=phvb8r at 10pt
+\font\tenit=phvro8r at 10pt
+\font\tenbi=phvbo8r at 10pt
+\font\tensc=phvrc8t at 10pt
+\font\tensl=phvro8r at 10pt
+%
+% 11pt
+\font\elevenrm=phvr8r at 11pt
+\font\elevenbf=phvb8r at 11pt
+\font\elevenit=phvro8r at 11pt
+\font\elevenbi=phvbo8r at 11pt
+\font\elevensc=phvrc8t at 11pt
+\font\elevensl=phvro8r at 11pt
+%
+% 12pt
+\font\twelverm=phvr8r at 12pt
+\font\twelvebf=phvb8r at 12pt
+\font\twelveit=phvro8r at 12pt
+\font\twelvebi=phvbo8r at 12pt
+\font\twelvesc=phvrc8t at 12pt
+\font\twelvesl=phvro8r at 12pt
+%
+% 14pt
+\font\frtrm=phvr8r at 14pt
+\font\frtbf=phvb8r at 14pt
+\font\frtit=phvro8r at 14pt
+\font\frtbi=phvbo8r at 14pt
+\font\frtsc=phvrc8t at 14pt
+\font\frtsl=phvro8r at 14pt
+%
+% 17pt
+\font\svtrm=phvr8r at 17pt
+\font\svtbf=phvb8r at 17pt
+\font\svtit=phvro8r at 17pt
+\font\svtbi=phvbo8r at 17pt
+\font\svtsc=phvrc8t at 17pt
+\font\svtsl=phvro8r at 17pt
+%
+% 20pt
+\font\twtyrm=phvr8r at 20pt
+\font\twtybf=phvb8r at 20pt
+\font\twtyit=phvro8r at 20pt
+\font\twtybi=phvbo8r at 20pt
+\font\twtysc=phvrc8t at 20pt
+\font\twtysl=phvro8r at 20pt
+%
+% 25pt
+\font\twfvrm=phvr8r at 25pt
+\font\twfvbf=phvb8r at 25pt
+\font\twfvit=phvro8r at 25pt
+\font\twfvbi=phvbo8r at 25pt
+\font\twfvsc=phvrc8t at 25pt
+\font\twfvsl=phvro8r at 25pt
+%
+% 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
+%
+%
+\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\f{{\ppff f}}
+\def\ff{{\ppff ff}}
+\def\fp{{\ppff fp}}
+\def\fff{{\ppff fff}}
+\def\ffff{{\ppff ffff}}
+\def\mf{{\ppff mf}}
+\def\p{{\ppff p}}
+\def\pp{{\ppff pp}}
+\def\ppp{{\ppff ppp}}
+\def\pppp{{\ppff pppp}}
+
+\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}}
+
+\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
+ \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}
+%
+
+\normtype
+\endinput
diff --git a/Master/texmf-dist/tex/generic/musixtex/musixplt.tex b/Master/texmf-dist/tex/generic/musixtex/musixplt.tex
new file mode 100644
index 00000000000..89e77db5a2d
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/musixtex/musixplt.tex
@@ -0,0 +1,219 @@
+% musixplt.tex : Palatino font definitions for MusiXTeX
+%
+% usage:
+%
+% \input musixtex
+% \input musixplt
+% ...
+%
+% MusiXplt.tex 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.
+%
+% MusiXplt.tex 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.
+%
+% Copyright 2015 Bob Tennent rdt@cs.queensu.ca
+%
+\immediate\write16{MusiXplt\space<2015/02/23>}
+%
+% 7pt roman, bold, italic, bold italic, slanted and small-cap
+\font\sevenrm=pplr8r at 7pt
+\font\sevenbf=pplb8r at 7pt
+\font\sevenit=pplri8r at 7pt
+\font\sevenbi=pplbi8r at 7pt
+\font\sevensc=pplrc8r at 7pt
+\font\sevensl=pplro8r at 7pt
+%
+% 8pt roman, bold, italic, bold italic, slanted and small-cap
+\font\eightrm=pplr8r at 8pt
+\font\eightbf=pplb8r at 8pt
+\font\eightit=pplri8r at 8pt
+\font\eightbi=pplbi8r at 8pt
+\font\eightsc=pplrc8r at 8pt
+\font\eightsl=pplro8r at 8pt
+%
+% 9pt
+\font\ninerm=pplr8r at 9pt
+\font\ninebf=pplb8r at 9pt
+\font\nineit=pplri8r at 9pt
+\font\ninebi=pplbi8r at 9pt
+\font\ninesc=pplrc8r at 9pt
+\font\ninesl=pplro8r at 9pt
+%
+% 10pt
+\font\tenrm=pplr8r at 10pt
+\font\tenbf=pplb8r at 10pt
+\font\tenit=pplri8r at 10pt
+\font\tenbi=pplbi8r at 10pt
+\font\tensc=pplrc8r at 10pt
+\font\tensl=pplro8r at 10pt
+%
+% 11pt
+\font\elevenrm=pplr8r at 11pt
+\font\elevenbf=pplb8r at 11pt
+\font\elevenit=pplri8r at 11pt
+\font\elevenbi=pplbi8r at 11pt
+\font\elevensc=pplrc8r at 11pt
+\font\elevensl=pplro8r at 11pt
+%
+% 12pt
+\font\twelverm=pplr8r at 12pt
+\font\twelvebf=pplb8r at 12pt
+\font\twelveit=pplri8r at 12pt
+\font\twelvebi=pplbi8r at 12pt
+\font\twelvesc=pplrc8r at 12pt
+\font\twelvesl=pplro8r at 12pt
+%
+% 14pt
+\font\frtrm=pplr8r at 14pt
+\font\frtbf=pplb8r at 14pt
+\font\frtit=pplri8r at 14pt
+\font\frtbi=pplbi8r at 14pt
+\font\frtsc=pplrc8r at 14pt
+\font\frtsl=pplro8r at 14pt
+%
+% 17pt
+\font\svtrm=pplr8r at 17pt
+\font\svtbf=pplb8r at 17pt
+\font\svtit=pplri8r at 17pt
+\font\svtbi=pplbi8r at 17pt
+\font\svtsc=pplrc8r at 17pt
+\font\svtsl=pplro8r at 17pt
+%
+% 20pt
+\font\twtyrm=pplr8r at 20pt
+\font\twtybf=pplb8r at 20pt
+\font\twtyit=pplri8r at 20pt
+\font\twtybi=pplbi8r at 20pt
+\font\twtysc=pplrc8r at 20pt
+\font\twtysl=pplro8r at 20pt
+%
+% 25pt
+\font\twfvrm=pplr8r at 25pt
+\font\twfvbf=pplb8r at 25pt
+\font\twfvit=pplri8r at 25pt
+\font\twfvbi=pplbi8r at 25pt
+\font\twfvsc=pplrc8r at 25pt
+\font\twfvsl=pplro8r 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\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\f{{\ppff f}}
+\def\ff{{\ppff ff}}
+\def\fp{{\ppff fp}}
+\def\fff{{\ppff fff}}
+\def\ffff{{\ppff ffff}}
+\def\mf{{\ppff mf}}
+\def\p{{\ppff p}}
+\def\pp{{\ppff pp}}
+\def\ppp{{\ppff ppp}}
+\def\pppp{{\ppff pppp}}
+
+\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}}
+
+\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}
+%
+
+
+\normtype
+\endinput
diff --git a/Master/texmf-dist/tex/generic/musixtex/musixppff.tex b/Master/texmf-dist/tex/generic/musixtex/musixppff.tex
new file mode 100644
index 00000000000..bfdf8ae638b
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/musixtex/musixppff.tex
@@ -0,0 +1,134 @@
+%% musippff.tex This is an extension library for Musix\Tex which
+%% replaces the macros used for dynamic marks to use a mini-font xppff10
+%%
+%% Author:
+%% Hiroaki MORIMOTO <CQX05646\atmark nifty.com>
+%% Tokyo, Japan
+%% URL: http://homepage1.nifty.com/kuuku/pub/musixtex/index-e.html
+%%
+%% usage:
+%% \input musixtex
+%% \input musixppff
+%% ...
+%%
+%%
+\immediate\write16{MusiXppff \noexpand\ppff font replacement <2015/02/23>}%
+
+\font\xppffsixteen=xppff10
+\font\xppfftwenty=xppff10 scaled \magstep1
+\font\xppfftwentyfour=xppff10 scaled \magstep2
+\font\xppfftwentynine=xppff10 scaled \magstep3
+\font\smallxppff=xppff10
+\font\normxppff=xppff10 scaled \magstep1
+\font\medxppff=xppff10 scaled \magstep2
+
+\edef\catcodeat{\the\catcode`\@}\catcode`\@=11
+
+\def\f{{\xppff f}}%
+\def\ff{{\xppff ff}}%
+\def\fp{{\xppff fp}}%
+\def\sF{{\xppff sf}}%
+\def\fff{{\xppff fff}}%
+\def\ffff{{\xppff ffff}}%
+\def\mf{{\xppff mf}}%
+\def\p{{\xppff p}}%
+\def\pp{{\xppff pp}}%
+\def\ppp{{\xppff ppp}}%
+\def\pppp{{\xppff pppp}}%
+\def\sfz{{\xppff sfz}}%
+\def\sfzp{{\xppff sfzp}}%
+\def\mp@{{\xppff mp}}%
+\let\mezzopiano\mp@
+
+\def\comput@fonts{%
+ \ifnum\musicsize=\sixt@@n
+ \let\musicLargefont\musictwentyfour
+ \let\musiclargefont\musictwenty
+ \let\musicnorfont\musicsixteen
+ \let\musicsmallfont\musicthirteen
+ \let\musictinyfont\musiceleven
+ \let\xgregLargefont\xgregtwentyfour
+ \let\xgreglargefont\xgregtwenty
+ \let\xgregnorfont\xgregsixteen
+ \let\xgregsmallfont\xgregthirteen
+ \let\xgregtinyfont\xgregeleven
+ \let\slurd\slurdsixteen \let\sluru\slurusixteen
+ \let\hslurd\hslurdsixteen \let\hsluru\hslurusixteen
+ \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
+ \let\musicnorfont\musictwentyfour
+ \let\musicsmallfont\musictwenty
+ \let\musictinyfont\musicsixteen
+ \let\xgregLargefont\xgregtwentynine
+ \let\xgreglargefont\xgregtwentynine
+ \let\xgregnorfont\xgregtwentyfour
+ \let\xgregsmallfont\xgregtwenty
+ \let\xgregtinyfont\xgregsixteen
+ \let\sluru\slurutwenty \let\slurd\slurdtwenty
+ \let\hsluru\hslurutwenty \let\hslurd\hslurdtwenty
+ \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
+ \let\musicnorfont\musictwentynine
+ \let\musicsmallfont\musictwentyfour
+ \let\musictinyfont\musictwenty
+ \let\xgregLargefont\xgregtwentynine
+ \let\xgreglargefont\xgregtwentynine
+ \let\xgregnorfont\xgregtwentynine
+ \let\xgregsmallfont\xgregtwentyfour
+ \let\xgregtinyfont\xgregtwenty
+ \let\sluru\slurutwenty \let\slurd\slurdtwenty
+ \let\hsluru\hslurutwenty \let\hslurd\hslurdtwenty
+ \let\slurud\slurutwentyd \let\slurdd\slurdtwentyd % +ickd
+ \let\hslurud\hslurutwentyd \let\hslurdd\hslurdtwentyd %+ickd
+ \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@
+ \else\errmessage{\noexpand\musicsize=\the\musicsize\space not supported,
+ set to default of 20}%
+ \fi
+ \fi\musicsize\tw@nty
+ \let\musicLargefont\musictwentynine
+ \let\musiclargefont\musictwentyfour
+ \let\musicnorfont\musictwenty
+ \let\musicsmallfont\musicsixteen
+ \let\musictinyfont\musicthirteen
+ \let\xgreglargefont\xgregtwentyfour
+ \let\xgregLargefont\xgregtwentynine
+ \let\xgregnorfont\xgregtwenty
+ \let\xgregsmallfont\xgregsixteen
+ \let\xgregtinyfont\xgregthirteen
+ \let\sluru\slurutwenty \let\slurd\slurdtwenty
+ \let\hsluru\hslurutwenty \let\hslurd\hslurdtwenty
+ \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}%
+
+\catcode`\@=\catcodeat
+
+\endinput
+
diff --git a/Master/texmf-dist/tex/generic/musixtex/musixps.tex b/Master/texmf-dist/tex/generic/musixtex/musixps.tex
index c2a392c80be..cf62ea618d2 100644
--- a/Master/texmf-dist/tex/generic/musixtex/musixps.tex
+++ b/Master/texmf-dist/tex/generic/musixtex/musixps.tex
@@ -3,7 +3,7 @@
\ifx\undefined\liftcresc\else\endinput\fi
-\immediate\write16{MusiXPS PostScript slurs, ties and crescendos 0.92 (12.5.2002)}%
+\immediate\write16{MusiXPS PostScript slurs, ties and crescendos 0.93 (17.2.2015)}%
\catcode`\@=11
@@ -201,9 +201,9 @@
\ifdim#2\internote<\z@\@upfalse\else\@uptrue\fi
\advance\y@i#2\internote\raise\y@i\rlap{\hskip #3\internote
\special{ps: slur@Dict begin CP /S#1y1 ED /S#1x1 ED
- /S#1hgt (\the\y@i) GD N /S#1brk S#1hgt (\the\internote) GD
+ /S#1hgt (\the\y@i) psxGD N /S#1brk S#1hgt (\the\internote) psxGD
\ifslopebrkslurs 3 \else 1 \fi\if@up 1 \else -1 \fi M M A N /S#1lift 0 N
- /S#1alt (\the\altportee) GDAR N /S#1dir \if@up1\else-1\fi\space N
+ /S#1alt (\the\altportee) psxGDAR N /S#1dir \if@up1\else-1\fi\space N
/S#1dash \d@sh\space N /S#1adj \s@adj\space N end}}%
\ifnum#1>\fourt@@n
\ifnum#1=99\relax\else
@@ -243,17 +243,17 @@
\multiply\n@ii65536\relax\n@iii\th@slift\advance\n@iii-\n@ii
\advance\n@iii-16384\y@iii=\n@iii\internote\advance\y@iii\th@shgt
\raise\y@i\rlap{\hskip #3\internote\special{ps: slur@Dict begin
- CP S (\the\y@ii) GDAR SB /S#1x1 ED
- (\the\y@i) GD (\the\y@iii) GD SB 4 AR M A /S#1y1 ED
- (\the\internote) GD (\the\th@shgt) GD (\the\y@i) GD
+ CP S (\the\y@ii) psxGDAR SB /S#1x1 ED
+ (\the\y@i) psxGD (\the\y@iii) psxGD SB 4 psxAR M A /S#1y1 ED
+ (\the\internote) psxGD (\the\th@shgt) psxGD (\the\y@i) psxGD
S#1x1 S#1y1 CP #4 \if@up\else neg \fi #5 30
\if@dash1\else0\fi\space \s@adj\space 90 DS end}}%
\else
\raise\y@i\rlap{\hskip #3\internote\special{ps: slur@Dict begin
- CP S (\the\y@ii) GDAR SB /S#1x1 ED
- S#1hgt S#1lift (\the\internote) GD M A 4 AR M
- (\the\y@i) GDAR SB SB /S#1y1 ED
- (\the\internote) GD S#1hgt (\the\y@i) GD
+ CP S (\the\y@ii) psxGDAR SB /S#1x1 ED
+ S#1hgt S#1lift (\the\internote) psxGD M A 4 psxAR M
+ (\the\y@i) psxGDAR SB SB /S#1y1 ED
+ (\the\internote) psxGD S#1hgt (\the\y@i) psxGD
S#1x1 S#1y1 CP #4 \if@up\else neg \fi #5 30
S#1dash \s@adj\space 90 DS end}}%
\fi\n@ii\z@
@@ -262,11 +262,11 @@
\fi
\ifcase\n@ii\else\y@ii=#2\internote\setbox\z@=\hbox{\s@tx}%
\y@i=\n@vii\internote\raise\y@i\rlap{\hskip #3\internote
- \special{ps: slur@Dict begin (\the\internote) GD S#1hgt (\the\y@i) GD
- #2 (\the\internote) GD M S#1dir M A
- S#1x1 S#1y1 CP (\the\y@ii) GDAR S#1dir M SB
+ \special{ps: slur@Dict begin (\the\internote) psxGD S#1hgt (\the\y@i) psxGD
+ #2 (\the\internote) psxGD M S#1dir M A
+ S#1x1 S#1y1 CP (\the\y@ii) psxGDAR S#1dir M SB
#4 S#1dir M #5 \psslurmaxhgt\space S#1dash S#1adj 90 DS
- /ay1 ay1 (\the\ht\z@) GDAR -10 AR add dir mul add def}%
+ /ay1 ay1 (\the\ht\z@) psxGDAR -10 psxAR add dir mul add def}%
\lr@lap{\box\z@}\special{ps: end}}%
\fi\@clr\s@tx}
@@ -276,7 +276,7 @@
\advance\th@slift#2\relax\fi}
\def\breakslur#1#2{\inhgetn@i#2\relax\y@i=\n@i\internote\special
- {ps: slur@Dict begin /S#1brk (\the\y@i) GD N end}%
+ {ps: slur@Dict begin /S#1brk (\the\y@i) psxGD N end}%
\ifnum#1<\t@n\s@l@slur{#1}\n@ii\th@slift\divide\n@ii65536\relax
\multiply\n@ii65536 \advance\th@slift-\n@ii\advance\n@i16384\relax
\multiply\n@i65536 \global\advance\th@slift\n@i\fi}
@@ -290,7 +290,7 @@
\def\i@cresc#1#2#3#4{\y@i=#3\internote\raise\y@i\rlap
{\hskip#4\internote\advance\y@i\altportee\special{ps: slur@Dict begin
- CP /C#2y1 ED /C#2x1 ED /C#2alt (\the\y@i) GD N
+ CP /C#2y1 ED /C#2x1 ED /C#2alt (\the\y@i) psxGD N
/C#2dir #1 N end}}%
\ifnum#2>\fourt@@n
\ifdangermessages\message{Danger! [De]crescendo with ID >14.}\fi
@@ -314,7 +314,7 @@
\y@ii=\lin@pos\advance\y@ii\locx@skip\advance\y@ii#3\internote
\advance\y@ii\sl@space
\zchar{#2}{\hskip #3\internote\special{ps: slur@Dict begin
- CP S (\the\y@ii) GDAR SB S CP 4 \the\n@vi\space R
+ CP S (\the\y@ii) psxGDAR SB S CP 4 \the\n@vi\space R
\the\n@vi\space 0 eq { DHC } { DC } ifelse end}}%
\global\n@ii\z@\fi
\fi\fi
@@ -323,7 +323,7 @@
\def\liftcresc#1#2{\y@i=#2\internote\ifnum#1<\max@slurs\s@l@cresc{#1}%
\global\advance\th@salt\y@i\else\special{ps: slur@Dict begin
- /C#1alt (\the\y@i) GDAR C#1alt A N end}\fi}
+ /C#1alt (\the\y@i) psxGDAR C#1alt A N end}\fi}
%%%% ties %%%%%%%%%%%%%%%%%%%%%%
@@ -335,8 +335,8 @@
\def\i@tie#1#2#3#4{\inhgetn@i#3\relax\y@i=\pstieraise\internote
\multiply\y@i#1\relax\advance\y@i\n@i\internote\raise\y@i\rlap
{\hskip #4\internote\special{ps: slur@Dict begin
- /S#1alt (\the\altportee) GDAR N
- CP /T#2y1 ED /T#2x1 ED /T#2hgt (\the\y@i) GD N
+ /S#1alt (\the\altportee) psxGDAR N
+ CP /T#2y1 ED /T#2x1 ED /T#2hgt (\the\y@i) psxGD N
/T#2dir #1 N /T#2dash \d@sh\space N
/T#2adj \t@adj\space N end}}%
\ifnum #2>\fourt@@n
@@ -375,16 +375,16 @@
\mxsk\char\n@i}%
\else
\rlap{\hskip #2\internote\special{ps: slur@Dict begin
- (\the\internote) GD (\the\th@shgt) GD DP
- CP S (\the\y@ii) GDAR SB S (\the\th@shgt)
- GDAR SB DP CP P S \if@up \pstiehgt\space
+ (\the\internote) psxGD (\the\th@shgt) psxGD DP
+ CP S (\the\y@ii) psxGDAR SB S (\the\th@shgt)
+ psxGDAR SB DP CP P S \if@up \pstiehgt\space
\else -\pstiehgt\space \fi \pstieangul\space \pstiemaxhgt\space
\if@dash 1 \else 0 \fi \t@adj\space 40 DS end}}%
\fi
\else
\rlap{\hskip #2\internote\special{ps: slur@Dict begin
- (\the\internote) GD T#1hgt GD DP
- CP S (\the\y@ii) GDAR SB S T#1hgt GDAR SB DP CP P S
+ (\the\internote) psxGD T#1hgt psxGD DP
+ CP S (\the\y@ii) psxGDAR SB S T#1hgt psxGDAR SB DP CP P S
\if@up -\pstiehgt\space \else \pstiehgt\space \fi
\pstieangul\space \pstiemaxhgt\space \if@dash 1 \else 0 \fi
\t@adj\space 40 DS end}}%
@@ -395,7 +395,7 @@
\fi
\ifcase\n@ii\else
\rlap{\hskip#2\internote
- \special{ps: slur@Dict begin (\the\internote) GD T#1hgt DP
+ \special{ps: slur@Dict begin (\the\internote) psxGD T#1hgt DP
T#1x1 T#1y1 CP P T#1y1
\pstiehgt\space T#1dir M \pstieangul\space \pstiemaxhgt\space T#1dash T#1adj 40 DS end}}%
\fi}
@@ -415,13 +415,13 @@
\y@ii=\n@i\internote\advance\y@ii\s@vy\setbox\z@=\hbox{\s@tx}%
\ifx\s@tx\empty\def\tx@sp{1}\else\ifdim\y@v<\tw@nty\internote\def\tx@sp{1.5}%
\else\ifdim\y@v<\@l\internote\def\tx@sp{1.2}\else\def\tx@sp{1}\fi\fi\fi
- \special{ps: slur@Dict begin (\the\internote) GD
- (\the\y@i) GD (\the\y@ii) GD CP (\the\y@i) GDAR swub
- CP exch (\the\y@v) GDAR add exch (\the\y@ii) GDAR sub
+ \special{ps: slur@Dict begin (\the\internote) psxGD
+ (\the\y@i) psxGD (\the\y@ii) psxGD CP (\the\y@i) psxGDAR swub
+ CP exch (\the\y@v) psxGDAR add exch (\the\y@ii) psxGDAR sub
\if d#3 -1 \else 1 \fi \tx@sp\space mul \psslurangul\space
\psslurmaxhgt\space \d@sh\space \s@adj\space 90 DS
- /ax1 ax1 (\the\y@v) GDAR add def /ay1 ay1 (\the\y@ii) GDAR sub
- (\the\ht\z@) GDAR dir mul add def}\lr@lap{\unhbox\z@}\special{ps: end}}%
+ /ax1 ax1 (\the\y@v) psxGDAR add def /ay1 ay1 (\the\y@ii) psxGDAR sub
+ (\the\ht\z@) psxGDAR dir mul add def}\lr@lap{\unhbox\z@}\special{ps: end}}%
\@clr\s@tx\gdef\d@sh{\D@sh}\gdef\s@adj{\S@adj}}
@@ -437,25 +437,25 @@
\advance\n@ii-16384\y@ii=\n@ii\internote\advance\y@ii\th@shgt
\ifnum\n@vi>\@ne\@upfalse\else\@uptrue\fi
\raise\th@salt\rlap{\hskip -2pt\special
- {ps: slur@Dict begin /in (\the\internote) GD N
- in (\the\y@ii) GD (\the\y@iii) GD CP S (\the\y@i) GD
- 4 AR M SB S (\the\y@ii) GDAR SB
- CP (\the\y@iii) GDAR SB \if@up1\else-1\fi\space
+ {ps: slur@Dict begin /in (\the\internote) psxGD N
+ in (\the\y@ii) psxGD (\the\y@iii) psxGD CP S (\the\y@i) psxGD
+ 4 psxAR M SB S (\the\y@ii) psxGDAR SB
+ CP (\the\y@iii) psxGDAR SB \if@up1\else-1\fi\space
0.13 30 \ifodd\n@vi 1 \else 0 \fi \s@adj\space 90 DS end}}%
\else
\rlap{\hskip -2pt\special{ps: slur@Dict begin
- /in (\the\internote) GD N in S\the\n@iv hgt
+ /in (\the\internote) psxGD N in S\the\n@iv hgt
S\the\n@iv lift in M A S\the\n@iv brk
- CP S (\the\y@i) GDAR SB in 10 AR M A S
- S\the\n@iv hgt S\the\n@iv lift in M A 4 AR M SB
- S\the\n@iv alt 4 AR M SB CP S\the\n@iv brk
- S\the\n@iv alt A 4 AR M SB S\the\n@iv dir
+ CP S (\the\y@i) psxGDAR SB in 10 psxAR M A S
+ S\the\n@iv hgt S\the\n@iv lift in M A 4 psxAR M SB
+ S\the\n@iv alt 4 psxAR M SB CP S\the\n@iv brk
+ S\the\n@iv alt A 4 psxAR M SB S\the\n@iv dir
0.13 30 S\the\n@iv dash S\the\n@iv adj 90 DS end}}%
\fi
\else % the slur was breaked the first time
- \rlap{\hskip-2pt\special{ps: slur@Dict begin (\the\internote) GD
+ \rlap{\hskip-2pt\special{ps: slur@Dict begin (\the\internote) psxGD
S\the\n@iv hgt S\the\n@iv brk S\the\n@iv x1 S\the\n@iv y1 CP P
- S\the\n@iv y1 S\the\n@iv hgt S\the\n@iv brk SB 4 AR M A
+ S\the\n@iv y1 S\the\n@iv hgt S\the\n@iv brk SB 4 psxAR M A
S\the\n@iv dir 0.17 \psslurmaxhgt\space S\the\n@iv dash S\the\n@iv adj 90 DS end}}%
\get@bits\n@iv\pss@rega
\multiply\n@ii\tw@\global\advance\pss@rega\n@ii\fi}
@@ -467,12 +467,12 @@
\advance\y@i\sl@space
\ifnum\n@iv<\max@slurs\s@l@cresc\n@iv
\rlap{\hskip-2pt\divide\n@vi\tw@\special{ps: slur@Dict begin CP S
- (\the\y@i) GDAR SB S (\the\th@salt) GDAR SB DP CP P S
+ (\the\y@i) psxGDAR SB S (\the\th@salt) psxGDAR SB DP CP P S
4 \ifodd\n@vi 2 \else 0 \fi R DHC end}}%
\else
\rlap{\hskip-2pt\divide\n@vi\tw@\special{ps: slur@Dict begin CP S
- (\the\y@i) GDAR SB (\the\internote) GD 10 AR M A S
- C\the\n@iv alt GDAR SB DP CP P S
+ (\the\y@i) psxGDAR SB (\the\internote) psxGD 10 psxAR M A S
+ C\the\n@iv alt psxGDAR SB DP CP P S
4 C\the\n@iv dir R DHC end}}\fi
\else % the crescendo was breaked the first time
\rlap{\hskip-2pt\special{ps: slur@Dict begin
@@ -491,19 +491,19 @@
\ifnum\n@vi>\@ne\@upfalse\else\@uptrue\fi
\y@ii\th@salt\advance\y@ii\th@shgt
\raise\y@ii\rlap{\hskip-2pt\special{ps: slur@Dict begin
- (\the\internote) GD (\the\th@shgt) GD DP CP S (\the\y@i) GDAR SB S
+ (\the\internote) psxGD (\the\th@shgt) psxGD DP CP S (\the\y@i) psxGDAR SB S
CP \if@up \pstiehgt\space \else -\pstiehgt\space \fi \pstieangul\space
\pstiemaxhgt\space \ifodd\n@vi 1 \else 0 \fi \t@adj\space 40 DS end}}%
\else
\rlap{\hskip-2pt\special{ps: slur@Dict begin
- (\the\internote) GD T\the\n@iv hgt DP CP S (\the\y@i)
- GDAR SB (\the\internote) GD 10 AR M A S
- T\the\n@iv alt T\the\n@iv hgt A 4 AR M SB DP
+ (\the\internote) psxGD T\the\n@iv hgt DP CP S (\the\y@i)
+ psxGDAR SB (\the\internote) psxGD 10 psxAR M A S
+ T\the\n@iv alt T\the\n@iv hgt A 4 psxAR M SB DP
CP P S \pstiehgt\space T\the\n@iv dir M
\pstieangul\space \pstiemaxhgt\space T\the\n@iv dash T\the\n@iv adj 40 DS end}}\fi
\else % the tie was breaked the first time
\rlap{\hskip-2pt\special{ps: slur@Dict begin
- (\the\internote) GD T\the\n@iv hgt DP
+ (\the\internote) psxGD T\the\n@iv hgt DP
T\the\n@iv x1 T\the\n@iv y1 DP CP P S
\pstiehgt\space T\the\n@iv dir M \pstieangul\space \pstiemaxhgt\space
T\the\n@iv dash 40 T\the\n@iv adj DS end}}%
@@ -794,9 +794,9 @@ The slurs and ties can be dotted, when you say \dotted anywhere before
the begining of the slur or tie. The first slur or tie following this
command will then be drawed with dotted line.
-[dangerous bend] When you say \dotted, then ALL slurs and ties
+[dangerous bend] When you say \Dotted, then ALL slurs and ties
from this point will be dotted until you say
-\Solid. Furthermore, inside the \dotted...\Solid you can make some slur or
+\Solid. Furthermore, inside the \Dotted...\Solid you can make single slur or
tie solid saying \solid before its begining.
NOTE: These macros are taken into account only at the begining
@@ -806,9 +806,9 @@ NOTE: These macros are taken into account only at the begining
Collisions of slurs/ties and staff lines
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In PostScript it is possible to do some computations, which are very hard
-to implement in TeX. One of neat features of the PS slurs and ties is
-checking, if the curve passes close the staff line and if so, adjusting
-the altitude of the curve to avoid collision ("black triangles" or narrow
+to implement in TeX. One of neat features of the PS slurs and ties is a
+check, whether the curve passes close the staff line and if so, adjustment
+of the altitude of the curve to avoid collision ("black triangles" or narrow
white space). You can turn this feature on globally (\Sluradjust,
\Tieadjust) or locally (\sluradjust, \tieadjust), or disable it either
globally (\Nosluradjust, \Notieadjust) or locally (\nosluradjust,
@@ -871,10 +871,8 @@ I have tried to make the macros as small and fast as possible. The problem
about them is not in their size, but in their output. Each \i... and \t...
produces a \special command, which must be stored into the TeX's main memory.
Therefore, if too many slur occurs in one page, some memory troubles could
-occur. In that case either use BigTeX (but I suppose you already use it) or
-use the bitmapped slurs. I will try to reduce the memory requirements, but
-do not expect any miracles. There is a lot of things to be passed to the
-PostScript part...
+occur. In that case either use BigTeX (but I suppose you already do), or
+use the bitmapped slurs.
@@ -951,6 +949,9 @@ Bug reports and complainments are welcomed at:
HISTORY
~~~~~~~
+0.93 (17.2.2015)
+ changed definitions of AR, GDAR and GD to avoid collisions in certain PS files
+
0.92 (12.5.2002)
added: \nosluradjust, \sluradjust, \notieadjust, \tieadjust
added: \slopebrkslurtrue, \slopebrkslurfalse
diff --git a/Master/texmf-dist/tex/generic/musixtex/musixstr.tex b/Master/texmf-dist/tex/generic/musixtex/musixstr.tex
index 7fc44796ac6..ac23af18f46 100644
--- a/Master/texmf-dist/tex/generic/musixtex/musixstr.tex
+++ b/Master/texmf-dist/tex/generic/musixtex/musixstr.tex
@@ -18,23 +18,6 @@
%
\immediate\write16{MUsiXSTRingaccents T.57\space<6 September 1996>}%
-\ifx\undefined\sevenrm
-\iflongDCfontnames
- \font\sevenrm=\fontid r0700
- \font\sevenbf=\fontid bx0700
- \font\sevenit=\fontid ti0700
-\else\iflongECfontnames
- \font\sevenrm=\fontid rm0700
- \font\sevenbf=\fontid bx0700
- \font\sevenit=\fontid ti0700
-\else
- \font\sevenrm=\fontid r7
- \font\sevenbf=\fontid bx7
- \font\sevenit=\fontid ti7
-\fi
-\fi
-\fi
-
% accents for strings by Werner Icking (Werner.Icking@gmd.de)
\let\AB\downbow
diff --git a/Master/texmf-dist/tex/generic/musixtex/musixsty.tex b/Master/texmf-dist/tex/generic/musixtex/musixsty.tex
index 9078883af25..bfd01023565 100644
--- a/Master/texmf-dist/tex/generic/musixtex/musixsty.tex
+++ b/Master/texmf-dist/tex/generic/musixtex/musixsty.tex
@@ -18,7 +18,9 @@
%
\ifx\undefined\Tenpoint \else \endinput\fi
-\immediate\write16{MusiXtextSTYle T.94\space<11 May 1999>}%
+\immediate\write16{MusiXtextSTYle T.116\space<27 February 2015>}%
+
+% modified by RDT to be independent of Computer Modern (other than Math fonts)
\edef\catcodeat{\the\catcode`\@}\catcode`\@=11
\edef\catcode@gt{\the\catcode`\>}\catcode`\>=12
@@ -27,357 +29,208 @@
% non musical procedures used in typesetting the non-musical
% texts together with musictex
-% eight point fonts
+% eight point math fonts
\font\eighti=cmmi8 \skewchar\eighti='177
\font\eightsy=cmsy8 \skewchar\eightsy='60
-\iflongDCfontnames
- \font\eighttt=\fontid tt0800
- \font\eightsl=\fontid sl0800
-\else\iflongECfontnames
- \font\eighttt=\fontid tt0800
- \font\eightsl=\fontid sl0800
-\else
- \font\eighttt=\fontid tt8
- \font\eightsl=\fontid sl8
-\fi
-\fi
%
-% nine point fonts
+% nine point math fonts
%
\font\ninei=cmmi9 \skewchar\ninei='177
\font\ninesy=cmsy9 \skewchar\ninesy='60
-\iflongDCfontnames
- \font\ninett=\fontid tt0900
- \font\ninerm=\fontid r0900
- \font\ninesl=\fontid sl0900
- \font\nineit=\fontid ti0900
- \font\ninebf=\fontid bx0900
-\else\iflongECfontnames
- \font\ninett=\fontid tt0900
- \font\ninerm=\fontid rm0900
- \font\ninesl=\fontid sl0900
- \font\nineit=\fontid ti0900
- \font\ninebf=\fontid bx0900
-\else
- \font\ninerm=\fontid r9
- \font\ninett=\fontid tt9
- \font\ninesl=\fontid sl9
- \font\nineit=\fontid ti9
- \font\ninebf=\fontid bx9
-\fi
-\fi
%
-% eleven point fonts
+% eleven point math fonts (RDT: not used?)
%
-\font\elvi=cmmi10 scaled \magstephalf \skewchar\elvi='177
-\font\elvsy=cmsy10 scaled \magstephalf \skewchar\elvsy='60
-\iflongDCfontnames
- \font\elvtt=\fontid tt1095
- \font\elvrm=\fontid r1095
- \font\elvsl=\fontid sl1095
- \font\elvit=\fontid ti1095
- \font\elvbf=\fontid bx1095
-\else\iflongECfontnames
- \font\elvtt=\fontid tt1095
- \font\elvrm=\fontid rm1095
- \font\elvsl=\fontid sl1095
- \font\elvit=\fontid ti1095
- \font\elvbf=\fontid bx1095
-\else
- \font\elvrm=\fontid r9 scaled \magstephalf
- \font\elvtt=\fontid tt9 scaled \magstephalf
- \font\elvsl=\fontid sl9 scaled \magstephalf
- \font\elvit=\fontid ti9 scaled \magstephalf
- \font\elvbf=\fontid bx9 scaled \magstephalf
-\fi
-\fi
+\font\eleveni=cmmi10 scaled \magstephalf \skewchar\eleveni='177
+\font\elevensy=cmsy10 scaled \magstephalf \skewchar\elevensy='60
%
-% twelve point fonts
+% twelve point math fonts
%
-\font\twli=cmmi12 \skewchar\twli='177
-\font\twlsy=cmsy10 scaled \magstep1 \skewchar\twlsy='60
-\iflongDCfontnames
- \font\twlrm=\fontid r1200
- \font\twlbf=\fontid bx1200
- \font\twlsl=\fontid sl1200
- \font\twlit=\fontid ti1200
- \font\twltt=\fontid tt1200
-\else\iflongECfontnames
- \font\twlrm=\fontid rm1200
- \font\twlbf=\fontid bx1200
- \font\twlsl=\fontid sl1200
- \font\twlit=\fontid ti1200
- \font\twltt=\fontid tt1200
-\else
- \font\twlrm=\fontid r12
- \font\twlbf=\fontid bx12
- \font\twlsl=\fontid sl12
- \font\twlit=\fontid ti12
- \font\twltt=\fontid tt12
-\fi
-\fi
+\font\twelvei=cmmi12 \skewchar\twelvei='177
+\font\twelvesy=cmsy10 scaled \magstep1 \skewchar\twelvesy='60
%
-% fourteen point fonts
+% fourteen point math fonts
%
\font\frti=cmmi12 scaled \magstep1 \skewchar\frti='177
\font\frtsy=cmsy10 scaled \magstep2 \skewchar\frtsy='60
-\iflongDCfontnames
- \font\frtrm=\fontid r1440
- \font\frtbf=\fontid bx1440
- \font\frtsl=\fontid sl1440
- \font\frtit=\fontid ti1440
- \font\frttt=\fontid tt1440
-\else\iflongECfontnames
- \font\frtrm=\fontid rm1440
- \font\frtbf=\fontid bx1440
- \font\frtsl=\fontid sl1440
- \font\frtit=\fontid ti1440
- \font\frttt=\fontid tt1440
-\else
- \font\frtrm=\fontid r12 scaled \magstep1
- \font\frtbf=\fontid bx12 scaled \magstep1
- \font\frtsl=\fontid sl12 scaled \magstep1
- \font\frtit=\fontid ti12 scaled \magstep1
- \font\frttt=\fontid tt12 scaled \magstep1
-\fi
-\fi
%
-% seventeen point fonts
+% seventeen point math fonts
%
\font\svti=cmmi12 scaled \magstep2 \skewchar\svti='177
\font\svtsy=cmsy10 scaled \magstep3 \skewchar\svtsy='60
-\iflongDCfontnames
- \font\svtrm=\fontid r1728
- \font\svtbf=\fontid bx1728
- \font\svtsl=\fontid sl1728
- \font\svtit=\fontid ti1728
- \font\svttt=\fontid tt1728
-\else\iflongECfontnames
- \font\svtrm=\fontid rm1728
- \font\svtbf=\fontid bx1728
- \font\svtsl=\fontid sl1728
- \font\svtit=\fontid ti1728
- \font\svttt=\fontid tt1728
-\else
- \font\svtrm=\fontid r17
- \font\svtbf=\fontid bx12 scaled \magstep2
- \font\svtsl=\fontid sl12 scaled \magstep2
- \font\svtit=\fontid ti12 scaled \magstep2
- \font\svttt=\fontid tt12 scaled \magstep2
-\fi
-\fi
%
-% twenty point fonts
+% twenty point math fonts
%
\font\twtyi=cmmi12 scaled \magstep3 \skewchar\twtyi='177
\font\twtysy=cmsy10 scaled \magstep4\skewchar\twtysy='60
-\iflongDCfontnames
- \font\twtyrm=\fontid r2074
- \font\twtybf=\fontid bx2074
- \font\twtysl=\fontid sl2074
- \font\twtyit=\fontid ti2074
- \font\twtytt=\fontid tt2074
-\else\iflongECfontnames
- \font\twtyrm=\fontid rm2074
- \font\twtybf=\fontid bx2074
- \font\twtysl=\fontid sl2074
- \font\twtyit=\fontid ti2074
- \font\twtytt=\fontid tt2074
-\else
- \font\twtyrm=\fontid r17 scaled \magstep1
- \font\twtybf=\fontid bx12 scaled \magstep3
- \font\twtysl=\fontid sl12 scaled \magstep3
- \font\twtyit=\fontid ti12 scaled \magstep3
- \font\twtytt=\fontid tt12 scaled \magstep3
-\fi
-\fi
%
-% twenty five point fonts
+% twenty five point math fonts
%
\font\twfvi=cmmi12 scaled \magstep4 \skewchar\twfvi='177
\font\twfvsy=cmsy10 scaled \magstep5 \skewchar\twfvsy='60
-\iflongDCfontnames
- \font\twfvrm=\fontid r2488
- \font\twfvbf=\fontid bx2488
- \font\twfvsl=\fontid sl2488
- \font\twfvit=\fontid ti2488
- \font\twfvtt=\fontid tt2488
-\else\iflongECfontnames
- \font\twfvrm=\fontid rm2488
- \font\twfvbf=\fontid bx2488
- \font\twfvsl=\fontid sl2488
- \font\twfvit=\fontid ti2488
- \font\twfvtt=\fontid tt2488
-\else
- \font\twfvrm=\fontid r17 scaled \magstep2
- \font\twfvbf=\fontid bx12 scaled \magstep4
- \font\twfvsl=\fontid sl12 scaled \magstep4
- \font\twfvit=\fontid ti12 scaled \magstep4
- \font\twfvtt=\fontid tt12 scaled \magstep4
-\fi
-\fi
%
% SEVERAL DIFFERENT POINT SIZES
%
-\def\twfvpoint{\Twfvpoint}
\def\Twfvpoint{\normalbaselineskip=30pt
-\def\rm{\fam0\twfvrm}%
-\def\it{\fam\itfam\twfvit}%
-\def\sl{\fam\slfam\twfvsl}%
-\def\bf{\fam\bffam\twfvbf}%
-\def\smc{\twfvrm}%
-\def\mit{\fam 1}%
-\def\cal{\fam 2}%
-\textfont0=\twfvrm \scriptfont0=\twtyrm \scriptscriptfont0=\svtrm
-\textfont1=\twfvi \scriptfont1=\twtyi \scriptscriptfont1=\svti
-\textfont2=\twfvsy \scriptfont2=\twtysy \scriptscriptfont2=\svtsy
-\textfont3=\tenex \scriptfont3=\tenex \scriptscriptfont3=\tenex
-\textfont\itfam=\twfvit \scriptfont\itfam=\twtyit
-\textfont\slfam=\twfvsl \scriptfont\slfam=\twtysl
-\textfont\bffam=\twfvbf \scriptfont\bffam=\twtybf
-\scriptscriptfont\bffam=\twtybf
-\setbox\strutbox=\hbox{\vrule height 22pt depth 8pt width 0pt}%
-\def\tt{\twfvtt}\normalbaselines\rm}
+ \def\rm{\fam0\twfvrm}%
+ \def\it{\fam\itfam\twfvit}%
+ \def\sl{\fam\slfam\twfvsl}%
+ \def\bf{\fam\bffam\twfvbf}%
+ \def\smc{\twfvrm}%
+ \def\mit{\fam 1}%
+ \def\cal{\fam 2}%
+ \textfont0=\twfvrm \scriptfont0=\twtyrm \scriptscriptfont0=\svtrm
+ \textfont1=\twfvi \scriptfont1=\twtyi \scriptscriptfont1=\svti
+ \textfont2=\twfvsy \scriptfont2=\twtysy \scriptscriptfont2=\svtsy
+ \textfont3=\tenex \scriptfont3=\tenex \scriptscriptfont3=\tenex
+ \textfont\itfam=\twfvit \scriptfont\itfam=\twtyit
+ \textfont\slfam=\twfvsl \scriptfont\slfam=\twtysl
+ \textfont\bffam=\twfvbf \scriptfont\bffam=\twtybf
+ \scriptscriptfont\bffam=\twtybf
+ \setbox\strutbox=\hbox{\vrule height 22pt depth 8pt width 0pt}%
+ \def\tt{\twfvtt}\normalbaselines\rm
+}
+\def\twfvpoint{\Twfvpoint}
%
-\def\twtypoint{\Twtypoint}
\def\Twtypoint{\normalbaselineskip=25pt
-\def\rm{\fam0\twtyrm}%
-\def\it{\fam\itfam\twtyit}%
-\def\sl{\fam\slfam\twtysl}%
-\def\bf{\fam\bffam\twtybf}%
-\def\smc{\twtyrm}%
-\def\mit{\fam 1}%
-\def\cal{\fam 2}%
-\textfont0=\twtyrm \scriptfont0=\svtrm \scriptscriptfont0=\frtrm
-\textfont1=\twtyi \scriptfont1=\svti \scriptscriptfont1=\frti
-\textfont2=\twtysy \scriptfont2=\svtsy \scriptscriptfont2=\frtsy
-\textfont3=\tenex \scriptfont3=\tenex \scriptscriptfont3=\tenex
-\textfont\itfam=\twtyit \scriptfont\itfam=\svtit
-\textfont\slfam=\twtysl \scriptfont\slfam=\svtsl
-\textfont\bffam=\twtybf \scriptfont\bffam=\svtbf
-\scriptscriptfont\bffam=\svtbf
-\setbox\strutbox=\hbox{\vrule height 18pt depth 7pt width 0pt}%
-\def\tt{\twtytt}\normalbaselines\rm}
+ \def\rm{\fam0\twtyrm}%
+ \def\it{\fam\itfam\twtyit}%
+ \def\sl{\fam\slfam\twtysl}%
+ \def\bf{\fam\bffam\twtybf}%
+ \def\smc{\twtyrm}%
+ \def\mit{\fam 1}%
+ \def\cal{\fam 2}%
+ \textfont0=\twtyrm \scriptfont0=\svtrm \scriptscriptfont0=\frtrm
+ \textfont1=\twtyi \scriptfont1=\svti \scriptscriptfont1=\frti
+ \textfont2=\twtysy \scriptfont2=\svtsy \scriptscriptfont2=\frtsy
+ \textfont3=\tenex \scriptfont3=\tenex \scriptscriptfont3=\tenex
+ \textfont\itfam=\twtyit \scriptfont\itfam=\svtit
+ \textfont\slfam=\twtysl \scriptfont\slfam=\svtsl
+ \textfont\bffam=\twtybf \scriptfont\bffam=\svtbf
+ \scriptscriptfont\bffam=\svtbf
+ \setbox\strutbox=\hbox{\vrule height 18pt depth 7pt width 0pt}%
+ \def\tt{\twtytt}\normalbaselines\rm}
+\def\twtypoint{\Twtypoint}
%
-\def\svtpoint{\Svtpoint}
\def\Svtpoint{\normalbaselineskip=21pt
-\def\rm{\fam0\svtrm}%
-\def\it{\fam\itfam\svtit}%
-\def\sl{\fam\slfam\svtsl}%
-\def\bf{\fam\bffam\svtbf}%
-\def\smc{\svtrm}%
-\def\mit{\fam 1}%
-\def\cal{\fam 2}%
-\textfont0=\svtrm \scriptfont0=\frtrm \scriptscriptfont0=\twlrm
-\textfont1=\svti \scriptfont1=\frti \scriptscriptfont1=\twli
-\textfont2=\svtsy \scriptfont2=\frtsy \scriptscriptfont2=\twlsy
-\textfont3=\tenex \scriptfont3=\tenex \scriptscriptfont3=\tenex
-\textfont\itfam=\svtit \scriptfont\itfam=\frtit
-\textfont\slfam=\svtsl \scriptfont\slfam=\frtsl
-\textfont\bffam=\svtbf \scriptfont\bffam=\frtbf
-\scriptscriptfont\bffam=\frtbf
-\setbox\strutbox=\hbox{\vrule height 14.5pt depth 6.5pt width 0pt}%
-\def\tt{\svttt}\normalbaselines\rm}
+ \def\rm{\fam0\svtrm}%
+ \def\it{\fam\itfam\svtit}%
+ \def\sl{\fam\slfam\svtsl}%
+ \def\bf{\fam\bffam\svtbf}%
+ \def\smc{\svtrm}%
+ \def\mit{\fam 1}%
+ \def\cal{\fam 2}%
+ \textfont0=\svtrm \scriptfont0=\frtrm \scriptscriptfont0=\twelverm
+ \textfont1=\svti \scriptfont1=\frti \scriptscriptfont1=\twelvei
+ \textfont2=\svtsy \scriptfont2=\frtsy \scriptscriptfont2=\twelvesy
+ \textfont3=\tenex \scriptfont3=\tenex \scriptscriptfont3=\tenex
+ \textfont\itfam=\svtit \scriptfont\itfam=\frtit
+ \textfont\slfam=\svtsl \scriptfont\slfam=\frtsl
+ \textfont\bffam=\svtbf \scriptfont\bffam=\frtbf
+ \scriptscriptfont\bffam=\frtbf
+ \setbox\strutbox=\hbox{\vrule height 14.5pt depth 6.5pt width 0pt}%
+ \def\tt{\svttt}\normalbaselines\rm}
+\def\svtpoint{\Svtpoint}
%
-\def\frtpoint{\Frtpoint}
\def\Frtpoint{\normalbaselineskip=17pt
-\def\rm{\fam0\frtrm}%
-\def\it{\fam\itfam\frtit}%
-\def\sl{\fam\slfam\frtsl}%
-\def\bf{\fam\bffam\frtbf}%
-\def\smc{\frtrm}%
-\def\mit{\fam 1}%
-\def\cal{\fam 2}%
-\textfont0=\frtrm \scriptfont0=\twlrm \scriptscriptfont0=\eightrm
-\textfont1=\frti \scriptfont1=\twli \scriptscriptfont1=\eighti
-\textfont2=\frtsy \scriptfont2=\twlsy \scriptscriptfont2=\eightsy
-\textfont3=\tenex \scriptfont3=\tenex \scriptscriptfont3=\tenex
-\textfont\itfam=\frtit \scriptfont\itfam=\twlit
-\textfont\slfam=\frtsl \scriptfont\slfam=\twlsl
-\textfont\bffam=\frtbf \scriptfont\bffam=\twlbf
-\scriptscriptfont\bffam=\twlbf
-\setbox\strutbox=\hbox{\vrule height 12pt depth 5pt width 0pt}%
-\def\tt{\frttt}\normalbaselines\rm}
+ \def\rm{\fam0\frtrm}%
+ \def\it{\fam\itfam\frtit}%
+ \def\sl{\fam\slfam\frtsl}%
+ \def\bf{\fam\bffam\frtbf}%
+ \def\smc{\frtrm}%
+ \def\mit{\fam 1}%
+ \def\cal{\fam 2}%
+ \textfont0=\frtrm \scriptfont0=\twelverm \scriptscriptfont0=\eightrm
+ \textfont1=\frti \scriptfont1=\twelvei \scriptscriptfont1=\eighti
+ \textfont2=\frtsy \scriptfont2=\twelvesy \scriptscriptfont2=\eightsy
+ \textfont3=\tenex \scriptfont3=\tenex \scriptscriptfont3=\tenex
+ \textfont\itfam=\frtit \scriptfont\itfam=\twelveit
+ \textfont\slfam=\frtsl \scriptfont\slfam=\twelvesl
+ \textfont\bffam=\frtbf \scriptfont\bffam=\twelvebf
+ \scriptscriptfont\bffam=\twelvebf
+ \setbox\strutbox=\hbox{\vrule height 12pt depth 5pt width 0pt}%
+ \def\tt{\frttt}\normalbaselines\rm}
+\def\frtpoint{\Frtpoint}
%
-\def\twlpoint{\Twlpoint}
\def\Twlpoint{\normalbaselineskip=14pt
-\def\rm{\fam0\twlrm}%
-\def\it{\fam\itfam\twlit}%
-\def\sl{\fam\slfam\twlsl}%
-\def\bf{\fam\bffam\twlbf}%
-\def\smc{\twlrm}%
-\def\mit{\fam 1}%
-\def\cal{\fam 2}%
-\textfont0=\twlrm \scriptfont0=\tenrm \scriptscriptfont0=\eightrm
-\textfont1=\twli \scriptfont1=\teni \scriptscriptfont1=\eighti
-\textfont2=\twlsy \scriptfont2=\tensy \scriptscriptfont2=\eightsy
-\textfont3=\tenex \scriptfont3=\tenex \scriptscriptfont3=\tenex
-\textfont\itfam=\twlit \scriptfont\itfam=\tenit
-\textfont\slfam=\twlsl \scriptfont\slfam=\tensl
-\textfont\bffam=\twlbf \scriptfont\bffam=\tenbf
-\scriptscriptfont\bffam=\tenbf
-\setbox\strutbox=\hbox{\vrule height 10pt depth 4pt width 0pt}%
-\def\tt{\twltt}\normalbaselines\rm}
+ \def\rm{\fam0\twelverm}%
+ \def\it{\fam\itfam\twelveit}%
+ \def\sl{\fam\slfam\twelvesl}%
+ \def\bf{\fam\bffam\twelvebf}%
+ \def\smc{\twelverm}%
+ \def\mit{\fam 1}%
+ \def\cal{\fam 2}%
+ \textfont0=\twelverm \scriptfont0=\tenrm \scriptscriptfont0=\eightrm
+ \textfont1=\twelvei \scriptfont1=\teni \scriptscriptfont1=\eighti
+ \textfont2=\twelvesy \scriptfont2=\tensy \scriptscriptfont2=\eightsy
+ \textfont3=\tenex \scriptfont3=\tenex \scriptscriptfont3=\tenex
+ \textfont\itfam=\twelveit \scriptfont\itfam=\tenit
+ \textfont\slfam=\twelvesl \scriptfont\slfam=\tensl
+ \textfont\bffam=\twelvebf \scriptfont\bffam=\tenbf
+ \scriptscriptfont\bffam=\tenbf
+ \setbox\strutbox=\hbox{\vrule height 10pt depth 4pt width 0pt}%
+ \def\tt{\twelvett}\normalbaselines\rm}
+\def\twlpoint{\Twlpoint}
+\def\twelvepoint{\Twlpoint}
%
\def\Tenpoint{\normalbaselineskip\tw@lv@\p@
-\def\rm{\fam\z@\tenrm}%
-\def\it{\fam\itfam\tenit}%
-\def\sl{\fam\slfam\tensl}%
-\def\bf{\fam\bffam\tenbf}%
-\let\smc\tenrm
-\def\mit{\fam\@ne}%
-\def\cal{\fam\tw@}%
-\textfont0\tenrm \scriptfont0\eightrm \scriptscriptfont0\eightrm
-\textfont1\teni \scriptfont1\eighti \scriptscriptfont1\eighti
-\textfont2\tensy \scriptfont2\eightsy \scriptscriptfont2\eightsy
-\textfont3\tenex \scriptfont3\tenex \scriptscriptfont3\tenex
-\textfont\itfam\tenit \scriptfont\itfam=\eightit
-\textfont\slfam\tensl \scriptfont\slfam=\eightsl
-\textfont\bffam\tenbf \scriptfont\bffam\eightbf
-\scriptscriptfont\bffam\eightbf
-\setbox\strutbox\hbox{\vrule\@height8\h@lf\p@\@depth3\h@lf\p@\@width\z@}%
-\let\tt\tentt \normalbaselines\rm}
+ \def\rm{\fam\z@\tenrm}%
+ \def\it{\fam\itfam\tenit}%
+ \def\sl{\fam\slfam\tensl}%
+ \def\bf{\fam\bffam\tenbf}%
+ \let\smc\tenrm
+ \def\mit{\fam\@ne}%
+ \def\cal{\fam\tw@}%
+ \textfont0\tenrm \scriptfont0\eightrm \scriptscriptfont0\eightrm
+ \textfont1\teni \scriptfont1\eighti \scriptscriptfont1\eighti
+ \textfont2\tensy \scriptfont2\eightsy \scriptscriptfont2\eightsy
+ \textfont3\tenex \scriptfont3\tenex \scriptscriptfont3\tenex
+ \textfont\itfam\tenit \scriptfont\itfam=\eightit
+ \textfont\slfam\tensl \scriptfont\slfam=\eightsl
+ \textfont\bffam\tenbf \scriptfont\bffam\eightbf
+ \scriptscriptfont\bffam\eightbf
+ \setbox\strutbox\hbox{\vrule\@height8\h@lf\p@\@depth3\h@lf\p@\@width\z@}%
+ \let\tt\tentt \normalbaselines\rm}
\let\tenpoint\Tenpoint
\def\Eightpoint{\normalbaselineskip\t@n\p@
-\def\rm{\fam\z@\eightrm}%
-\def\it{\fam\itfam\eightit}%
-\def\sl{\fam\slfam\eightsl}%
-\def\bf{\fam\bffam\eightbf}%
-\def\tt{\eighttt}
-\def\mit{\fam\@ne}%
-\def\cal{\fam\tw@}%
-\textfont0\eightrm \scriptfont0\eightrm \scriptscriptfont0\eightrm
-\textfont1\eighti \scriptfont1\eighti \scriptscriptfont1\eighti
-\textfont2\eightsy \scriptfont2\eightsy \scriptscriptfont2\eightsy
-\textfont3\tenex \scriptfont3\tenex \scriptscriptfont3\tenex
-\textfont\itfam\eightit
-\textfont\slfam\eightsl
-\textfont\bffam\eightbf \scriptfont\bffam\eightbf
-\scriptscriptfont\bffam\eightbf
-\setbox\strutbox\hbox{\vrule\@height\s@v@n\p@\@depth\thr@@\p@\@width\z@}%
-\normalbaselines\rm}
+ \def\rm{\fam\z@\eightrm}%
+ \def\it{\fam\itfam\eightit}%
+ \def\sl{\fam\slfam\eightsl}%
+ \def\bf{\fam\bffam\eightbf}%
+ \def\tt{\eighttt}
+ \def\mit{\fam\@ne}%
+ \def\cal{\fam\tw@}%
+ \textfont0\eightrm \scriptfont0\eightrm \scriptscriptfont0\eightrm
+ \textfont1\eighti \scriptfont1\eighti \scriptscriptfont1\eighti
+ \textfont2\eightsy \scriptfont2\eightsy \scriptscriptfont2\eightsy
+ \textfont3\tenex \scriptfont3\tenex \scriptscriptfont3\tenex
+ \textfont\itfam\eightit
+ \textfont\slfam\eightsl
+ \textfont\bffam\eightbf \scriptfont\bffam\eightbf
+ \scriptscriptfont\bffam\eightbf
+ \setbox\strutbox\hbox{\vrule\@height\s@v@n\p@\@depth\thr@@\p@\@width\z@}%
+ \normalbaselines\rm}
\def\eightpoint{\Eightpoint}
%
-\def\ninepoint{\Ninepoint}
\def\Ninepoint{\normalbaselineskip=10pt
-\def\rm{\fam0\ninerm}%
-\def\it{\fam\itfam\nineit}%
-\def\sl{\fam\slfam\ninesl}%
-\def\bf{\fam\bffam\ninebf}%
-\def\mit{\fam 1}%
-\def\cal{\fam 2}%
-\textfont0=\ninerm \scriptfont0=\ninerm \scriptscriptfont0=\ninerm
-\textfont1=\ninei \scriptfont1=\ninei \scriptscriptfont1=\ninei
-\textfont2=\ninesy \scriptfont2=\ninesy \scriptscriptfont2=\ninesy
-\textfont3=\tenex \scriptfont3=\tenex \scriptscriptfont3=\tenex
-\textfont\itfam=\nineit \scriptfont\itfam=\nineit
-\textfont\slfam=\ninesl \scriptfont\slfam=\ninesl
-\textfont\bffam=\ninebf \scriptfont\bffam=\ninebf
-\scriptscriptfont\bffam=\ninebf
-\setbox\strutbox=\hbox{\vrule height 7pt depth 3pt width 0pt}%
-\def\tt{\ninettt}\normalbaselines\rm}
+ \def\rm{\fam0\ninerm}%
+ \def\it{\fam\itfam\nineit}%
+ \def\sl{\fam\slfam\ninesl}%
+ \def\bf{\fam\bffam\ninebf}%
+ \def\mit{\fam 1}%
+ \def\cal{\fam 2}%
+ \textfont0=\ninerm \scriptfont0=\ninerm \scriptscriptfont0=\ninerm
+ \textfont1=\ninei \scriptfont1=\ninei \scriptscriptfont1=\ninei
+ \textfont2=\ninesy \scriptfont2=\ninesy \scriptscriptfont2=\ninesy
+ \textfont3=\tenex \scriptfont3=\tenex \scriptscriptfont3=\tenex
+ \textfont\itfam=\nineit \scriptfont\itfam=\nineit
+ \textfont\slfam=\ninesl \scriptfont\slfam=\ninesl
+ \textfont\bffam=\ninebf \scriptfont\bffam=\ninebf
+ \scriptscriptfont\bffam=\ninebf
+ \setbox\strutbox=\hbox{\vrule height 7pt depth 3pt width 0pt}%
+ \def\tt{\ninettt}\normalbaselines\rm}
+\def\ninepoint{\Ninepoint}
% GENERAL FOOTNOTES
diff --git a/Master/texmf-dist/tex/generic/musixtex/musixtex.tex b/Master/texmf-dist/tex/generic/musixtex/musixtex.tex
index 3dee4a2e36d..2ae5713117f 100644
--- a/Master/texmf-dist/tex/generic/musixtex/musixtex.tex
+++ b/Master/texmf-dist/tex/generic/musixtex/musixtex.tex
@@ -16,21 +16,6 @@
% the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
% Boston, MA 02111-1307, USA.
%
-% 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
-%
%
\ifx\undefined\startpiece \else \endinput \fi
\edef\catcodeat{\the\catcode`\@}\catcode`\@=11
@@ -40,15 +25,42 @@
\def\mufl@x{0.83}%
\def\mxmajorvernumber{1}
-\def\mxminorvernumber{15}
+\def\mxminorvernumber{16}
\def\mxvernumber{\mxmajorvernumber\mxminorvernumber}% make it possible to compare with \ifnum
\def\mxversuffix{}%
\edef\mxversion{\mxmajorvernumber.\mxminorvernumber\mxversuffix}
-\def\mxdate{3 April 2011}
+\def\mxdate{2015-02-27}
\immediate\write16{MusiXTeX(c) \mxversion\space<\mxdate>}%
\everyjob{\immediate\write16{MusiXTeX(c) \mxversion\space<\mxdate>}}%
+% T116:
+
+% HM corrected the definitions for cautionary small accidentals
+
+% RDT added \check@staff ... \fi to \@qa h, \@mca, \hs, \qqs
+% so that \qa, \ca, \ha, etc. can be "hidden" using \setstaffs{n}{0}
+
+% RDT incorporated tuplet.tex (approved by George Sicherman)
+% and introduced \txtfont to allow changing size or style
+
+% RDT introduced
+% \qqsk, a one-quarter notehead skip
+% \tqu and \tql, synonyms for \tqh and \tqb
+% \ztqu and \ztql, synonyms for \ztqh and \ztqb
+% \hpp, \qpp, \dsp, \qsp, \hsp, \qqsp for pointed rests
+% \nnotes, \nnnotes: abbreviations with \multnoteskip\smallvalue
+% and \multnoteskip\tinyvalue spacing
+% \zcn, \ccn, \lcn, synomyms for \zcharnote etc.
+
+% RDT incorporated curly.tex (approved by Mthimkhulu Molekwa)
+
+% RDT modernized the treatment of text fonts
+% meterfonts must be bf, even if titling fonts are rm or sc
+% added dynamic-mark macros \sfz \sfzp
+
+% T115:
+
% moved out:
% - 1/128th beams -> musixbm
% - triple pointed notes -> musixtri
@@ -514,234 +526,129 @@
%%% fonts
-%%
-% Font package for Musixtex.
-%
-% Ross Mitchell
-% February 1995
-%%
+\newif\iflongDCfontnames
+\newif\iflongECfontnames
+\longDCfontnamesfalse % obsolete
+\longECfontnamesfalse % to use EC fonts, \input musixec
+\def\fontid{cm} % deprecated but used in pmx.tex
%%
-% Find current font prefix (cm, dc, ec)
+% Seven point fonts: roman, bold, and italic.
%%
-\def\@onetoks#1#2+{#1}
-\def\@secondtoks#1#2#3+{#2}
-\def\@twotoks#1#2#3+{#1#2}
-\def\@svntoks#1#2#3#4#5#6#7#8+{#7}
-\rm
-\edef\fontid{\expandafter\@twotoks\fontname\the\font+}
-\edef\DynFontId{\fontid}
-\edef\fontfid{\expandafter\@onetoks\fontname\the\font+}
-\edef\fontsid{\expandafter\@secondtoks\fontname\the\font+}
-%
-% Find out whether \rm font name of the form dcr1000 , i.e. with a digit at
-% 7th position
-\edef\Thelastfontname{\expandafter\@svntoks\fontname\the\font---------+}
-
-\newif\iflongDCfontnames
-\newif\iflongECfontnames
-\if\Thelastfontname 0 \longDCfontnamestrue\fi
-\if\Thelastfontname 1 \longDCfontnamestrue\fi
-\if\Thelastfontname 2 \longDCfontnamestrue\fi
-\if\Thelastfontname 3 \longDCfontnamestrue\fi
-\if\Thelastfontname 4 \longDCfontnamestrue\fi
-\if\Thelastfontname 5 \longDCfontnamestrue\fi
-\if\Thelastfontname 6 \longDCfontnamestrue\fi
-\if\Thelastfontname 7 \longDCfontnamestrue\fi
-\if\Thelastfontname 8 \longDCfontnamestrue\fi
-\if\Thelastfontname 9 \longDCfontnamestrue\fi
-\iflongDCfontnames
- \if\fontfid e
- \longECfontnamestrue
- \longDCfontnamesfalse
- \fi
- \if\fontfid r
- \if\fontsid x
- \longECfontnamestrue
- \longDCfontnamesfalse
- \def\DynFontId{cm}
- \fi
- \fi
+\ifx\undefined\sevenrm
+ \font\sevenrm=cmr7
+ \font\sevenbf=cmbx7
+ \font\sevenit=cmti7
\fi
%%
-% Eight point fonts: roman, bold, and italic.
+% Eight point fonts: roman, bold, and italic; tt and sl needed for musixsty
%%
\ifx\undefined\eightrm
-\iflongDCfontnames
- \font\eightrm=\fontid r0800
- \font\eightbf=\fontid bx0800
- \font\eightit=\fontid ti0800
-\else\iflongECfontnames
- \font\eightrm=\fontid rm0800
- \font\eightbf=\fontid bx0800
- \font\eightit=\fontid ti0800
-\else
- \font\eightrm=\fontid r8
- \font\eightbf=\fontid bx8
- \font\eightit=\fontid ti8
-\fi
-\fi
+ \font\eightrm=cmr8
+ \font\eightbf=cmbx8
+ \font\eightit=cmti8
+ \font\eighttt=cmtt8
+ \font\eightsl=cmsl8
\fi
%%
-% Nine point fonts: roman, bold, and italic.
+% Nine point fonts
%%
\ifx\undefined\ninerm
-\iflongDCfontnames
- \font\ninerm=\fontid r0900
- \font\ninebf=\fontid bx0900
- \font\nineit=\fontid ti0900
-\else\iflongECfontnames
- \font\ninerm=\fontid rm0900
- \font\ninebf=\fontid bx0900
- \font\nineit=\fontid ti0900
-\else
- \font\ninerm=\fontid r9
- \font\ninebf=\fontid bx9
- \font\nineit=\fontid ti9
-\fi
-\fi
+ \font\ninerm=cmr9
+ \font\ninebf=cmbx9
+ \font\nineit=cmti9
+ \font\ninett=cmtt9
+ \font\ninesl=cmsl9
\fi
%%
-% Ten point fonts: roman, bold, and italic and typewriter.
-% Load only if not already defined (Necessary in Latex2e).
+% Ten point fonts
%%
\ifx\undefined\tenrm
-\iflongDCfontnames
- \font\tenrm=\fontid r1000
- \font\tenbf=\fontid bx1000
- \font\tenit=\fontid ti1000
-\else\iflongECfontnames
- \font\tenrm=\fontid rm1000
- \font\tenbf=\fontid bx1000
- \font\tenit=\fontid ti1000
-\else
- \font\tenrm=\fontid r10
- \font\tenbf=\fontid bx10
- \font\tenit=\fontid ti10
-\fi
-\fi
+ \font\tenrm=cmr10
+ \font\tenbf=cmbx10
+ \font\tenit=cmti10
+ \font\tentt=cmtt10
+ \font\tensl=cmsl10
\fi
+
%%
-% Twelve point fonts: roman, bold, and italic.
+% Eleven point fonts
%%
-\ifx\undefined\twelverm
-\iflongDCfontnames
- \font\twelverm=\fontid r1200
- \font\twelvebf=\fontid bx1200
- \font\twelveit=\fontid ti1200
-\else\iflongECfontnames
- \font\twelverm=\fontid rm1200
- \font\twelvebf=\fontid bx1200
- \font\twelveit=\fontid ti1200
-\else
- \font\twelverm=\fontid r12
- \font\twelvebf=\fontid bx12
- \font\twelveit=\fontid ti12
-\fi
-\fi
+\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
%%
-% Large fonts for titles: boldface only.
+% Twelve point fonts
%%
-\ifx\bigfont\undefined
-\iflongDCfontnames
-\font\bigfont=\fontid bx1440 % 14pt, formerly \moyen.
-\else\iflongECfontnames
-\font\bigfont=\fontid bx1440 % 14pt, formerly \moyen.
-\else
-\font\bigfont=\fontid bx12 scaled \magstep1 % 14pt, formerly \moyen.
-\fi
-\fi
-\fi
-
-\ifx\Bigfont\undefined
-\iflongDCfontnames
-\font\Bigfont=\fontid bx1728 % 17pt, formerly \gros.
-\else\iflongECfontnames
-\font\Bigfont=\fontid bx1728 % 17pt, formerly \gros.
-\else
-\font\Bigfont=\fontid bx12 scaled \magstep2 % 17pt, formerly \gros.
-\fi
-\fi
+\ifx\undefined\twelverm
+ \font\twelverm=cmr12
+ \font\twelvebf=cmbx12
+ \font\twelveit=cmti12
+ \font\twelvett=cmtt12
+ \font\twelvesl=cmsl12
\fi
-\ifx\BIgfont\undefined
-\iflongDCfontnames
-\font\BIgfont=\fontid bx2074 % 20pt, formerly \gros.
-\else\iflongECfontnames
-\font\BIgfont=\fontid bx2074 % 20pt, formerly \gros.
-\else
-\font\BIgfont=\fontid bx12 scaled \magstep3 % 20pt.
-\fi
-\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
-
-\ifx\BIGfont\undefined
-\iflongDCfontnames
-\font\BIGfont=\fontid bx2488 % 25pt, formerly \enorme.
-\else\iflongECfontnames
-\font\BIGfont=\fontid bx2488 % 25pt, formerly \enorme.
-\else
-\font\BIGfont=\fontid bx12 scaled \magstep4 % 25pt, formerly \emorme.
+%
+% 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
+%
+% 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
+%
+% 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
-
-%%
-% Bold italic fonts for dynamic markings.
+%
+% 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
+%
%%
-
-\iflongDCfontnames
-\font\ppffsixteen=\DynFontId bi1000
-\font\ppfftwenty=\DynFontId bi1200
-\font\ppfftwentyfour=\DynFontId bi1440
-\font\ppfftwentynine=\DynFontId bi1728
-\font\smallppff=\DynFontId bi1000
-\font\normppff=\DynFontId bi1200
-\font\medppff=\DynFontId bi1440
-\else\iflongECfontnames
-\font\ppffsixteen=\DynFontId bi1000
-\font\ppfftwenty=\DynFontId bi1200
-\font\ppfftwentyfour=\DynFontId bi1440
-\font\ppfftwentynine=\DynFontId bi1728
-\font\smallppff=\DynFontId bi1000
-\font\normppff=\DynFontId bi1200
-\font\medppff=\DynFontId bi1440
-\else
-\font\ppffsixteen=\DynFontId bxti10
-\font\ppfftwenty=\DynFontId bxti10 scaled \magstep1
-\font\ppfftwentyfour=\DynFontId bxti10 scaled \magstep2
-\font\ppfftwentynine=\DynFontId bxti10 scaled \magstep3
-\font\smallppff=\DynFontId bxti10
-\font\normppff=\DynFontId bxti10 scaled \magstep1
-\font\medppff=\DynFontId bxti10 scaled \magstep2
-\fi
-\fi
-
-\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}
-
-\font\musiceleven=musix11
-\font\musicthirteen=musix13
-\font\musicsixteen=musix16
-\font\musictwenty=musix20
-\font\musictwentyfour=musix24
-\font\musictwentynine=musix29
-
-% piano brackets, slides, guitar chords, lines, (de)crescendi, circles
-
-\font\mxsps=musixspx
-
%%
% Define six font families.
%%
@@ -786,6 +693,34 @@
\let\bf\BIGfont
\let\it\BIGfont
\bf}
+%
+%%
+% Bold italic fonts for dynamic markings.
+%%
+
+\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}
+
+\font\musiceleven=musix11
+\font\musicthirteen=musix13
+\font\musicsixteen=musix16
+\font\musictwenty=musix20
+\font\musictwentyfour=musix24
+\font\musictwentynine=musix29
+
+% piano brackets, slides, guitar chords, lines, (de)crescendi, circles
+
+\font\mxsps=musixspx
+
%%%
%
@@ -1594,7 +1529,7 @@
\def\Largemusicsize{\musicsize\@xxix \comput@specifics
\afterruleskip\t@n\p@ \elemskip\fontdimen\si@\musicnorfont \clef@skip\z@}
-\def\comput@fonts{%
+\def\comput@fonts{%
\ifnum\musicsize=\sixt@@n
\let\musicLargefont\musictwentyfour
\let\musiclargefont\musictwenty
@@ -1608,9 +1543,9 @@
\let\xgregtinyfont\xgregeleven
\let\slurd\slurdsixteen \let\sluru\slurusixteen
\let\hslurd\hslurdsixteen \let\hsluru\hslurusixteen
- \let\meternorfont\tenbf \let\metersmallfont\eightbf
- \let\meterbigfont\twelvebf \let\meterlargefont\bigfont
- \let\meterLargefont\Bigfont
+ \let\meternorfont\tenbf \let\metersmallfont\eightbf % T116 RDT
+ \let\meterbigfont\twelvebf \let\meterlargefont\frtbf
+ \let\meterLargefont\svtbf
\let\ppff\ppffsixteen
\else\ifnum\musicsize=\@xxiv
\let\musicLargefont\musictwentynine
@@ -1625,9 +1560,9 @@
\let\xgregtinyfont\xgregsixteen
\let\sluru\slurutwenty \let\slurd\slurdtwenty
\let\hsluru\hslurutwenty \let\hslurd\hslurdtwenty
- \let\meternorfont\bigfont \let\metersmallfont\twelvebf
- \let\meterbigfont\Bigfont \let\meterlargefont\BIgfont
- \let\meterlargefont\BIGfont
+ \let\meternorfont\frtbf \let\metersmallfont\twelvebf % T116 RDT
+ \let\meterbigfont\svtbf \let\meterlargefont\twtybf
+ \let\meterlargefont\twfvbf
\let\ppff\ppfftwentyfour
\else\ifnum\musicsize=\@xxix
\let\musicLargefont\musictwentynine
@@ -1644,9 +1579,9 @@
\let\hsluru\hslurutwenty \let\hslurd\hslurdtwenty
\let\slurud\slurutwentyd \let\slurdd\slurdtwentyd % +ickd
\let\hslurud\hslurutwentyd \let\hslurdd\hslurdtwentyd %+ickd
- \let\meternorfont\Bigfont \let\metersmallfont\bigfont
- \let\meterbigfont\BIgfont \let\meterlargefont\BIGfont
- \let\meterLargefont\BIGfont
+ \let\meternorfont\svtbf \let\metersmallfont\frtbf % T116 RDT
+ \let\meterbigfont\twtybf \let\meterlargefont\twfvbf
+ \let\meterLargefont\twfvbf
\let\ppff\ppfftwentynine
\else
\ifnum\musicsize=\tw@nty
@@ -1667,13 +1602,14 @@
\let\xgregtinyfont\xgregthirteen
\let\sluru\slurutwenty \let\slurd\slurdtwenty
\let\hsluru\hslurutwenty \let\hslurd\hslurdtwenty
- \let\meternorfont\twelvebf \let\metersmallfont\tenbf
- \let\meterbigfont\bigfont \let\meterlargefont\Bigfont
- \let\meterLargefont\BIgfont
+ \let\meternorfont\twelvebf \let\metersmallfont\tenbf % T116 RDT
+ \let\meterbigfont\frtbf \let\meterlargefont\svtbf
+ \let\meterLargefont\twtybf
\let\ppff\ppfftwenty
\fi\fi\fi
}%
+
\def\comput@specifics{\comput@fonts\comput@sizes}
\def\comput@sizes{%
@@ -1822,7 +1758,7 @@
\def\writezbarno{a}
\def\barnoadd{\ifx\z@sw\@ne \writezbarno \fi}
-% supress the beginning vertical rule for one line sheets
+% suppress the beginning vertical rule for single-staff scores
\def\startrule{\let\b@rule\empty}
\def\nostartrule{\let\b@rule\z@}
@@ -3200,7 +3136,9 @@
\else
\let\st@m\upst@m
\fi
- \let\n@fon\@qa \let\n@sym\q@u \y@v\qn@width \writ@note}
+ \check@staff % T116
+ \let\n@fon\@qa \let\n@sym\q@u \y@v\qn@width \writ@note
+ \fi}
\def\@qu{\let\st@m\upst@m \g@q}
\def\@ql{\let\st@m\downst@m \g@q}
@@ -3258,7 +3196,9 @@
\else
\let\st@m\up@flag \advance\n@vii -\fiv@\relax
\fi
- \let\n@fon\@mca \let\n@sym\q@u \y@v\qn@width \writ@note}
+ \check@staff % T116
+ \let\n@fon\@mca \let\n@sym\q@u \y@v\qn@width \writ@note
+ \fi}
\def\@cu{\n@vii\@xl \let\st@m\up@flag \g@q}
\def\@ccu{\n@vii\@xli \let\st@m\up@flag \g@q}
@@ -3442,9 +3382,13 @@
\def\zqbpp{\advancefalse\qbpp}
\def\tqh{\q@symbol\@tqh}
+\def\tqu{\q@symbol\@tqh} % T116 RDT
\def\tqb{\q@symbol\@tqb}
+\def\tql{\q@symbol\@tqb} % T116 RDT
\def\ztqh{\advancefalse\q@symbol\@tqh}
+\def\ztqu{\advancefalse\q@symbol\@tqh} % T116 RDT
\def\ztqb{\advancefalse\q@symbol\@tqb}
+\def\ztql{\advancefalse\q@symbol\@tqb} % T116 RDT
%%% grace notes
@@ -3820,16 +3764,22 @@
\advance\lift@rest -2.5\fontdimen\fiv@\musixfont
\raise\lift@rest\hbox\@to\noteskip{#1\hss}}\advance\locx@skip\noteskip}
-\def\qp{\check@staff
- \adv@restbox{\musixchar62}\fi}
+\def\qp{\adv@restbox{\check@staff\musixchar62\fi}}
\let\soupir\qp
-\def\ds@oup{\check@staff
- \adv@restbox{\musixchar63}\fi}
-\def\qs{\check@staff
- \adv@restbox{\musixchar64}\fi}
-\def\hs{\adv@restbox{\musixchar65}}
-\def\qqs{\adv@restbox{\musixchar66}}
+\def\ds@oup{\adv@restbox{\check@staff\musixchar63\fi}}
+\def\qs{\adv@restbox{\check@staff\musixchar64\fi}}
+\def\hs{\adv@restbox{\check@staff\musixchar65\fi}}
+\def\qqs{\adv@restbox{\check@staff\musixchar66\fi}}
+
+% pointed rests T116 RDT
+\def\qpp{\adv@restbox{\check@staff\pt5\musixchar62\fi}}
+\def\dsp{\adv@restbox{\check@staff\pt5\musixchar63\fi}}
+\def\qsp{\adv@restbox{\check@staff\pt5\musixchar64\fi}}
+\def\hsp{\adv@restbox{\check@staff\pt5\musixchar65\fi}}
+\def\qqsp{\adv@restbox{\check@staff\pt5\musixchar66\fi}}
+
+\let\hpp\hpausep
%%% accidentals
@@ -3863,8 +3813,6 @@
\def\@sa{\ifnum\n@vii=\maxdimen \C@ChaR \musixchar\n@v \kern.3\qn@width
\else \musixchar\n@v \fi \n@vii\z@}
-\def\writ@sa{\pl@base\raise\y@i\llap{\@sa\kern\accshift}}
-\def\set@sa{\let\@Ti\writ@sa \n@iv\fiv@ \n@vi\@xl }
\def\smallna{\set@sa \let\@Tii\@Na \n@v\f@ur \C@acc}
\def\smallfl{\set@sa \let\@Tii\@Fl \n@v\z@ \C@acc}
@@ -3872,11 +3820,16 @@
\def\smalldfl{\set@sa \n@iv\si@ \let\@Tii\@dFl \n@v\@ne \C@acc}
\def\smalldsh{\set@sa \let\@Tii\@dSh \n@v\thr@@ \C@acc}
-\def\cna{\n@vii\maxdimen \smallna}
-\def\cfl{\n@vii\maxdimen \smallfl}
-\def\csh{\n@vii\maxdimen \smallsh}
-\def\cdfl{\n@vii\maxdimen \smalldfl}
-\def\cdsh{\n@vii\maxdimen \smalldsh}
+\def\cna{\set@ca \let\@Tii\@Na \n@v\f@ur \C@acc} % T116 HM
+\def\cfl{\set@ca \let\@Tii\@Fl \n@v\z@ \C@acc}
+\def\csh{\set@ca \let\@Tii\@Sh \n@v\tw@ \C@acc}
+\def\cdfl{\set@ca \n@iv\si@ \let\@Tii\@dFl \n@v\@ne \C@acc}
+\def\cdsh{\set@ca \let\@Tii\@dSh \n@v\thr@@ \C@acc}
+%
+\def\writ@sa{\pl@base\raise\y@i\llap{\musixchar\n@v\kern\accshift}}
+\def\set@sa{\let\@Ti\writ@sa \n@iv\fiv@ \n@vi\@xl }
+\def\writ@ca{\pl@base\raise\y@i\llap{\C@ChaR \musixchar\n@v\kern.3\qn@width\kern\accshift}}
+\def\set@ca{\let\@Ti\writ@ca \n@iv\fiv@ \n@vi\@xl }
\def\writ@ua{\advance\n@i\thr@@ \zchar\n@i{\kern\qu@rt\qn@width\@sa}}
\def\set@upper{\let\@Ti\writ@ua \n@iv\fiv@ \n@vi\@xl }
@@ -4034,14 +3987,12 @@
% The next macros puts triplets (and others def'd with \txt) on beams
-\def\txt{\eightit3}
-
\def\butext#1{\txt@ff\qn@width
- \def\balk@accent{\uplap{\lrlap{\kern\tw@\txt@ff\txt}\kern\internote}}%
+ \def\balk@accent{\uplap{\lrlap{\kern\tw@\txt@ff\txtfont\txt}\kern\internote}}%
\acc@ubalk{#1}\txt@ff\h@lf\qn@width \let\balk@accent\C@ChaR}
\def\bltext#1{\txt@ff\z@
- \def\balk@accent{\vbox\@to\z@{\kern\internote\lrlap\txt\vss}}%
+ \def\balk@accent{\vbox\@to\z@{\kern\internote\txtfont\lrlap\txt\vss}}%
\acc@lbalk{#1}\txt@ff\h@lf\qn@width \let\balk@accent\C@ChaR}
%%% end of accents on beams (correction proposed by Klaus Bechert)
@@ -4198,7 +4149,7 @@
\def\octnumberup{\octnumberdefault\vrule width 0pt height2ex}
\def\octnumberdefault{\ppffsixteen8}
-\def\octnumberdown{\octnumberdefault$^a$\eightit\kern 0.3em bassa\vrule width 0pt depth \Internote}
+\def\octnumberdown{\octnumberdefault$^a$\txtfont\kern 0.3em bassa\vrule width 0pt depth \Internote}
\def\octfinup{\check@staff
\n@v\@xxiii\n@ii\@xxiv\global\o@swz={\@ne}\fi
@@ -4298,11 +4249,148 @@
\def\metron#1#2{{\stemlength\f@ur\noteskip\t@n\p@ #1 1\ = #2}}
\def\metronequiv#1#2{{\stemlength\f@ur\noteskip\t@n\p@ #1 1\ = #2 1}}
+
+\def\txtfont{\eightit} % T116 RDT
+\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{\eightit#1}}}
+ \zcharnote{#2}{\kern\h@lf\qn@width\kern \half@sign@skip\lrlap{\txtfont#1\/\/}}}
\def\triolet{\xtuplet3}
+%
+% Following definitions based on tuplet.tex - conventional tuplet brackets for MusiXTeX.
+% Col. G. L. Sicherman. Last revised 2003-05-17.
+%
+% Added to musixtex.tex T116 by RDT.
+%
+% Standard MusiXTeX uses \uptrio and \downtrio to print tuplet brackets.
+% We define \uptuplet and \downtuplet, with the same arguments:
+%
+% #1 : starting pitch
+% #2 : width of bracket, in (\noteskip)s
+% #3 : slope of bracket, in multiples of 1-1/8 degrees
+%
+% The user defines the text to appear in the opening as \tuplettxt.
+% This is to avoid conflicting with the \txt in standard MusiXTeX.
+%
+% Examples:
+%
+% Draw a triplet bracket over the notes, starting at pitch "p",
+% 1.25\noteskip wide, with a slope up of 3-3/8 degrees:
+%
+% \uptuplet p{1.25}3
+%
+% Draw a sextuplet bracket under the notes, starting at pitch "a",
+% 2.5\noteskip wide, with a slope down of 4-1/2 degrees:
+%
+% \def\tuplettxt{6\/\/}
+% \downtuplet{a}{2.5}{-4}
+%
+% Send comments, complaints, and bouquets to the Colonel at
+% <colonel@monmouth.com>.
+%
+
+% Standard MusiXTeX prints a small "3" (or other number) within
+% the bracket. Here we print the "3" in an opening in the bracket,
+% so we need not use a small font.
+%
+% The double italic correction compensates for centering the number
+% on the bracket line.
+
+\def\tuplettxt{3\/\/}
+
+%%% The rest is adapted from standard MusixTeX.
+
+\newdimen\y@vii % x of right end of left part of bracket.
+\newdimen\y@viii % x of left end of right part of bracket.
+\newdimen\y@ix
+\newbox\tuptxtb@x
+
+% v@rline #1=height[dimen] #2=length[dimen] #3=slope (1\eqiv 1.125degree)
+% (comments and ideas from Ian Collier) (from -20 upto 20 )
+% This macro is used by some of the others which follow,
+% using it directly it must be set in zero box
+
+\def\v@rline#1#2#3{\n@v#3\y@i#2%
+ \setbox\tuptxtb@x\hbox{\hskip1pt\txtfont\tuplettxt\hskip1pt}%
+ \y@vii=\h@lf\y@i\advance\y@vii-\h@lf\wd\tuptxtb@x%
+ \n@ii-\tw@nty \min@n@v\n@ii
+ \max@n@v\tw@nty \n@iii\n@v
+ \ifnum\n@v<\z@ \n@v-\n@v \advance\n@v\tw@nty \fi % offset to lower linechars
+ \advance\n@v\@xxix
+ \setbox\ch@box\hbox{\mxsps\char\n@v}%
+ \ifdim\y@vii<\wd\ch@box \y@vii\wd\ch@box\fi% At least one whole segment!
+ \y@viii=\y@i\advance\y@viii-\y@vii%
+ \y@iv\wd\ch@box \y@ii\qu@rt\p@ \y@ii\n@iii\y@ii \y@iii\z@
+ \raise#1\internote\hbox{\mxsps\char\n@iv
+%
+% Build bracket with slanted line segments of width 10pt.
+% Left part of bracket:
+%
+ \loop\ifdim\y@iv<\y@vii\raise\y@iii\copy\ch@box
+ \advance\y@iv\wd\ch@box \advance\y@iii\y@ii \repeat
+%
+% last element
+%
+% \finalheight=2.5\completewidth
+% \finalheight=\n@iii\finalheight
+% \divide\finalheight by 100
+% \advance\overlapwidth by -\completewidth
+% \stepheight=-2.5\overlapwidth
+% \stepheight=\n@iii\stepheight
+% \divide\stepheight by 100
+% \advance\curheight by \stepheight
+% \kern -\overlapwidth \raise\curheight \box\ch@box
+%
+ \y@ix=\y@vii\advance\y@ix-\y@iv\hbox to\y@ix{\hss}%
+ \y@ix\y@vii\advance\y@ix-\wd\ch@box%
+ \y@iii\n@iii\y@ix\y@iii2\h@lf\y@iii\divide\y@iii\@c\raise\y@iii\copy\ch@box%
+%
+% Text:
+%
+ \y@v2\h@lf\y@i \y@v\n@iii\y@v \divide\y@v\@c%
+ \y@ix=-\y@vii \advance\y@ix\h@lf\y@i \advance\y@ix-\h@lf\wd\tuptxtb@x%
+ \hbox to\y@ix{\hss}%
+ \y@iii\h@lf\y@v \raise\y@iii\vbox to\z@{%
+ \vss{\copy\tuptxtb@x}\vss}
+ \y@ix=\y@viii \advance\y@ix-\h@lf\y@i \advance\y@ix-\h@lf\wd\tuptxtb@x
+ \hbox to\y@ix{\hss}% To start of right part. No-op unless bracket is short.
+%
+% Right part of bracket:
+%
+ \y@iii2\h@lf\y@viii \y@iii\n@iii\y@iii \divide\y@iii\@c%
+ \y@iv=\y@viii \advance\y@iv\wd\ch@box%
+ \loop\ifdim\y@iv<\y@i\raise\y@iii\copy\ch@box%
+ \advance\y@iv\wd\ch@box \advance\y@iii\y@ii \repeat
+%
+% Finish off the right part:
+%
+ \y@iii\y@i\advance\y@iii-\wd\ch@box\y@iii2\h@lf\y@iii\y@iii\n@iii\y@iii%
+ \y@ix=\y@i\advance\y@ix-\y@iv\hbox to\y@ix{\hss}%
+ \divide\y@iii\@c%
+ \raise\y@iii\copy\ch@box%
+%
+ \raise\y@v\hbox{\mxsps\char\n@iv}}}
+%
+% y@i =complete length
+% y@ii =height of linechar
+% y@iii =current height
+% y@iv =current width
+% y@v =height of ending line
+% y@vii =width of left segment of bracket
+% y@viii=y@vii + width of opening
+% y@ix =adjustment register
+%
+% n@iii=slope
+% n@iv =(number of char for hooks)
+% n@v =slope (number of linechar)
+
+\def\X@bkt#1#2#3{\y@v#2\noteskip \advance\y@v\wn@width
+ \inhgetn@i#1\relax \rlap{\kernm\p@ne\qn@width\v@rline\n@i\y@v{#3}}}
+
+\def\uptuplet{\n@iv22\X@bkt}
+\def\downtuplet{\n@iv21\X@bkt}
+
%\check
\def\zbreath{\check@staff\raise\si@\internote\rlap{\BIGfont'}\fi}
@@ -4341,6 +4429,8 @@
\def\pp{{\ppff p\p@kern p}}
\def\ppp{{\ppff p\p@kern p\p@kern p}}
\def\pppp{{\ppff p\p@kern p\p@kern p\p@kern p}}
+\def\sfz{{\ppff s\p@kern f\f@kern z}} % T116
+\def\sfzp{{\ppff s\p@kern f\f@kern z\p@kern p}} % T116
%%% spacings
@@ -4364,6 +4454,7 @@
% Otherwise, over/underfull boxes will occur on rescaled (pass 2) material
%%
+\def\qqsk{\off{\qu@rt\@l@mskip}} % T116 RDT
\def\hqsk{\off{\h@lf\@l@mskip}}
\def\qsk{\off\@l@mskip}
@@ -4401,6 +4492,10 @@
\def\NOTEsp{\vnotes9.52\elemskip}% 1th
\def\NOTES{\vnotes11.32\elemskip}% 1th
}%
+
+\def\nnotes{\notes\multnoteskip\smallvalue} % T116 RDT
+\def\nnnotes{\notes\multnoteskip\tinyvalue} % T116 RDT
+
\arithmeticskipscale
\def\scale#1{\def\scalenoteskip{#1}}
@@ -4461,6 +4556,10 @@
\def\hcharnote{\let\@Ti\hard@box \C@ch}
\def\charnote#1#2{\zcharnote{#1}{#2}\sk}
+\def\zcn{\zcharnote} % T116
+\def\ccn{\ccharnote}
+\def\lcn{\lcharnote}
+
\def\C@ch#1#2{\check@staff\inhgetn@i#1\relax\pl@base\raise\y@i\@Ti{#2}\fi}
\def\zmidstaff{\let\@Ti\rlap \C@mid}
@@ -4541,7 +4640,7 @@
% text in the middle
\ifx\@text\@ne \ifnum\n@vi=\@ne \y@iii\p@ \else\y@iii-\p@ \fi
\advance\y@iii\h@lf\y@v \kernm\h@lf\y@i\raise\y@iii\vbox\@to\z@{%
- \ifnum\n@vi=\@ne \vss \fi\lrlap\txt\ifnum\n@vi=\@ne \else\vss \fi}\fi}%
+ \ifnum\n@vi=\@ne \vss \fi\lrlap{\txtfont\txt}\ifnum\n@vi=\@ne \else\vss \fi}\fi}%
\let\@hook\empty \let\@text\empty}
%
% y@i =complete length
@@ -4722,6 +4821,54 @@
\count@\akk@count\relax \advance\count@\@ne \edef\akk@count{\the\count@}}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% This is MusiXTex code for multiple left curly brackets %
+% %
+% submitted by Mthimkhulu Molekwa %
+% to the mutex list on 19 May 1999 %
+% %
+% %
+% usage: %
+% \curlybrackets{<instrument1lower><instrument1upper> %
+% <instrument2lower><instrument2upper> %
+% ... %
+% <instrument_n_lower><instrument_n_upper> %
+% } %
+% %
+% %
+% %
+% This version corrected 07/23/2007 by Rainer Dunker to make it %
+% insensitive to changes in \interstaff by PMX %
+% %
+% Added to musixtex.tex T116 by RDT %
+% %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\let\origin@lwrit@staffs\writ@staffs
+\def\writ@staffs{%
+ \origin@lwrit@staffs
+ \ifx\br@cks\empty\else\expandafter\@bracks\br@cks\ende\fi}
+
+\let\br@cks\empty
+\def\curlybrackets#1{\def\br@cks{#1}}
+
+\def\@bracks#1#2#3\ende{%
+ \ifnum #1<#2 %=========================== inserted by D.S.(?)
+ \noinstrum@nt=#1\s@l@ctinstr\b@zi\altitude
+ \noinstrum@nt=#2\s@l@ctinstr\b@zii\altitude
+ \advance\b@zii-\b@zi
+ \C@Inter
+ \advance\b@zii\nblines\internote
+ \advance\b@zii\nblines\internote
+ \advance\b@zii-2\internote
+ \n@v\b@zii \sp@pt\tw@ \advance\n@v\@cxxviii
+ \divide\b@zii\tw@
+ \advance\b@zi\b@zii
+ \raise\b@zi\rlap{\mxsps\char\n@v\kern\instrum@in@group}%
+ \fi %==================================== inserted by D.S.(?)
+ \ifx\empty#3\else\@bracks#3\ende\fi}
+
+
%%
% Define \pass@I to perform the following functions:
%
diff --git a/Master/texmf-dist/tex/generic/musixtex/musixtmr.tex b/Master/texmf-dist/tex/generic/musixtex/musixtmr.tex
index ad219dbbc97..ce99403f0d3 100644
--- a/Master/texmf-dist/tex/generic/musixtex/musixtmr.tex
+++ b/Master/texmf-dist/tex/generic/musixtex/musixtmr.tex
@@ -13,49 +13,206 @@
%% 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
%%
%% reference: musixtex.tex (T.99) 268-508
%% MusiXTeX: (c) Daniel Taupin, et al.
%%
%% History: see trailer.
%
-\immediate\write16{MusiXTimesFonts\space<2009/10/15>}
+\immediate\write16{MusiXTimesFonts\space<2015/02/23>}
%
-% 8pt roman, bold, and italic
-\font\eightrm=ptmr7t at 8pt
-\font\eightbf=ptmb7t at 8pt
-\font\eightit=ptmri7t at 8pt
+% 8pt roman, bold, italic, bold italic, slanted and small-cap
+\font\eightrm=ptmr8r at 8pt
+\font\eightbf=ptmb8r at 8pt
+\font\eightit=ptmri8r at 8pt
+\font\eightbi=ptmbi8r at 8pt
+\font\eightsc=ptmrc8t at 8pt % artificial small-caps
+\font\eightsl=ptmro8r at 8pt
%
% 9pt
-\font\ninerm=ptmr7t at 9pt
-\font\ninebf=ptmb7t at 9pt
-\font\nineit=ptmri7t at 9pt
+\font\ninerm=ptmr8r at 9pt
+\font\ninebf=ptmb8r at 9pt
+\font\nineit=ptmri8r at 9pt
+\font\ninebi=ptmbi8r at 9pt
+\font\ninesc=ptmrc8t at 9pt
+\font\ninesl=ptmro8r at 9pt
%
% 10pt
-\font\tenrm=ptmr7t
-\font\tenbf=ptmb7t
-\font\tenit=ptmri7t
+\font\tenrm=ptmr8r at 10pt
+\font\tenbf=ptmb8r at 10pt
+\font\tenit=ptmri8r at 10pt
+\font\tenbi=ptmbi8r at 10pt
+\font\tensc=ptmrc8t at 10pt
+\font\tensl=ptmro8r at 10pt
+%
+%
+% 11pt
+\font\elevenrm=ptmr8r at 11pt
+\font\elevenbf=ptmb8r at 11pt
+\font\elevenit=ptmri8r at 11pt
+\font\elevenbi=ptmbi8r at 11pt
+\font\elevensc=ptmrc8t at 11pt
+\font\elevensl=ptmro8r at 11pt
%
% 12pt
-\font\twelverm=ptmr7t scaled \magstep 1
-\font\twelvebf=ptmb7t scaled \magstep 1
-\font\twelveit=ptmri7t scaled \magstep 1
+\font\twelverm=ptmr8r scaled \magstep 1
+\font\twelvebf=ptmb8r scaled \magstep 1
+\font\twelveit=ptmri8r scaled \magstep 1
+\font\twelvebi=ptmbi8r scaled \magstep 1
+\font\twelvesc=ptmrc8t scaled \magstep 1
+\font\twelvesl=ptmro8r scaled \magstep 1
+%
+% 14pt
+\font\frtrm=ptmr8r scaled \magstep2
+\font\frtbf=ptmb8r scaled \magstep2
+\font\frtit=ptmri8r scaled \magstep2
+\font\frtbi=ptmbi8r scaled \magstep2
+\font\frtsc=ptmrc8t scaled \magstep2
+\font\frtsl=ptmro8r scaled \magstep2
+%
+% 17pt
+\font\svtrm=ptmr8r scaled \magstep3
+\font\svtbf=ptmb8r scaled \magstep3
+\font\svtit=ptmri8r scaled \magstep3
+\font\svtbi=ptmbi8r scaled \magstep3
+\font\svtsc=ptmrc8t scaled \magstep3
+\font\svtsl=ptmro8r scaled \magstep3
+%
+% 20pt
+\font\twtyrm=ptmr8r scaled \magstep4
+\font\twtybf=ptmb8r scaled \magstep4
+\font\twtyit=ptmri8r scaled \magstep4
+\font\twtybi=ptmbi8r scaled \magstep4
+\font\twtysc=ptmrc8t scaled \magstep4
+\font\twtysl=ptmro8r scaled \magstep4
+%
+% 25pt
+\font\twfvrm=ptmr8r scaled \magstep5
+\font\twfvbf=ptmb8r scaled \magstep5
+\font\twfvit=ptmri8r scaled \magstep5
+\font\twfvbi=ptmbi8r scaled \magstep5
+\font\twfvsc=ptmrc8t scaled \magstep5
+\font\twfvsl=ptmro8r scaled \magstep5
%
% Large fonts for titles
-% (If you prefer Times-bold, use ptmb7t instead of ptmr7t)
-\font\bigfont=ptmr7t scaled \magstep2 % 14pt
-\font\Bigfont=ptmr7t scaled \magstep3 % 17pt
-\font\BIgfont=ptmr7t scaled \magstep4 % 20pt
-\font\BIGfont=ptmr7t scaled \magstep5 % 25pt
+% (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
+%
+%
+\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\f{{\ppff f}}
+\def\ff{{\ppff ff}}
+\def\fp{{\ppff fp}}
+\def\fff{{\ppff fff}}
+\def\ffff{{\ppff ffff}}
+\def\mf{{\ppff mf}}
+\def\p{{\ppff p}}
+\def\pp{{\ppff pp}}
+\def\ppp{{\ppff ppp}}
+\def\pppp{{\ppff pppp}}
+
+\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}}
+
+\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 % 14pt
- \font\BIGfont=ptmr7t scaled \magstep4 % 20pt
-\fi
+%\ifx\pmxversion\undefined\relax\else
+% \font\Bigfont=ptmr8r scaled \magstep2
+% \font\BIGfont=ptmr8r scaled \magstep4
+%\fi
%
+
\normtype
\endinput
%%
@@ -71,4 +228,5 @@
%% Font assignment change on PMX.
%% 2009/10/15
%% small update for MusiXTeX T.114 final release.
-%%
+%% 2015/02/06
+%% 8-bit encoding and extensions, similar to musixplt.tex