summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-07-26 22:48:40 +0000
committerKarl Berry <karl@freefriends.org>2015-07-26 22:48:40 +0000
commit966ab9dfab3de467ef49a1c73f3b9982cd20879c (patch)
tree4ee9dfa6fe5d1837ad4395169e693e5b3c5d5608 /Master/texmf-dist/tex/generic
parent12a1a9699bdc797f9319d1ee6e7fb479e778d648 (diff)
musixtex (26jul15)
git-svn-id: svn://tug.org/texlive/trunk@37959 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic')
-rw-r--r--Master/texmf-dist/tex/generic/musixtex/musixbm.tex5
-rw-r--r--Master/texmf-dist/tex/generic/musixtex/musixext.tex36
-rw-r--r--Master/texmf-dist/tex/generic/musixtex/musixhv.tex137
-rw-r--r--Master/texmf-dist/tex/generic/musixtex/musixplt.tex164
-rw-r--r--Master/texmf-dist/tex/generic/musixtex/musixppff.tex60
-rw-r--r--Master/texmf-dist/tex/generic/musixtex/musixtex.tex196
-rw-r--r--Master/texmf-dist/tex/generic/musixtex/musixtmr.tex148
7 files changed, 426 insertions, 320 deletions
diff --git a/Master/texmf-dist/tex/generic/musixtex/musixbm.tex b/Master/texmf-dist/tex/generic/musixtex/musixbm.tex
index d07b2070083..29147d8707b 100644
--- a/Master/texmf-dist/tex/generic/musixtex/musixbm.tex
+++ b/Master/texmf-dist/tex/generic/musixtex/musixbm.tex
@@ -17,10 +17,9 @@
% Boston, MA 02111-1307, USA.
%
%
-% musixbm.tex : allocate registers for 128th beam
+\immediate\write16{MusiXEXTra \space<7 June 2015>}%
%
-\immediate\write16{MusiXBeaM T.115 <19 Nov 2010>}%
%
-% (nothing to do. - T.111 or later provides 128th beam by default.)
+% (nothing to do. - T.118 or later provide \slide and \raggedstoppiece by default.)
%
\endinput
diff --git a/Master/texmf-dist/tex/generic/musixtex/musixext.tex b/Master/texmf-dist/tex/generic/musixtex/musixext.tex
index 4f95d9eacc6..d6ac3b9c4b1 100644
--- a/Master/texmf-dist/tex/generic/musixtex/musixext.tex
+++ b/Master/texmf-dist/tex/generic/musixtex/musixext.tex
@@ -16,33 +16,11 @@
% the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
% Boston, MA 02111-1307, USA.
%
-\immediate\write16{MusiXEXTra 0.36\space<1 March 1995>}%
-
-\ifx\undefined\centerskip \else \endinput \fi
-
-\edef\catcodeat{\the\catcode`\@}\catcode`\@=11
-\catcodesmusic
-
-%\def\barsrest#1{\centerskip\uplap{\lrlap{\meterfont{#1}}%
-% \vskip\f@ur\internote\lrlap{\musixchar59}}%
-% \advance\barno#1\global\advance\barno\m@ne }
-
-%
-% slide #1=height #2=number of elements #3=slope(-8 to 8 [step 10degree])
-%
-
-\def\slide#1#2#3{\n@ii#3\relax\inhgetn@i#1\relax%
- \ifnum\n@ii>\m@ne \advance\n@ii\m@ne\let\@Ti\raise
- \else \n@ii-\n@ii \advance\n@ii\s@v@n\let\@Ti\lower \fi
- \setbox\toks@box\hbox{\mxsps\char\n@ii}\n@iii\z@
- \raise\n@i\internote\rlap{\hbox{\loop\ifnum\n@iii<#2%
- \@Ti\n@iii\ht\toks@box\copy\toks@box\advance\n@iii\@ne\repeat}}}
-
-% if you need a line which appears ragged
-
-\def\raggedstoppiece{\ifx\ragg@d\empty \fil@{r}\fi
- \check@nopen\n@wbar\hfill\z@suspend\@nds@ction}
-
-\endcatcodesmusic
-\catcode`\@=\catcodeat
+%
+% musixext.tex
+%
+\immediate\write16{MusiXext T.118 <2015-07-25>}%
+%
+% (nothing to do. - T.118 or later provides \slide and \raggedstoppiece
+%
\endinput
diff --git a/Master/texmf-dist/tex/generic/musixtex/musixhv.tex b/Master/texmf-dist/tex/generic/musixtex/musixhv.tex
index aea62833bb7..df435b45a7a 100644
--- a/Master/texmf-dist/tex/generic/musixtex/musixhv.tex
+++ b/Master/texmf-dist/tex/generic/musixtex/musixhv.tex
@@ -23,87 +23,87 @@
%
% Copyright 2015 Bob Tennent rdt@cs.queensu.ca
%
-\immediate\write16{MusiXhv\space<2015/05/04>}
+\immediate\write16{MusiXhv\space<2015/07/25>}
%
% 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\sevenrm=phvr8t at 7pt
+\font\sevenbf=phvb8t at 7pt
+\font\sevenit=phvro8t at 7pt
+\font\sevenbi=phvbo8t at 7pt
\font\sevensc=phvrc8t at 7pt
-\font\sevensl=phvro8r at 7pt
+\font\sevensl=phvro8t at 7pt
%
% 8pt
-\font\eightrm=phvr8r at 8pt
-\font\eightbf=phvb8r at 8pt
-\font\eightbi=phvbo8r at 8pt
+\font\eightrm=phvr8t at 8pt
+\font\eightbf=phvb8t at 8pt
+\font\eightbi=phvbo8t at 8pt
\font\eightsc=phvrc8t at 8pt
-\font\eightit=phvro8r at 8pt
-\font\eightsl=phvro8r at 8pt
+\font\eightit=phvro8t at 8pt
+\font\eightsl=phvro8t at 8pt
%
% 9pt
-\font\ninerm=phvr8r at 9pt
-\font\ninebf=phvb8r at 9pt
-\font\nineit=phvro8r at 9pt
-\font\ninebi=phvbo8r at 9pt
+\font\ninerm=phvr8t at 9pt
+\font\ninebf=phvb8t at 9pt
+\font\nineit=phvro8t at 9pt
+\font\ninebi=phvbo8t at 9pt
\font\ninesc=phvrc8t at 9pt
-\font\ninesl=phvro8r at 9pt
+\font\ninesl=phvro8t at 9pt
%
% 10pt
-\font\tenrm=phvr8r at 10pt
-\font\tenbf=phvb8r at 10pt
-\font\tenit=phvro8r at 10pt
-\font\tenbi=phvbo8r at 10pt
+\font\tenrm=phvr8t at 10pt
+\font\tenbf=phvb8t at 10pt
+\font\tenit=phvro8t at 10pt
+\font\tenbi=phvbo8t at 10pt
\font\tensc=phvrc8t at 10pt
-\font\tensl=phvro8r at 10pt
+\font\tensl=phvro8t at 10pt
%
% 11pt
-\font\elevenrm=phvr8r at 11pt
-\font\elevenbf=phvb8r at 11pt
-\font\elevenit=phvro8r at 11pt
-\font\elevenbi=phvbo8r at 11pt
+\font\elevenrm=phvr8t at 11pt
+\font\elevenbf=phvb8t at 11pt
+\font\elevenit=phvro8t at 11pt
+\font\elevenbi=phvbo8t at 11pt
\font\elevensc=phvrc8t at 11pt
-\font\elevensl=phvro8r at 11pt
+\font\elevensl=phvro8t at 11pt
%
% 12pt
-\font\twelverm=phvr8r at 12pt
-\font\twelvebf=phvb8r at 12pt
-\font\twelveit=phvro8r at 12pt
-\font\twelvebi=phvbo8r at 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=phvro8r at 12pt
+\font\twelvesl=phvro8t at 12pt
%
% 14pt
-\font\frtrm=phvr8r at 14pt
-\font\frtbf=phvb8r at 14pt
-\font\frtit=phvro8r at 14pt
-\font\frtbi=phvbo8r at 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=phvro8r at 14pt
+\font\frtsl=phvro8t at 14pt
%
% 17pt
-\font\svtrm=phvr8r at 17pt
-\font\svtbf=phvb8r at 17pt
-\font\svtit=phvro8r at 17pt
-\font\svtbi=phvbo8r at 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=phvro8r at 17pt
+\font\svtsl=phvro8t at 17pt
%
% 20pt
-\font\twtyrm=phvr8r at 20pt
-\font\twtybf=phvb8r at 20pt
-\font\twtyit=phvro8r at 20pt
-\font\twtybi=phvbo8r at 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=phvro8r at 20pt
+\font\twtysl=phvro8t at 20pt
%
% 25pt
-\font\twfvrm=phvr8r at 25pt
-\font\twfvbf=phvb8r at 25pt
-\font\twfvit=phvro8r at 25pt
-\font\twfvbi=phvbo8r at 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=phvro8r at 25pt
+\font\twfvsl=phvro8t at 25pt
%
% Large fonts for titles
% (If you prefer bold, use ..bf instead of ..rm)
@@ -113,11 +113,11 @@
\let\BIGfont=\twfvrm
%
%
-\font\ppfftwelve=phvbo8r at 8pt
-\font\ppffsixteen=phvbo8r at 10pt
-\font\ppfftwenty=phvbo8r at 12pt
-\font\ppfftwentyfour=phvbo8r at 14pt
-\font\ppfftwentynine=phvbo8r at 17pt
+\font\ppfftwelve=phvbo8t at 8pt
+\font\ppffsixteen=phvbo8t at 10pt
+\font\ppfftwenty=phvbo8t at 12pt
+\font\ppfftwentyfour=phvbo8t at 14pt
+\font\ppfftwentynine=phvbo8t at 17pt
%
\def\tinydyn{\let\ppff\tinyppff}
\def\smalldyn{let\ppff\smallppff}
@@ -203,5 +203,30 @@
\sc}
%
+%
+% Redefine accented characters for etex, suggested by David Carlisle:
+%
+\ifx\documentclass\undefined
+\def\ProvidesFile#1[#2]{}
+\def\DeclareFontEncoding#1#2#3{}
+\def\DeclareTextAccent#1#2#3{%
+\def#1##1{%
+\expandafter\ifx\csname T1\string#1-\string##1\endcsname\relax
+{\accent#1 ##1}%
+\else
+\csname T1\string#1-\string##1\expandafter\endcsname
+\fi}}
+\def\DeclareTextCommand#1#2{\xdtcmd}%not today
+\def\xdtcmd#1#{\xxdtcmd}%not today
+\def\xxdtcmd#1{}%not today
+\def\DeclareTextCompositeCommand#1#2#3#4{}%not today
+\def\DeclareTextSymbol#1#2#3{%
+\def#1{\char#3\relax}}
+\def\DeclareTextComposite#1#2#3#4{%
+\expandafter\def\csname T1\string#1-\string#3\endcsname{\char#4\relax}}
+
+\input t1enc.def
+\fi
+
\normtype
\endinput
diff --git a/Master/texmf-dist/tex/generic/musixtex/musixplt.tex b/Master/texmf-dist/tex/generic/musixtex/musixplt.tex
index e56f88833bf..cb2adba1ee5 100644
--- a/Master/texmf-dist/tex/generic/musixtex/musixplt.tex
+++ b/Master/texmf-dist/tex/generic/musixtex/musixplt.tex
@@ -23,87 +23,87 @@
%
% Copyright 2015 Bob Tennent rdt@cs.queensu.ca
%
-\immediate\write16{MusiXplt\space<2015/05/04>}
+\immediate\write16{MusiXplt\space<2015/07/25>}
%
% 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
+\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
%
% 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
+\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
%
% 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
+\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
%
% 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
+\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
%
% 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
+\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
%
% 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
+\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
%
% 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
+\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
%
% 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
+\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
%
% 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
+\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
%
% 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
+\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)
@@ -114,17 +114,17 @@
\let\BIGfont=\twfvsc
%
%
-\font\ppfftwelve=pplbi8r at 8pt
-\font\ppffsixteen=pplbi8r at 10pt
-\font\ppfftwenty=pplbi8r at 12pt
-\font\ppfftwentyfour=pplbi8r at 14pt
-\font\ppfftwentynine=pplbi8r at 17pt
+\font\ppfftwelve=pplbi8t at 8pt
+\font\ppffsixteen=pplbi8t at 10pt
+\font\ppfftwenty=pplbi8t at 12pt
+\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\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}}
@@ -211,7 +211,29 @@
\let\sl\BIGfont
\sc}
%
+% Redefine accented characters for etex, suggested by David Carlisle:
+%
+\ifx\documentclass\undefined
+\def\ProvidesFile#1[#2]{}
+\def\DeclareFontEncoding#1#2#3{}
+\def\DeclareTextAccent#1#2#3{%
+\def#1##1{%
+\expandafter\ifx\csname T1\string#1-\string##1\endcsname\relax
+{\accent#1 ##1}%
+\else
+\csname T1\string#1-\string##1\expandafter\endcsname
+\fi}}
+\def\DeclareTextCommand#1#2{\xdtcmd}%not today
+\def\xdtcmd#1#{\xxdtcmd}%not today
+\def\xxdtcmd#1{}%not today
+\def\DeclareTextCompositeCommand#1#2#3#4{}%not today
+\def\DeclareTextSymbol#1#2#3{%
+\def#1{\char#3\relax}}
+\def\DeclareTextComposite#1#2#3#4{%
+\expandafter\def\csname T1\string#1-\string#3\endcsname{\char#4\relax}}
+\input t1enc.def
+\fi
\normtype
\endinput
diff --git a/Master/texmf-dist/tex/generic/musixtex/musixppff.tex b/Master/texmf-dist/tex/generic/musixtex/musixppff.tex
index e547fea6e6f..0cae2ea79f9 100644
--- a/Master/texmf-dist/tex/generic/musixtex/musixppff.tex
+++ b/Master/texmf-dist/tex/generic/musixtex/musixppff.tex
@@ -12,8 +12,9 @@
%% ...
%%
%%
-\immediate\write16{MusiXppff \noexpand\ppff font replacement <2015/05/04>}%
+\immediate\write16{MusiXppff \noexpand\ppff font replacement <2015/07/25>}%
+\font\xppfftwelve=xppff10 at 8pt
\font\xppffsixteen=xppff10
\font\xppfftwenty=xppff10 scaled \magstep1
\font\xppfftwentyfour=xppff10 scaled \magstep2
@@ -31,6 +32,7 @@
\else\ifdim\internote<1.19\Internote \normxppff
\else\medxppff\fi\fi\fi}
+
\def\f{{\xppff f}}%
\def\ff{{\xppff ff}}%
\def\fp{{\xppff fp}}%
@@ -47,6 +49,12 @@
\def\mp@{{\xppff mp}}%
\let\mezzopiano\mp@
+%
+\def\tinydyn{\let\ppff\tinyppff\let\xppff\tinyxppff}%
+\def\smalldyn{\let\ppff\smallppff\let\xppff\smallxppff}%
+\def\normdyn{\let\ppff\normppff\let\xppff\normxppff}%
+\def\meddyn{\let\ppff\medppff\let\xppff\medxppff}%
+
\def\comput@fonts{%
\ifnum\musicsize=\sixt@@n
\let\musicLargefont\musictwentyfour
@@ -61,9 +69,17 @@
\let\xgregtinyfont\xgregeleven
\let\slurd\slurdsixteen \let\sluru\slurusixteen
\let\hslurd\hslurdsixteen \let\hsluru\hslurusixteen
- \let\meternorfont\tenbf \let\metersmallfont\eightbf % T116 RDT
+ \let\meternorfont\tenbf \let\metersmallfont\eightbf % version 1.16 RDT
\let\meterbigfont\twelvebf \let\meterlargefont\frtbf
\let\meterLargefont\svtbf
+ \let\tinyppff\ppfftwelve % version 1.17 RDT
+ \let\smallppff\ppfftwelve
+ \let\normppff\ppffsixteen
+ \let\medppff\ppfftwenty
+ \let\tinyxppff\xppfftwelve % version 1.17 RDT
+ \let\smallxppff\xppfftwelve
+ \let\normxppff\xppffsixteen
+ \let\medxppff\xppfftwenty
\else\ifnum\musicsize=\@xxiv
\let\musicLargefont\musictwentynine
\let\musiclargefont\musictwentynine
@@ -77,9 +93,17 @@
\let\xgregtinyfont\xgregsixteen
\let\sluru\slurutwenty \let\slurd\slurdtwenty
\let\hsluru\hslurutwenty \let\hslurd\hslurdtwenty
- \let\meternorfont\frtbf \let\metersmallfont\twelvebf % T116 RDT
+ \let\meternorfont\frtbf \let\metersmallfont\twelvebf % version 1.18 RDT
\let\meterbigfont\svtbf \let\meterlargefont\twtybf
\let\meterlargefont\twfvbf
+ \let\tinyppff\ppffsixteen
+ \let\smallppff\ppfftwenty
+ \let\normppff\ppfftwentyfour
+ \let\medppff\ppfftwentynine
+ \let\tinyxppff\xppffsixteen
+ \let\smallxppff\xppfftwenty
+ \let\normxppff\xppfftwentyfour
+ \let\medxppff\xppfftwentynine
\else\ifnum\musicsize=\@xxix
\let\musicLargefont\musictwentynine
\let\musiclargefont\musictwentynine
@@ -95,10 +119,18 @@
\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\meternorfont\svtbf \let\metersmallfont\frtbf % version 1.18 RDT
\let\meterbigfont\twtybf \let\meterlargefont\twfvbf
\let\meterLargefont\twfvbf
- \else
+ \let\tinyppff\ppfftwenty
+ \let\smallppff\ppfftwentyfour
+ \let\normppff\ppfftwentynine
+ \let\medppff\ppfftwentynine
+ \let\tinyxppff\xppfftwenty
+ \let\smallxppff\xppfftwentyfour
+ \let\normxppff\xppfftwentynine
+ \let\medxppff\xppfftwentynine
+\else
\ifnum\musicsize=\tw@nty
\else\ifnum\musicsize=\z@
\else\errmessage{\noexpand\musicsize=\the\musicsize\space not supported,
@@ -117,16 +149,18 @@
\let\xgregtinyfont\xgregthirteen
\let\sluru\slurutwenty \let\slurd\slurdtwenty
\let\hsluru\hslurutwenty \let\hslurd\hslurdtwenty
- \let\meternorfont\twelvebf \let\metersmallfont\tenbf % T116 RDT
+ \let\meternorfont\twelvebf \let\metersmallfont\tenbf % version 1.18 RDT
\let\meterbigfont\frtbf \let\meterlargefont\svtbf
\let\meterLargefont\twtybf
- \fi\fi\fi
-}%
-%
-\def\tinydyn{\let\ppff\tinyppff\let\xppff\tinyxppff}%
-\def\smalldyn{\let\ppff\smallppff\let\xppff\smallxppff}%
-\def\normdyn{\let\ppff\normppff\let\xppff\normxppff}%
-\def\meddyn{\let\ppff\medppff\let\xppff\medxppff}%
+ \let\tinyppff\ppfftwelve
+ \let\smallppff\ppffsixteen
+ \let\normppff\ppfftwenty
+ \let\medppff\ppfftwentyfour
+ \let\tinyxppff\xppfftwelve
+ \let\smallxppff\xppffsixteen
+ \let\normxppff\xppfftwenty
+ \let\medxppff\xppfftwentyfour
+\fi\fi\fi}%
\catcode`\@=\catcodeat
diff --git a/Master/texmf-dist/tex/generic/musixtex/musixtex.tex b/Master/texmf-dist/tex/generic/musixtex/musixtex.tex
index c6e5135a7db..3de1de22292 100644
--- a/Master/texmf-dist/tex/generic/musixtex/musixtex.tex
+++ b/Master/texmf-dist/tex/generic/musixtex/musixtex.tex
@@ -25,16 +25,21 @@
\def\mufl@x{0.83}%
\def\mxmajorvernumber{1}
-\def\mxminorvernumber{17}
+\def\mxminorvernumber{18}
\def\mxvernumber{\mxmajorvernumber\mxminorvernumber}% make it possible to compare with \ifnum
\def\mxversuffix{}%
\edef\mxversion{\mxmajorvernumber.\mxminorvernumber\mxversuffix}
-\def\mxdate{2015-05-25}
+\def\mxdate{2015-07-25}
\immediate\write16{MusiXTeX(c) \mxversion\space<\mxdate>}%
\everyjob{\immediate\write16{MusiXTeX(c) \mxversion\space<\mxdate>}}%
-% T117:
+% version 1.18:
+
+% RDT added definitions of \raggedstoppiece and \slide from musixext.tex
+% RDT increased the length of beam stems (adapted from J.-P. Coulon)
+
+% version 1.17:
% RDT re-defined \txtfont for non-normal staff sizes
% RDT defined \tinyppff and \ppfftwelve, and re-defined \ppff to be staffsize dependent
@@ -45,7 +50,7 @@
% RDT introduced \cpause etc. and corrected definitions of \centerpause etc.
% RDT introduced double-dotted rests \qppp, \dspp, \qspp, etc.
-% T116:
+% version 1.16:
% RDT corrected the definitions of \nnotes and \nnnotes
@@ -71,7 +76,7 @@
% meterfonts must be bf, even if titling fonts are rm or sc
% added dynamic-mark macros \sfz \sfzp
-% T115:
+% version 1.15:
% moved out:
% - 1/128th beams -> musixbm
@@ -89,7 +94,7 @@
%++simick replaced lines and ++simick...++simick for added blocks
% Hiroaki, May2010, T.115: change register allocation codes into new ones
-% which enables >12 elements. Search the string "T115" for details.
+% which enables >12 elements. Search the string "version 1.15" for details.
%
% TeXperts may want to change the next
@@ -193,7 +198,7 @@
%%% account registers
-% \let\maxinstruments\si@ % [T115] here disabled to avoid conflict
+% \let\maxinstruments\si@ % [version 1.15] here disabled to avoid conflict
% temporary registers
@@ -218,7 +223,7 @@
\newdimen\y@iv
\newdimen\y@v
-% [T115] moved out to the new register allocation code -- start from here --
+% [version 1.15] moved out to the new register allocation code -- start from here --
% altitude
% \newskip\k@ii
% InterNote
@@ -248,11 +253,11 @@
% Height of choir groups
% \newskip\g@hi
-% [T115] moved out to the new register allocation code -- until here --
-% \let\maxgroups\thr@@ % maximum three groups of instruments or choirs [T115] moved to later, using \setmaxgroups
+% [version 1.15] moved out to the new register allocation code -- until here --
+% \let\maxgroups\thr@@ % maximum three groups of instruments or choirs [version 1.15] moved to later, using \setmaxgroups
\newcount\group@no
-%%% [T115] new register allocation code -- start from here --
+%%% [version 1.15] new register allocation code -- start from here --
%
% register allocation for use inside \loop...\if...\repeat
% (only for plain, but no harm even in case of LaTeX)
@@ -533,7 +538,7 @@
% actual setup (=register allocation) of the maximum element numbers
% should be done after fonts definition.
%
-%%% [T115] new register allocation code -- until here --
+%%% [version 1.15] new register allocation code -- until here --
%%% fonts
@@ -548,7 +553,7 @@
% Seven point fonts: roman, bold, and italic.
%%
-%\ifx\undefined\sevenrm % T117 RDT unconditional font definitions
+%\ifx\undefined\sevenrm % version 1.17 RDT unconditional font definitions
\font\sevenrm=cmr7
\font\sevenbf=cmbx7
\font\sevenit=cmti7
@@ -710,19 +715,19 @@
% Bold italic fonts for dynamic markings.
%%
-\font\ppfftwelve=cmbxti10 at 8pt % T117 RDT
+\font\ppfftwelve=cmbxti10 at 8pt % version 1.17 RDT
\font\ppffsixteen=cmbxti10
\font\ppfftwenty=cmbxti10 scaled \magstep1
\font\ppfftwentyfour=cmbxti10 scaled \magstep2
\font\ppfftwentynine=cmbxti10 scaled \magstep3
-\def\ppff{\ifdim\internote<\p@seven6\Internote\tinyppff% T117 RDT
+\def\ppff{\ifdim\internote<\p@seven6\Internote\tinyppff% version 1.17 RDT
\else\ifdim\internote<.95\Internote\smallppff%
\else\ifdim\internote<1.19\Internote\normppff%
\else\medppff\fi\fi\fi}%
-\def\tinydyn{\let\ppff\tinyppff} % T117 RDT
-\def\smalldyn{let\ppff\smallppff}
+\def\tinydyn{\let\ppff\tinyppff} % version 1.17 RDT
+\def\smalldyn{\let\ppff\smallppff}
\def\normdyn{\let\ppff\normppff}
\def\meddyn{\let\ppff\medppff}
@@ -827,7 +832,7 @@
\newcount\N@s
-% [T115] moved out to the new register allocation code (except for \s@Y)
+% [version 1.15] moved out to the new register allocation code (except for \s@Y)
% horizontal start position of slur
% \newdimen\s@xi
% sense u,d and x (flag) for pending slurs
@@ -851,18 +856,18 @@
\def\roman@n@i{\romannumeral\n@i\endcsname}
%
-% [T115] make slurs independent from \maxinstruments
+% [version 1.15] make slurs independent from \maxinstruments
\def\test@slurnum{%
\ifnum\n@i<\z@ \n@i\@c \fi
\ifnum\n@i<\maxslurs \else
\count@\maxslurs \advance\count@\m@ne
- \errmessage{Wrong slur reference number \the\n@i! (valid: 0 to \the\count@)}% [T115]
- \n@i\z@% [T115]
+ \errmessage{Wrong slur reference number \the\n@i! (valid: 0 to \the\count@)}% [version 1.15]
+ \n@i\z@% [version 1.15]
\fi
\advance\n@i\@ne}%
%
\def\s@l@ctslur#1\relax{%
- \n@i#1\relax\test@slurnum% [T115] make it independent from beams
+ \n@i#1\relax\test@slurnum% [version 1.15] make it independent from beams
\edef\s@a{\csname s@a\roman@n@i}% dimen (altportee)
\edef\s@x{\csname s@x\roman@n@i}% dimen (hor start pos)
\edef\s@y{\csname s@y\roman@n@i}% count (startnote [internote])
@@ -1560,10 +1565,10 @@
\let\xgregtinyfont\xgregeleven
\let\slurd\slurdsixteen \let\sluru\slurusixteen
\let\hslurd\hslurdsixteen \let\hsluru\hslurusixteen
- \let\meternorfont\tenbf \let\metersmallfont\eightbf % T116 RDT
+ \let\meternorfont\tenbf \let\metersmallfont\eightbf % version 1.16 RDT
\let\meterbigfont\twelvebf \let\meterlargefont\frtbf
\let\meterLargefont\svtbf
- \let\tinyppff\ppfftwelve % T117 RDT
+ \let\tinyppff\ppfftwelve % version 1.17 RDT
\let\smallppff\ppfftwelve
\let\normppff\ppffsixteen
\let\medppff\ppfftwenty
@@ -1580,10 +1585,10 @@
\let\xgregtinyfont\xgregsixteen
\let\sluru\slurutwenty \let\slurd\slurdtwenty
\let\hsluru\hslurutwenty \let\hslurd\hslurdtwenty
- \let\meternorfont\frtbf \let\metersmallfont\twelvebf % T116 RDT
+ \let\meternorfont\frtbf \let\metersmallfont\twelvebf % version 1.18 RDT
\let\meterbigfont\svtbf \let\meterlargefont\twtybf
\let\meterlargefont\twfvbf
- \let\tinyppff\ppffsixteen % T117 RDT
+ \let\tinyppff\ppffsixteen
\let\smallppff\ppfftwenty
\let\normppff\ppfftwentyfour
\let\medppff\ppfftwentynine
@@ -1602,13 +1607,13 @@
\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\tinyppff\ppfftwenty % T117 RDT
- \let\smallppff\ppfftwentyfour
- \let\normppff\ppfftwentynine
- \let\medppff\ppfftwentynine
+ \let\meternorfont\svtbfg \let\metersmallfont\frtbf % version 1.18 RDT
+ \let\meterbigfont\twtybfg \let\meterlargefont\twfvbf
+ \let\meterLargefont\twfvbfg
+ \let\tinyppff\ppfftwentyg
+ \let\smallppff\ppfftwentyfourg
+ \let\normppff\ppfftwentynineg
+ \let\medppff\ppfftwentynineg
\else
\ifnum\musicsize=\tw@nty
\else\ifnum\musicsize=\z@
@@ -1628,10 +1633,10 @@
\let\xgregtinyfont\xgregthirteen
\let\sluru\slurutwenty \let\slurd\slurdtwenty
\let\hsluru\hslurutwenty \let\hslurd\hslurdtwenty
- \let\meternorfont\twelvebf \let\metersmallfont\tenbf % T116 RDT
+ \let\meternorfont\twelvebf \let\metersmallfont\tenbf % version 1.18 RDT
\let\meterbigfont\frtbf \let\meterlargefont\svtbf
\let\meterLargefont\twtybf
- \let\tinyppff\ppfftwelve % T117 RDT
+ \let\tinyppff\ppfftwelve
\let\smallppff\ppffsixteen
\let\normppff\ppfftwenty
\let\medppff\ppfftwentyfour
@@ -1669,7 +1674,7 @@
\def\setsize#1#2{\n@v#1\relax % select instrument
\expandafter\edef\csname staffspacing\romannumeral\n@v\endcsname{#2}}
-% [T115] moved out to the new register allocation code
+% [version 1.15] moved out to the new register allocation code
% \let\staffspacingi\@ne
% number of staffs
@@ -1689,9 +1694,9 @@
\def\interstaff#1{\def\interfacteur{#1}}
\def\s@l@ctinstr{%
- \ifnum\noinstrum@nt>\maxinstruments % [T115] -- from here --
+ \ifnum\noinstrum@nt>\maxinstruments % [version 1.15] -- from here --
\errmessage{Wrong instrument reference number \the\noinstrum@nt, maxinstruments=\the\maxinstruments}
- \fi % [T115] -- until here --
+ \fi % [version 1.15] -- until here --
\edef\altitude{\csname k@i\romannumeral\noinstrum@nt\endcsname}%
\edef\st@ffs{\csname n@p\romannumeral\noinstrum@nt\endcsname}%
\edef\nblines{\csname n@l\romannumeral\noinstrum@nt\endcsname}%
@@ -1732,7 +1737,7 @@
\def\songbottom{\groupbottom1}
\def\songtop{\grouptop1}
-% [T115] moved out to the new register allocation code
+% [version 1.15] moved out to the new register allocation code
% \let\lowersonginstrumi\maxdimen
% \let\uppersonginstrumi\z@
@@ -1749,8 +1754,8 @@
\ifnum\group@no<\z@ \group@no\@c \fi
\ifnum\group@no<\maxgroups \else
\count@\maxgroups \advance\count@\m@ne
- \errmessage{Wrong group reference number \the\group@no! (valid: 0 to \the\count@)}% [T115]
- \group@no\z@% [T115]
+ \errmessage{Wrong group reference number \the\group@no! (valid: 0 to \the\count@)}% [version 1.15]
+ \group@no\z@% [version 1.15]
\fi
\advance\group@no\@ne}
@@ -1793,9 +1798,9 @@
%%% distance between instruments (added to \interportee)
-% [T115] moved out to the above of the new register allocation code
+% [version 1.15] moved out to the above of the new register allocation code
% \newdimen\interinstrument
-% [T115] moved out to the new register allocation code
+% [version 1.15] moved out to the new register allocation code
% \let\interinstrumenti\interinstrument
\def\setinterinstrument#1#2{\n@v#1\relax % select instrument
@@ -2012,7 +2017,7 @@
\repeat
% cutslur
\ifnum\N@s>\z@% % any pending slurs ?
- \n@viii\maxslurs % test all possible slur numbers [T115] (Hiroaki)
+ \n@viii\maxslurs % test all possible slur numbers [version 1.15] (Hiroaki)
\advance\n@viii\m@ne
\loop\ifnum\n@viii>\m@ne
\s@l@ctslur\n@viii\relax
@@ -2041,6 +2046,9 @@
\def\zstoppiec@{\check@nopen\zn@wbar\z@suspend}
%\def\zstoppiece{\zstoppiec@\@nds@ction} %-simick
\def\zstoppiece{\T@bil\fi\zstoppiec@\@nds@ction}%+simick
+% if you need a line which appears ragged
+\def\raggedstoppiece{\ifx\ragg@d\empty \fil@{r}\fi % version 1.18 RDT (from musixext)
+ \check@nopen\n@wbar\hfill\z@suspend\@nds@ction}
\def\Stoppiece{\setdoubleBAR\stoppiece}
\let\Endpiece\Stoppiece
@@ -2660,12 +2668,12 @@
\def\treblelowoct{\trebleclef\raise -7\internote\hbox\@to\z@{\smalltype\it\kern -2.3\Interligne 8\hss}}
\def\basslowoct{\bassclef\raise -6\internote\hbox\@to\z@{\smalltype\it\kern -2.5\Interligne 8\hss}}
-% [T115] reqest from Hermann Hinsch
+% [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}}
-% [T115] reqest from Hermann Hinsch: end
+% [version 1.15] reqest from Hermann Hinsch: end
\newskip\clef@skip
@@ -2788,7 +2796,7 @@
\def\setname#1#2{\n@v#1\relax % select instrument
% \let\Writ@names\writ@names
- \expandafter\def\csname instrument\romannumeral\n@v\endcsname{#2}}% [T115] changed from \edef to \def (Hiroaki)
+ \expandafter\def\csname instrument\romannumeral\n@v\endcsname{#2}}% [version 1.15] changed from \edef to \def (Hiroaki)
\def\writ@names{\n@loop
\setbox\toks@box\null\relax
@@ -3013,9 +3021,11 @@
\y@ii\b@p\y@v \divide\y@ii\tw@nty \advance\y@ii\b@z
\ifdim\y@ii>\st@top % la poutre est au-dessus
\stem@skip\qd@skip \comp@slope\stem@skip \advance\y@ii\s@lope
+ \advance\y@ii .285\interbeam% version 1.18 RDT
\ifnum\b@n>\z@ \advance\y@ii\b@n\interbeam \advance\y@ii-\interbeam \fi
\st@top\y@ii % a mettre a jour avec la pente ulterieurement
\else
+ \advance\y@ii-.285\interbeam% version 1.18 RDT
\stem@skip\z@
\ifdim\y@ii<\st@bot
\ifnum\b@n<\z@ \advance\y@ii\b@n\interbeam \advance\y@ii\interbeam \fi
@@ -3163,7 +3173,7 @@
\else
\let\st@m\upst@m
\fi
- \check@staff % T116
+ \check@staff % version 1.16
\let\n@fon\@qa \let\n@sym\q@u \y@v\qn@width \writ@note
\fi}
@@ -3223,7 +3233,7 @@
\else
\let\st@m\up@flag \advance\n@vii -\fiv@\relax
\fi
- \check@staff % T116
+ \check@staff % version 1.16
\let\n@fon\@mca \let\n@sym\q@u \y@v\qn@width \writ@note
\fi}
@@ -3409,22 +3419,22 @@
\def\zqbpp{\advancefalse\qbpp}
\def\tqh{\q@symbol\@tqh}
-\def\tqu{\q@symbol\@tqh} % T116 RDT
+\def\tqu{\q@symbol\@tqh} % version 1.16 RDT
\def\tqb{\q@symbol\@tqb}
-\def\tql{\q@symbol\@tqb} % T116 RDT
-\def\tqqh#1#2{\tbbu{#1}\tqh{#1}{#2}} % T117 RDT
-\def\tqqu#1#2{\tbbu{#1}\tqu{#1}{#2}} % T117 RDT
-\def\tqqb#1#2{\tbbl{#1}\tqb{#1}{#2}} % T117 RDT
-\def\tqql#1#2{\tbbl{#1}\tql{#1}{#2}} % T117 RDT
-\def\tqqqh#1#2{\tbbbu{#1}\tqqh{#1}{#2}} % T117 RDT
-\def\tqqqu#1#2{\tbbbu{#1}\tqqu{#1}{#2}} % T117 RDT
-\def\tqqqb#1#2{\tbbbl{#1}\tqqb{#1}{#2}} % T117 RDT
-\def\tqqql#1#2{\tbbbl{#1}\tqql{#1}{#2}} % T117 RDT
+\def\tql{\q@symbol\@tqb} % version 1.16 RDT
+\def\tqqh#1#2{\tbbu{#1}\tqh{#1}{#2}} % version 1.17 RDT
+\def\tqqu#1#2{\tbbu{#1}\tqu{#1}{#2}} % version 1.17 RDT
+\def\tqqb#1#2{\tbbl{#1}\tqb{#1}{#2}} % version 1.17 RDT
+\def\tqql#1#2{\tbbl{#1}\tql{#1}{#2}} % version 1.17 RDT
+\def\tqqqh#1#2{\tbbbu{#1}\tqqh{#1}{#2}} % version 1.17 RDT
+\def\tqqqu#1#2{\tbbbu{#1}\tqqu{#1}{#2}} % version 1.17 RDT
+\def\tqqqb#1#2{\tbbbl{#1}\tqqb{#1}{#2}} % version 1.17 RDT
+\def\tqqql#1#2{\tbbbl{#1}\tqql{#1}{#2}} % version 1.17 RDT
\def\ztqh{\advancefalse\q@symbol\@tqh}
-\def\ztqu{\advancefalse\q@symbol\@tqh} % T116 RDT
+\def\ztqu{\advancefalse\q@symbol\@tqh} % version 1.16 RDT
\def\ztqb{\advancefalse\q@symbol\@tqb}
-\def\ztql{\advancefalse\q@symbol\@tqb} % T116 RDT
+\def\ztql{\advancefalse\q@symbol\@tqb} % version 1.16 RDT
%%% grace notes
@@ -3442,7 +3452,7 @@
% \b@p slope (-9) - (9)
% \b@n number of pending beamlines (-4) - (4)
-\def\test@beamnum{% [T115] new macro to make it independent from slur
+\def\test@beamnum{% [version 1.15] new macro to make it independent from slur
\ifnum\n@i<\z@ \n@i\@c \fi
\ifnum\n@i<\maxinstruments \else
\count@\maxinstruments \advance\count@\m@ne
@@ -3452,7 +3462,7 @@
\advance\n@i\@ne}%
\def\s@l@ctbeam#1\relax{%
- \n@i#1\relax\test@beamnum % [T115] make it independent from slur
+ \n@i#1\relax\test@beamnum % [version 1.15] make it independent from slur
\edef\b@x{\csname b@x\romannumeral\n@i\endcsname}%
\edef\b@z{\csname b@z\romannumeral\n@i\endcsname}%
\edef\b@n{\csname b@n\romannumeral\n@i\endcsname}%
@@ -3811,14 +3821,14 @@
\def\hs{\adv@restbox{\check@staff\musixchar65\fi}}
\def\qqs{\adv@restbox{\check@staff\musixchar66\fi}}
-% pointed rests T116 RDT
+% pointed rests version 1.16 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}}
-% double-dotted rests T117 RDT
+% double-dotted rests version 1.17 RDT
\def\pausepp{\wholeshift{\ppt5}\pause}
\def\hpausepp{\wholeshift{\ppt5}\hpause}
@@ -3869,7 +3879,7 @@
\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{\set@ca \let\@Tii\@Na \n@v\f@ur \C@acc} % T116 HM
+\def\cna{\set@ca \let\@Tii\@Na \n@v\f@ur \C@acc} % version 1.16 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}
@@ -3916,7 +3926,7 @@
% \n@ii positive signature limit, \n@ii-8 negative signature limit
\advance\n@ii-\a@s \advance\n@ii\si@ \divide\n@ii\s@v@n
\@Tii
- \fi \advance\n@v\@l \advance\n@v\n@vi \expandafter\@Ti % [T115] (Hiroaki)
+ \fi \advance\n@v\@l \advance\n@v\n@vi \expandafter\@Ti % [version 1.15] (Hiroaki)
\fi}
\def\@nod{Can't double }
@@ -4102,7 +4112,7 @@
\let\maxtrilles\si@
% \maxtrilles and \@itrille[i] are only for obsolete Legacy \trillC
% and \TrillC; not related with new register allocation code. Leave
-% it as-is. [T115]
+% it as-is. [version 1.15]
\newskip\@itrillei
\newskip\@itrilleii
@@ -4143,7 +4153,7 @@
%%%%%%
% \let\maxtrills\si@ % here disabled to avoid conflict with new register allocation code
-% [T115] moved out to the new register allocation code
+% [version 1.15] moved out to the new register allocation code
% \newskip\tr@xi \tr@xi\maxdimen\relax % starting horizontal pos
% \newtoks\tr@swi % heading of trill
% \newskip\tr@yi % height of trill
@@ -4158,8 +4168,8 @@
\n@i#1\relax \ifnum\n@i<\z@ \n@i\@c \fi
\ifnum\n@i<\maxtrills \else
\count@\maxtrills \advance\count@\m@ne
- \errmessage{Wrong trill reference number \the\n@i! (valid: 0 to \the\count@)}% [T115]
- \n@i\z@ % [T115]
+ \errmessage{Wrong trill reference number \the\n@i! (valid: 0 to \the\count@)}% [version 1.15]
+ \n@i\z@ % [version 1.15]
\fi
\advance\n@i\@ne
\xdef\tr@x{\csname tr@x\roman@n@i}%
@@ -4199,7 +4209,7 @@
%%% octave lines
\def\octnumberup{\octnumberdefault\vrule width 0pt height2ex}
-\def\octnumberdefault{\smallppff8} % T117 RDT
+\def\octnumberdefault{\smallppff8} % version 1.17 RDT
\def\octnumberdown{\octnumberdefault$^a$\txtfont\kern 0.3em bassa\vrule width 0pt depth \Internote}
\def\octfinup{\check@staff
@@ -4229,7 +4239,7 @@
%%%%%%
% \let\maxoctlines\si@ % here disabled to avoid conflict with new register allocation code, except for \o@swz
-% [T115] moved out to the new register allocation code
+% [version 1.15] moved out to the new register allocation code
% \newskip\o@xi \o@xi\maxdimen\relax % starting horizontal pos
% \newskip\o@yi % height of octline
\newtoks\o@swz % sense of octline for \octfin[up][down] without number
@@ -4245,8 +4255,8 @@
\n@i#1\relax \ifnum\n@i<\z@ \n@i\@c \fi
\ifnum\n@i<\maxoctlines \else
\count@\maxoctlines \advance\count@\m@ne
- \errmessage{Wrong octaviation line reference number \the\n@i! (valid: 0 to \the\count@)}% [T115]
- \n@i\z@% [T115]
+ \errmessage{Wrong octaviation line reference number \the\n@i! (valid: 0 to \the\count@)}% [version 1.15]
+ \n@i\z@% [version 1.15]
\fi
\advance\n@i\@ne
\xdef\o@x{\csname o@x\roman@n@i}%
@@ -4301,7 +4311,7 @@
\def\metronequiv#1#2{{\stemlength\f@ur\noteskip\t@n\p@ #1 1\ = #2 1}}
-\def\txtfont{% % T117 RDT
+\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
@@ -4311,13 +4321,13 @@
\def\xtuplet#1#2{\n@iv#1\advance\n@iv\m@ne {\sign@skip=\n@iv\noteskip
\sign@skip=0.5\sign@skip \xdef\half@sign@skip{\the\sign@skip}}%
\zcharnote{#2}{\kern\h@lf\qn@width\kern \half@sign@skip\lrlap{\txtfont#1\/\/}}}
-\def\triolet{\xtuplet\txt} % T117 RDT
+\def\triolet{\xtuplet\txt} % version 1.17 RDT
%
% 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.
+% Added to musixtex.tex version 1.16 by RDT.
%
% Standard MusiXTeX uses \uptrio and \downtrio to print tuplet brackets.
% We define \uptuplet and \downtuplet, with the same arguments:
@@ -4485,8 +4495,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
+\def\sfz{{\ppff s\p@kern f\f@kern z}} % version 1.16
+\def\sfzp{{\ppff s\p@kern f\f@kern z\p@kern p}} % version 1.16
%%% spacings
@@ -4510,7 +4520,7 @@
% Otherwise, over/underfull boxes will occur on rescaled (pass 2) material
%%
-\def\qqsk{\off{\qu@rt\@l@mskip}} % T116 RDT
+\def\qqsk{\off{\qu@rt\@l@mskip}} % version 1.16 RDT
\def\hqsk{\off{\h@lf\@l@mskip}}
\def\qsk{\off\@l@mskip}
@@ -4549,8 +4559,8 @@
\def\NOTES{\vnotes11.32\elemskip}% 1th
}%
-\def\nnotes{\vnotes1.6\elemskip} % T116 RDT (corrected 2015-03-31)
-\def\nnnotes{\vnotes1.28\elemskip} % T116 RDT (corrected 2015-03-31)
+\def\nnotes{\vnotes1.6\elemskip} % version 1.16 RDT (corrected 2015-03-31)
+\def\nnnotes{\vnotes1.28\elemskip} % version 1.16 RDT (corrected 2015-03-31)
\arithmeticskipscale
@@ -4612,7 +4622,7 @@
\def\hcharnote{\let\@Ti\hard@box \C@ch}
\def\charnote#1#2{\zcharnote{#1}{#2}\sk}
-\def\zcn{\zcharnote} % T116
+\def\zcn{\zcharnote} % version 1.16
\def\ccn{\ccharnote}
\def\lcn{\lcharnote}
@@ -4636,7 +4646,7 @@
\def\setsongraise#1#2{\n@v#1\relax % select instrument
\expandafter\def\csname T@R\romannumeral\n@v\endcsname{#2}}
-% [T115] moved out to the new register allocation code
+% [version 1.15] moved out to the new register allocation code
% \let\T@Ri\z@
\def\qlrlap#1{\rlap{\hbox to \qn@width{\hss#1\hss}}}
@@ -4729,6 +4739,16 @@
\def\uptrio{\n@vi\z@ \let\@text\@ne \ovbkt}
\def\downtrio{\n@vi\@ne \let\@text\@ne \unbkt}
+%
+% slide #1=height #2=number of elements #3=slope(-8 to 8 [step 10degree])
+%
+\def\slide#1#2#3{\n@ii#3\relax\inhgetn@i#1\relax%
+ \ifnum\n@ii>\m@ne \advance\n@ii\m@ne\let\@Ti\raise
+ \else \n@ii-\n@ii \advance\n@ii\s@v@n\let\@Ti\lower \fi
+ \setbox\toks@box\hbox{\mxsps\char\n@ii}\n@iii\z@
+ \raise\n@i\internote\rlap{\hbox{\loop\ifnum\n@iii<#2%
+ \@Ti\n@iii\ht\toks@box\copy\toks@box\advance\n@iii\@ne\repeat}}}
+
%%% standard settings
% [115] make them compatible to >12 instruments
\def\resetlayout{\let\interfacteur\nin@
@@ -4748,7 +4768,7 @@
\ifnum\count@<\maxinstruments\repeat
}
-% [T115] setup the default maximum element numbers to the same values of T.114
+% [version 1.15] setup the default maximum element numbers to the same values of T.114
\setmaxinstruments\si@
\setmaxcxxviiibeams\si@ % 128th beam
\setmaxcclvibeams\z@ % 256th beam
@@ -4758,7 +4778,7 @@
\setmaxoctlines\maxinstruments
%
-% [T115] new register allocation code requires some changes
+% [version 1.15] new register allocation code requires some changes
%\resetlayout % no need
%\let\nbinstruments\maxinstruments % no need
%\normalnotesize % already executed in \setmaxinstruments
@@ -4896,7 +4916,7 @@
% 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 %
+% Added to musixtex.tex version 1.16 by RDT %
% %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/Master/texmf-dist/tex/generic/musixtex/musixtmr.tex b/Master/texmf-dist/tex/generic/musixtex/musixtmr.tex
index 572320ae41d..dbf8552c5e0 100644
--- a/Master/texmf-dist/tex/generic/musixtex/musixtmr.tex
+++ b/Master/texmf-dist/tex/generic/musixtex/musixtmr.tex
@@ -15,85 +15,85 @@
%% (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
+%% reference: musixtex.tex (0.99) 268-508
%% MusiXTeX: (c) Daniel Taupin, et al.
%%
%% History: see trailer.
%
-\immediate\write16{MusiXTimesFonts\space<2015/05/04>}
+\immediate\write16{MusiXTimesFonts\space<2015/07/25>}
%
% 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\eightrm=ptmr8t at 8pt
+\font\eightbf=ptmb8t at 8pt
+\font\eightit=ptmri8t at 8pt
+\font\eightbi=ptmbi8t at 8pt
\font\eightsc=ptmrc8t at 8pt % artificial small-caps
-\font\eightsl=ptmro8r at 8pt
+\font\eightsl=ptmro8t at 8pt
%
% 9pt
-\font\ninerm=ptmr8r at 9pt
-\font\ninebf=ptmb8r at 9pt
-\font\nineit=ptmri8r at 9pt
-\font\ninebi=ptmbi8r at 9pt
+\font\ninerm=ptmr8t at 9pt
+\font\ninebf=ptmb8t at 9pt
+\font\nineit=ptmri8t at 9pt
+\font\ninebi=ptmbi8t at 9pt
\font\ninesc=ptmrc8t at 9pt
-\font\ninesl=ptmro8r at 9pt
+\font\ninesl=ptmro8t at 9pt
%
% 10pt
-\font\tenrm=ptmr8r at 10pt
-\font\tenbf=ptmb8r at 10pt
-\font\tenit=ptmri8r at 10pt
-\font\tenbi=ptmbi8r at 10pt
+\font\tenrm=ptmr8t at 10pt
+\font\tenbf=ptmb8t at 10pt
+\font\tenit=ptmri8t at 10pt
+\font\tenbi=ptmbi8t at 10pt
\font\tensc=ptmrc8t at 10pt
-\font\tensl=ptmro8r at 10pt
+\font\tensl=ptmro8t at 10pt
%
%
% 11pt
-\font\elevenrm=ptmr8r at 11pt
-\font\elevenbf=ptmb8r at 11pt
-\font\elevenit=ptmri8r at 11pt
-\font\elevenbi=ptmbi8r at 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=ptmro8r at 11pt
+\font\elevensl=ptmro8t at 11pt
%
% 12pt
-\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\twelverm=ptmr8t scaled \magstep 1
+\font\twelvebf=ptmb8t scaled \magstep 1
+\font\twelveit=ptmri8t scaled \magstep 1
+\font\twelvebi=ptmbi8t scaled \magstep 1
\font\twelvesc=ptmrc8t scaled \magstep 1
-\font\twelvesl=ptmro8r scaled \magstep 1
+\font\twelvesl=ptmro8t 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\frtrm=ptmr8t scaled \magstep2
+\font\frtbf=ptmb8t scaled \magstep2
+\font\frtit=ptmri8t scaled \magstep2
+\font\frtbi=ptmbi8t scaled \magstep2
\font\frtsc=ptmrc8t scaled \magstep2
-\font\frtsl=ptmro8r scaled \magstep2
+\font\frtsl=ptmro8t scaled \magstep2
%
% 17pt
-\font\svtrm=ptmr8r scaled \magstep3
-\font\svtbf=ptmb8r scaled \magstep3
-\font\svtit=ptmri8r scaled \magstep3
-\font\svtbi=ptmbi8r scaled \magstep3
+\font\svtrm=ptmr8t scaled \magstep3
+\font\svtbf=ptmb8t scaled \magstep3
+\font\svtit=ptmri8t scaled \magstep3
+\font\svtbi=ptmbi8t scaled \magstep3
\font\svtsc=ptmrc8t scaled \magstep3
-\font\svtsl=ptmro8r scaled \magstep3
+\font\svtsl=ptmro8t scaled \magstep3
%
% 20pt
-\font\twtyrm=ptmr8r scaled \magstep4
-\font\twtybf=ptmb8r scaled \magstep4
-\font\twtyit=ptmri8r scaled \magstep4
-\font\twtybi=ptmbi8r scaled \magstep4
+\font\twtyrm=ptmr8t scaled \magstep4
+\font\twtybf=ptmb8t scaled \magstep4
+\font\twtyit=ptmri8t scaled \magstep4
+\font\twtybi=ptmbi8t scaled \magstep4
\font\twtysc=ptmrc8t scaled \magstep4
-\font\twtysl=ptmro8r scaled \magstep4
+\font\twtysl=ptmro8t scaled \magstep4
%
% 25pt
-\font\twfvrm=ptmr8r scaled \magstep5
-\font\twfvbf=ptmb8r scaled \magstep5
-\font\twfvit=ptmri8r scaled \magstep5
-\font\twfvbi=ptmbi8r scaled \magstep5
+\font\twfvrm=ptmr8t scaled \magstep5
+\font\twfvbf=ptmb8t scaled \magstep5
+\font\twfvit=ptmri8t scaled \magstep5
+\font\twfvbi=ptmbi8t scaled \magstep5
\font\twfvsc=ptmrc8t scaled \magstep5
-\font\twfvsl=ptmro8r scaled \magstep5
+\font\twfvsl=ptmro8t scaled \magstep5
%
% Large fonts for titles
% (If you prefer Times-bold, use ..bf instead of ..rm)
@@ -104,16 +104,16 @@
\let\BIGfont=\twfvrm
%
%
-\font\ppfftwelve=ptmbi8r at 8pt
-\font\ppffsixteen=ptmbi8r at 10pt
-\font\ppfftwenty=ptmbi8r scaled \magstep 1
-\font\ppfftwentyfour=ptmbi8r scaled \magstep2
-\font\ppfftwentynine=ptmbi8r scaled \magstep3
+\font\ppfftwelve=ptmbi8t at 8pt
+\font\ppffsixteen=ptmbi8t at 10pt
+\font\ppfftwenty=ptmbi8t scaled \magstep 1
+\font\ppfftwentyfour=ptmbi8t scaled \magstep2
+\font\ppfftwentynine=ptmbi8t scaled \magstep3
%
-\def\tinydyn{\let\ppff\tinyppff}
-\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}
%
\def\f{{\ppff f}}
\def\ff{{\ppff ff}}
@@ -200,17 +200,42 @@
\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=ptmr8r scaled \magstep2
-% \font\BIGfont=ptmr8r scaled \magstep4
+% \font\Bigfont=ptmr7t scaled \magstep2
+% \font\BIGfont=ptmr7t scaled \magstep4
%\fi
%
+%
+% Redefine accented characters for etex, suggested by David Carlisle:
+%
+\ifx\documentclass\undefined
+\def\ProvidesFile#1[#2]{}
+\def\DeclareFontEncoding#1#2#3{}
+\def\DeclareTextAccent#1#2#3{%
+\def#1##1{%
+\expandafter\ifx\csname T1\string#1-\string##1\endcsname\relax
+{\accent#1 ##1}%
+\else
+\csname T1\string#1-\string##1\expandafter\endcsname
+\fi}}
+\def\DeclareTextCommand#1#2{\xdtcmd}%not today
+\def\xdtcmd#1#{\xxdtcmd}%not today
+\def\xxdtcmd#1{}%not today
+\def\DeclareTextCompositeCommand#1#2#3#4{}%not today
+\def\DeclareTextSymbol#1#2#3{%
+\def#1{\char#3\relax}}
+\def\DeclareTextComposite#1#2#3#4{%
+\expandafter\def\csname T1\string#1-\string#3\endcsname{\char#4\relax}}
+
+\input t1enc.def
+\fi
+
\normtype
\endinput
%%
@@ -225,6 +250,9 @@
%% 2008/08/01
%% Font assignment change on PMX.
%% 2009/10/15
-%% small update for MusiXTeX T.114 final release.
+%% small update for MusiXTeX 1.14 final release.
%% 2015/02/06
%% 8-bit encoding and extensions, similar to musixplt.tex
+%% 2015-07-25
+%% change to ptmr8t fonts and use t1enc.def to re-defined accented characters
+