From e4bbbf71a1a7ed2bd323e6c971bb8ff99f777f3c Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 1 Mar 2017 22:32:52 +0000 Subject: musixtex (1mar17) git-svn-id: svn://tug.org/texlive/trunk@43375 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/generic/musixtex/musixec.tex | 11 ++-- Master/texmf-dist/tex/generic/musixtex/musixhv.tex | 10 +-- .../texmf-dist/tex/generic/musixtex/musixlit.tex | 4 +- .../texmf-dist/tex/generic/musixtex/musixplt.tex | 10 +-- .../texmf-dist/tex/generic/musixtex/musixppff.tex | 3 +- Master/texmf-dist/tex/generic/musixtex/musixps.tex | 1 + .../texmf-dist/tex/generic/musixtex/musixtex.tex | 75 ++++++++++++++-------- .../texmf-dist/tex/generic/musixtex/musixtmr.tex | 10 +-- 8 files changed, 79 insertions(+), 45 deletions(-) (limited to 'Master/texmf-dist/tex/generic') diff --git a/Master/texmf-dist/tex/generic/musixtex/musixec.tex b/Master/texmf-dist/tex/generic/musixtex/musixec.tex index 5ec8d0936c4..e213f30fb1f 100644 --- a/Master/texmf-dist/tex/generic/musixtex/musixec.tex +++ b/Master/texmf-dist/tex/generic/musixtex/musixec.tex @@ -21,9 +21,10 @@ % the Free Software Foundation, Inc., 59 Temple Place - Suite 330, % Boston, MA 02111-1307, USA. % -% Copyright 2015-2016 Bob Tennent rdt@cs.queensu.ca +% Copyright 2015-2017 Bob Tennent rdt@cs.queensu.ca % -\immediate\write16{MusiXec\space<2016/02/22>} +\ifx\undefined\startpiece\errmessage{Input musixtex.tex before musixec.tex}\fi +\immediate\write16{MusiXec\space<2017/02/10>} % \longECfontnamestrue @@ -131,11 +132,11 @@ \font\twfvsl=ecsl2488 % -% Redefine accented characters for etex +% Redefine accented characters for 8-bit font % -\edef\catcodeat{\the\catcode`\@}\catcode`\@=11 \ifx\documentclass\undefined +\edef\catcodeat{\the\catcode`\@}\catcode`\@=11 \def\ProvidesFile#1[#2]{} \def\DeclareFontEncoding#1#2#3{} \def\DeclareTextAccent#1#2#3{% @@ -160,9 +161,9 @@ \def\c#1{\leavevmode\ifx c#1\char231 \else\setbox\z@\hbox{#1}\ifdim\ht\z@=1ex\accent11 #1% \else{\ooalign{\unhbox\z@\crcr \hidewidth\char11\hidewidth}}\fi\fi} +\catcode`\@=\catcodeat \fi -\catcode`\@=\catcodeat \normtype \endinput diff --git a/Master/texmf-dist/tex/generic/musixtex/musixhv.tex b/Master/texmf-dist/tex/generic/musixtex/musixhv.tex index 651f57e7ba2..9c247633301 100644 --- a/Master/texmf-dist/tex/generic/musixtex/musixhv.tex +++ b/Master/texmf-dist/tex/generic/musixtex/musixhv.tex @@ -21,9 +21,10 @@ % the Free Software Foundation, Inc., 59 Temple Place - Suite 330, % Boston, MA 02111-1307, USA. % -% Copyright 2015-2016 Bob Tennent rdt@cs.queensu.ca +% Copyright 2015-2017 Bob Tennent rdt@cs.queensu.ca % -\immediate\write16{MusiXhv\space<2016/02/22>} +\immediate\write16{MusiXhv\space<2017/02/10>} +\ifx\undefined\startpiece\errmessage{Input musixtex.tex before musixhv.tex}\fi % % 7pt "Roman" (sans serif), bold, "italic" (oblique), "bold-italic" (bold-oblique), and small-cap \font\sevenrm=phvr8t at 7pt @@ -133,7 +134,8 @@ \font\twfvsl=phvro8t scaled \magstep5 % % -\edef\catcodeat{\the\catcode`\@}\catcode`\@=11 +\edef\catcodeat{\the\catcode`\@} +\catcode`\@=11 % \def\sF{{\ppff s\p@kern f}} \def\sfz{{\ppff s\p@kern f\f@kern z}} @@ -147,6 +149,7 @@ % Redefine accented characters for etex, suggested by David Carlisle: % \ifx\documentclass\undefined +\catcode`\@=11 \def\ProvidesFile#1[#2]{} \def\DeclareFontEncoding#1#2#3{} \def\DeclareTextAccent#1#2#3{% @@ -167,7 +170,6 @@ \input t1enc.def -\edef\catcodeat{\the\catcode`\@}\catcode`\@=11 \def\c#1{\leavevmode\ifx c#1\char231 \else\setbox\z@\hbox{#1}\ifdim\ht\z@=1ex\accent11 #1% \else{\ooalign{\unhbox\z@\crcr \hidewidth\char11\hidewidth}}\fi\fi} diff --git a/Master/texmf-dist/tex/generic/musixtex/musixlit.tex b/Master/texmf-dist/tex/generic/musixtex/musixlit.tex index 410a0a28d63..f55fb8f826e 100644 --- a/Master/texmf-dist/tex/generic/musixtex/musixlit.tex +++ b/Master/texmf-dist/tex/generic/musixtex/musixlit.tex @@ -17,7 +17,7 @@ % Boston, MA 02111-1307, USA. % -\immediate\write16{MusiXLITurgical 0.37\space<23 Dec 2015>}% +\immediate\write16{MusiXLITurgical 0.38\space<17 Dec 2016>}% \ifx\undefined\oldGclef \else \endinput \fi @@ -34,6 +34,8 @@ \def\cnql{\def\q@u{\musixfont\@c}\@nq} \def\cnhu{\def\q@u{\musixchar101}\@nq} \def\cnhl{\def\q@u{\musixchar102}\@nq} +\def\cqb{\def\q@u{\musixchar99}\@qb} % RDT 2016-12-17 +\def\zcqb{\advancefalse\cqb} % RDT 2016-12-17 % Moved to musixtex.tex. RDT 2015-12-23 diff --git a/Master/texmf-dist/tex/generic/musixtex/musixplt.tex b/Master/texmf-dist/tex/generic/musixtex/musixplt.tex index 27ff21bf849..3e0b36aae1d 100644 --- a/Master/texmf-dist/tex/generic/musixtex/musixplt.tex +++ b/Master/texmf-dist/tex/generic/musixtex/musixplt.tex @@ -21,9 +21,10 @@ % the Free Software Foundation, Inc., 59 Temple Place - Suite 330, % Boston, MA 02111-1307, USA. % -% Copyright 2015-2016 Bob Tennent rdt@cs.queensu.ca +% Copyright 2015-2017 Bob Tennent rdt@cs.queensu.ca % -\immediate\write16{MusiXplt\space<2016/02/22>} +\immediate\write16{MusiXplt\space<2017/02/10>} +\ifx\undefined\startpiece\errmessage{Input musixtex.tex before musixplt.tex}\fi % % 7pt roman, bold, italic, bold italic, slanted and small-cap \font\sevenrm=pplr8t at 7pt @@ -147,9 +148,11 @@ \catcode`\@=\catcodeat % -% Redefine accented characters for etex, suggested by David Carlisle: +% Redefine accented characters for 8-bit font, suggested by David Carlisle: % + \ifx\documentclass\undefined +\catcode`\@=11 \def\ProvidesFile#1[#2]{} \def\DeclareFontEncoding#1#2#3{} \def\DeclareTextAccent#1#2#3{% @@ -170,7 +173,6 @@ \input t1enc.def -\edef\catcodeat{\the\catcode`\@}\catcode`\@=11 % \c needs special treatment \def\c#1{\leavevmode\ifx c#1\char231 \else\setbox\z@\hbox{#1}\ifdim\ht\z@=1ex\accent11 #1% \else{\ooalign{\unhbox\z@\crcr diff --git a/Master/texmf-dist/tex/generic/musixtex/musixppff.tex b/Master/texmf-dist/tex/generic/musixtex/musixppff.tex index 0cae2ea79f9..6d06e70b424 100644 --- a/Master/texmf-dist/tex/generic/musixtex/musixppff.tex +++ b/Master/texmf-dist/tex/generic/musixtex/musixppff.tex @@ -12,7 +12,8 @@ %% ... %% %% -\immediate\write16{MusiXppff \noexpand\ppff font replacement <2015/07/25>}% +\immediate\write16{MusiXppff \noexpand\ppff font replacement <2017/02/10>}% +\ifx\undefined\startpiece\errmessage{Input musixtex.tex before musixppff.tex}\fi \font\xppfftwelve=xppff10 at 8pt \font\xppffsixteen=xppff10 diff --git a/Master/texmf-dist/tex/generic/musixtex/musixps.tex b/Master/texmf-dist/tex/generic/musixtex/musixps.tex index cf62ea618d2..e2033e2b076 100644 --- a/Master/texmf-dist/tex/generic/musixtex/musixps.tex +++ b/Master/texmf-dist/tex/generic/musixtex/musixps.tex @@ -1,6 +1,7 @@ %% PostScript slurs, ties and crescendos % Coded by Stanislav Kneifl +\ifx\undefined\startpiece\errmessage{Input musixtex.tex before musixps.tex}\fi \ifx\undefined\liftcresc\else\endinput\fi \immediate\write16{MusiXPS PostScript slurs, ties and crescendos 0.93 (17.2.2015)}% diff --git a/Master/texmf-dist/tex/generic/musixtex/musixtex.tex b/Master/texmf-dist/tex/generic/musixtex/musixtex.tex index 3aeb36d56c7..6d366b32580 100644 --- a/Master/texmf-dist/tex/generic/musixtex/musixtex.tex +++ b/Master/texmf-dist/tex/generic/musixtex/musixtex.tex @@ -25,15 +25,25 @@ \def\mufl@x{0.83}% \def\mxmajorvernumber{1} -\def\mxminorvernumber{23} +\def\mxminorvernumber{24} \def\mxvernumber{\mxmajorvernumber\mxminorvernumber}% make it possible to compare with \ifnum \def\mxversuffix{}% \edef\mxversion{\mxmajorvernumber.\mxminorvernumber\mxversuffix} -\def\mxdate{2016-06-06} +\def\mxdate{2017-02-28} \immediate\write16{MusiXTeX(c) \mxversion\space<\mxdate>}% \everyjob{\immediate\write16{MusiXTeX(c) \mxversion\space<\mxdate>}}% +% version 1.24 + +% preserve changes to \transpose in an hboxed tremolo command +% test that musixtex.tex has already been loaded in some extensions: +% musixps, musixec, musixhv, musixplt, musixtmr, musixppff +% changed from \it to \ppff in several places +% support new command \setinterstaff{n}{m} +% define \largenotesize, \Largenotesize +% correct typos \twtybf[g] \svtbf[g] + % version 1.23 % added \xtr and \ptr ornaments @@ -247,7 +257,7 @@ \newcount\n@vi \newcount\n@vii \newcount\n@viii -%\newcount\count@ %=\count255 def'd in plain +\newcount\count@ \newbox\toks@box \newbox\w@rkbox @@ -342,6 +352,7 @@ \advance\count@ by\@ne % \expandafter \let \csname interinstrument\roman@c@\endcsname \interinstrument + \expandafter\def\csname interfacteur\roman@c@\endcsname{\interfacteur} % RDT 1.24 % % altitude \expandafter \noexpand@newskip \csname k@i\roman@c@\endcsname @@ -1568,6 +1579,10 @@ \let\curr@ntsiz@\smallnotesize} \def\tinynotesize{\set@tinynotesize\comput@specifics \let\curr@ntsiz@\tinynotesize} +\def\largenotesize{\set@largenotesize\comput@specifics % v.124 RDT + \let\curr@ntsiz@\largenotesize} +\def\Largenotesize{\set@Largenotesize\comput@specifics % v.124 RDT + \let\curr@ntsiz@\Largenotesize} \def\musickeyfont{% \ifdim\internote<\p@seven6\Internote \musictinyfont @@ -1686,8 +1701,8 @@ \let\hsluru\hslurutwenty \let\hslurd\hslurdtwenty \let\slurud\slurutwentyd \let\slurdd\slurdtwentyd % +ickd \let\hslurud\hslurutwentyd \let\hslurdd\hslurdtwentyd %+ickd - \let\meternorfont\svtbfg \let\metersmallfont\frtbf % version 1.18 RDT - \let\meterbigfont\twtybfg \let\meterlargefont\twfvbf + \let\meternorfont\svtbf \let\metersmallfont\frtbf % version 1.18 RDT + \let\meterbigfont\twtybf \let\meterlargefont\twfvbf % version 1.24 typos corrected \let\meterLargefont\twfvbf \let\tinyppff\ppfftwenty \let\smallppff\ppfftwentyfour @@ -1788,7 +1803,8 @@ \edef\st@ffs{\csname n@p\romannumeral\noinstrum@nt\endcsname}% \edef\nblines{\csname n@l\romannumeral\noinstrum@nt\endcsname}% \edef\internote{\csname i@n\romannumeral\noinstrum@nt\endcsname}% - \interportee\interfacteur\internote \interportee\tw@\interportee} + \edef\int@rf{\csname interfacteur\romannumeral\noinstrum@nt\endcsname}% RDT 1.24 + \interportee\int@rf\internote \interportee\tw@\interportee} % RDT 1.24 \def\C@Inter{% RDT: corrected to work if \nblines > 6 (version 1.23) \stem@skip\interportee @@ -1899,6 +1915,9 @@ \def\setinterinstrument#1#2{\n@v#1\relax % select instrument \expandafter\def\csname interinstrument\romannumeral\n@v\endcsname{#2}} +\def\setinterstaff#1#2{\n@v#1\relax % select instrument % RDT 1.24 + \expandafter\def\csname interfacteur\romannumeral\n@v\endcsname{#2}} + %%% portees \newdimen\systemheight @@ -2977,7 +2996,7 @@ \let\rq\rq@ \let\lq\lq@ \let\ds\ds@oup \let\mp\mp@ \locx@skip\x@skip} -\def\@ndstaff{\egroup +\def\@ndstaff{\egroup % this where \transpose gets reset \ifdim\n@skip<\wd\n@otebox \n@skip\wd\n@otebox \fi \raise\altportee\rlap{\unhbox\n@otebox}} @@ -3030,8 +3049,8 @@ \if .\t@ruc \let\@TI\pt \C@GET \fi \if >\t@ruc \let\@TI\dsh \C@GET \fi \if <\t@ruc \let\@TI\dfl \C@GET \fi - \if !\t@ruc \transpose\normaltranspose \C@Get \fi - \if '\t@ruc \advance\transpose\s@v@n \C@Get \fi + \if !\t@ruc \transpose\normaltranspose \C@Get \fi + \if '\t@ruc \advance\transpose\s@v@n \C@Get \fi \if `\t@ruc \advance\transpose-\s@v@n \C@Get \fi \ifnum\n@viii<\maxdimen \n@i#1\fi \else @@ -4298,7 +4317,7 @@ \def\trilleX{\let\T@i\empty \C@trille} \let\trille\trilleX -\def\TrilleX{\def\T@i{\it tr }\C@trille} +\def\TrilleX{\def\T@i{\ppff tr }\C@trille} % 1.24 changed from \it RDT \let\Trille\TrilleX \def\C@trille#1#2{\zcharnote{#1}{\y@v#2\noteskip \trill@}} @@ -4337,7 +4356,7 @@ \def\tTrill@old#1{\s@l@cttrill#1\relax \message{\noexpand\tr@x=\the\tr@x, No. #1}% \ifdim\tr@x < \maxdimen\else\errmessage{\@mis \noexpand\Itrille \number #1}\fi - \def\T@i{\it tr }\C@tri} + \def\T@i{\ppff tr }\C@tri} % 1.24 changed from \it RDT \def\C@tri#1{\getcurpos\advance\y@v-\tr@y \kernm\y@v \zcharnote{#1}\trill@\kern\y@v\let\T@i\empty\let\@itrille\undefined} @@ -4379,7 +4398,7 @@ \C@T} \def\ITrille#1{\s@l@cttrill#1\relax \ifdim\tr@x < \maxdimen\errmessage{\@mis \noexpand\Ttrille \number #1}\fi - \global\tr@sw={{\it tr }}% + \global\tr@sw={{\ppff tr }}% 1.24 changed from \it RDT \C@T} \def\C@T#1{% @@ -4405,23 +4424,26 @@ %%% version 1.21 %%% RDT changed beam numbers to 5, suggested by JPC %%% RDT adjusted the vertical positions for 16th and 32nd tremolos +%%% version 1.24 +%%% RDT use new counter \tr@nspose to preserve changes to \transpose in an \hbox -\def\trml#1{\raise2\internote\hbox{\loffset{0.5}{\ibl5{#1}9}\roffset{0.5}{\tbl5}}}% -\def\trmu#1{\raise-3\internote\hbox{\loffset{0.5}{\ibu5{#1}9}\roffset{0.5}{\tbu5}}}% -\def\trrml#1{\raise3\internote\hbox{\loffset{0.5}{\ibbl5{#1}9}\roffset{0.5}{\tbl5}}}% -\def\trrmu#1{\raise-4\internote\hbox{\loffset{0.5}{\ibbu5{#1}9}\roffset{0.5}{\tbu5}}}% -\def\trrrml#1{\raise3\internote\hbox{\loffset{0.5}{\ibbbl5{#1}9}\roffset{0.5}{\tbl5}}}% -\def\trrrmu#1{\raise-4\internote\hbox{\loffset{0.5}{\ibbbu5{#1}9}\roffset{0.5}{\tbu5}}}% +\newcount\tr@nspose % used to restore value of \transpose after closing an \hbox +\def\trml#1{\raise2\internote\hbox{\loffset{0.5}{\ibl5{#1}9}\roffset{0.5}{\tbl5}\global\tr@nspose\transpose}\transpose\tr@nspose}% +\def\trmu#1{\raise-3\internote\hbox{\loffset{0.5}{\ibu5{#1}9}\roffset{0.5}{\tbu5}\global\tr@nspose\transpose}\transpose\tr@nspose}% +\def\trrml#1{\raise3\internote\hbox{\loffset{0.5}{\ibbl5{#1}9}\roffset{0.5}{\tbl5}\global\tr@nspose\transpose}\transpose\tr@nspose}% +\def\trrmu#1{\raise-4\internote\hbox{\loffset{0.5}{\ibbu5{#1}9}\roffset{0.5}{\tbu5}\global\tr@nspose\transpose}\transpose\tr@nspose}% +\def\trrrml#1{\raise3\internote\hbox{\loffset{0.5}{\ibbbl5{#1}9}\roffset{0.5}{\tbl5}\global\tr@nspose\transpose}\transpose\tr@nspose}% +\def\trrrmu#1{\raise-4\internote\hbox{\loffset{0.5}{\ibbbu5{#1}9}\roffset{0.5}{\tbu5}\global\tr@nspose\transpose}\transpose\tr@nspose}% % whole notes are wider than quarter/half notes: % version 1.21 RDT adjusted the offsets and vertical positions -\def\Trml#1{\raise3\internote\hbox{\ibl5{#1}9\roffset{1.25}{\tbl5}}}% -\def\Trmu#1{\raise-4\internote\hbox{\loffset{1.1}{\ibu5{#1}9}\roffset{0.15}{\tbu5}}}% -\def\Trrml#1{\raise3\internote\hbox{\ibbl5{#1}9\roffset{1.25}{\tbl5}}}% -\def\Trrmu#1{\raise-4\internote\hbox{\loffset{1.1}{\ibbu5{#1}9}\roffset{0.15}{\tbu5}}}% -\def\Trrrml#1{\raise3\internote\hbox{\ibbbl5{#1}9\roffset{1.25}{\tbl5}}}% -\def\Trrrmu#1{\raise-4\internote\hbox{\loffset{1.1}{\ibbbu5{#1}9}\roffset{0.15}{\tbu5}}}% +\def\Trml#1{\raise3\internote\hbox{\ibl5{#1}9\roffset{1.25}{\tbl5}\global\tr@nspose\transpose}\transpose\tr@nspose}% +\def\Trmu#1{\raise-4\internote\hbox{\loffset{1.1}{\ibu5{#1}9}\roffset{0.15}{\tbu5}\global\tr@nspose\transpose}\transpose\tr@nspose}% +\def\Trrml#1{\raise3\internote\hbox{\ibbl5{#1}9\roffset{1.25}{\tbl5}\global\tr@nspose\transpose}\transpose\tr@nspose}% +\def\Trrmu#1{\raise-4\internote\hbox{\loffset{1.1}{\ibbu5{#1}9}\roffset{0.15}{\tbu5}\global\tr@nspose\transpose}\transpose\tr@nspose}% +\def\Trrrml#1{\raise3\internote\hbox{\ibbbl5{#1}9\roffset{1.25}{\tbl5}\global\tr@nspose\transpose}\transpose\tr@nspose}% +\def\Trrrmu#1{\raise-4\internote\hbox{\loffset{1.1}{\ibbbu5{#1}9}\roffset{0.15}{\tbu5}\global\tr@nspose\transpose}\transpose\tr@nspose}% %%% octave lines @@ -4700,7 +4722,7 @@ \def\f{{\ppff f}} \def\ff{{\ppff f\f@kern f}} \def\fp{{\ppff f\f@kern p}} -\def\sF{{\it s\ppff \p@kern f}} +\def\sF{{\ppff s\ppff \p@kern f}} % changed \it to \ppff 1.24 RDT \def\fff{{\ppff f\f@kern f\f@kern f}} \def\ffff{{\ppff f\f@kern f\f@kern f\f@kern f}} \def\mf{{\ppff m\p@kern\f@kern f}} @@ -4966,11 +4988,12 @@ %%% standard settings % [115] make them compatible to >12 instruments -\def\resetlayout{\let\interfacteur\nin@ +\def\resetlayout{\def\interfacteur{9}% \stafftopmarg\thr@@\Interligne \staffbotmarg\thr@@\Interligne \count@\z@ \loop \advance\count@ by\@ne \expandafter \let\csname n@l\roman@c@\endcsname \fiv@ + \expandafter\def\csname interfacteur\roman@c@\endcsname{\interfacteur} % RDT 1.24 \ifnum\count@<\maxinstruments\repeat \resetclefsymbols} diff --git a/Master/texmf-dist/tex/generic/musixtex/musixtmr.tex b/Master/texmf-dist/tex/generic/musixtex/musixtmr.tex index 59a49cb9214..16f48a67e33 100644 --- a/Master/texmf-dist/tex/generic/musixtex/musixtmr.tex +++ b/Master/texmf-dist/tex/generic/musixtex/musixtmr.tex @@ -20,7 +20,8 @@ %% %% History: see trailer. % -\immediate\write16{MusiXTimesFonts\space<2016/02/22>} +\immediate\write16{MusiXTimesFonts\space<2017/02/10>} +\ifx\undefined\startpiece\errmessage{Input musixtex.tex before musixtmr.tex}\fi % % 7pt roman, bold, italic, bold italic, slanted and small-cap \font\sevenrm=ptmr8t at 7pt @@ -146,7 +147,7 @@ \let\mezzopiano\mp@ % -% Redefine accented characters for etex, suggested by David Carlisle: +% Redefine accented characters for 8-bit font, suggested by David Carlisle: % \ifx\documentclass\undefined \def\ProvidesFile#1[#2]{} @@ -166,10 +167,10 @@ \def#1{\char#3\relax}} \def\DeclareTextComposite#1#2#3#4{% \expandafter\def\csname T1\string#1-\string#3\endcsname{\char#4\relax}} +\edef\catcodeat{\the\catcode`\@}\catcode`\@=11 \input t1enc.def -\edef\catcodeat{\the\catcode`\@}\catcode`\@=11 % \c needs special treatment \def\c#1{\leavevmode\ifx c#1\char231 \else\setbox\z@\hbox{#1}\ifdim\ht\z@=1ex\accent11 #1% \else{\ooalign{\unhbox\z@\crcr @@ -196,4 +197,5 @@ %% 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 - +%% 2016-07-11 RDT +%% \catcode`\@=11 before inputting t1enc.def -- cgit v1.2.3