summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-11-29 22:45:29 +0000
committerKarl Berry <karl@freefriends.org>2015-11-29 22:45:29 +0000
commit12fc7ee3ae7730f90014b301df62d10f14c8eb6d (patch)
treebeeb8e2455232634009bf4a959d0846bbc4d141b /Master/texmf-dist/tex
parentacc37e656d3fb05f4354f700b8ed1e736bc353b3 (diff)
musixtex (29nov15)
git-svn-id: svn://tug.org/texlive/trunk@38974 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/generic/musixtex/musixec.tex27
-rw-r--r--Master/texmf-dist/tex/generic/musixtex/musixtex.tex43
2 files changed, 61 insertions, 9 deletions
diff --git a/Master/texmf-dist/tex/generic/musixtex/musixec.tex b/Master/texmf-dist/tex/generic/musixtex/musixec.tex
index ced44c02d20..72252737185 100644
--- a/Master/texmf-dist/tex/generic/musixtex/musixec.tex
+++ b/Master/texmf-dist/tex/generic/musixtex/musixec.tex
@@ -23,7 +23,7 @@
%
% Copyright 2015 Bob Tennent rdt@cs.queensu.ca
%
-\immediate\write16{MusiXec\space<2015/02/11>}
+\immediate\write16{MusiXec\space<2015/07/28>}
%
\newif\iflongDCfontnames
@@ -212,5 +212,30 @@
\zcharnote{#2}{\kern\h@lf\qn@width\kern \half@sign@skip\lrlap{\txtfont#1}}}
\catcode`\@=\catcodeat
+%
+% 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/musixtex.tex b/Master/texmf-dist/tex/generic/musixtex/musixtex.tex
index 3de1de22292..0016785fb64 100644
--- a/Master/texmf-dist/tex/generic/musixtex/musixtex.tex
+++ b/Master/texmf-dist/tex/generic/musixtex/musixtex.tex
@@ -25,15 +25,20 @@
\def\mufl@x{0.83}%
\def\mxmajorvernumber{1}
-\def\mxminorvernumber{18}
+\def\mxminorvernumber{19}
\def\mxvernumber{\mxmajorvernumber\mxminorvernumber}% make it possible to compare with \ifnum
\def\mxversuffix{}%
\edef\mxversion{\mxmajorvernumber.\mxminorvernumber\mxversuffix}
-\def\mxdate{2015-07-25}
+\def\mxdate{2015-11-29}
\immediate\write16{MusiXTeX(c) \mxversion\space<\mxdate>}%
\everyjob{\immediate\write16{MusiXTeX(c) \mxversion\space<\mxdate>}}%
+% version 1.19:
+
+% RDT corrected typos in the definition of \comput@fonts affecting ppff fonts for \Largemusicsize
+% RDT introduced definitions for tremolo commands \trml, \trmu, etc.
+
% version 1.18:
% RDT added definitions of \raggedstoppiece and \slide from musixext.tex
@@ -1609,11 +1614,11 @@
\let\hslurud\hslurutwentyd \let\hslurdd\hslurdtwentyd %+ickd
\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
+ \let\meterLargefont\twfvbf
+ \let\tinyppff\ppfftwenty
+ \let\smallppff\ppfftwentyfour
+ \let\normppff\ppfftwentynine
+ \let\medppff\ppfftwentynine
\else
\ifnum\musicsize=\tw@nty
\else\ifnum\musicsize=\z@
@@ -4206,6 +4211,24 @@
% Correction by Julian Gilbey
\the\tr@sw\xleaders\hbox{\musixchar69}\hfill}}%
+%%% tremolos version 1.19 RDT
+%%% based on code by Werner Icking and Andre van Ryckeghem
+
+\def\trml#1{\advance\transpose2\loffset{0.5}{\ibl0{#1}9}\roffset{0.5}{\tbl0}\advance\transpose-2}%
+\def\trmu#1{\advance\transpose-3\loffset{0.5}{\ibu0{#1}9}\roffset{0.5}{\tbu0}\advance\transpose3}%
+\def\trrml#1{\advance\transpose2\loffset{0.5}{\ibbl0{#1}9}\roffset{0.5}{\tbl0}\advance\transpose-2}%
+\def\trrmu#1{\advance\transpose-3\loffset{0.5}{\ibbu0{#1}9}\roffset{0.5}{\tbu0}\advance\transpose3}%
+\def\trrrml#1{\advance\transpose2\loffset{0.5}{\ibbbl0{#1}9}\roffset{0.5}{\tbl0}\advance\transpose-2}%
+\def\trrrmu#1{\advance\transpose-3\loffset{0.5}{\ibbbu0{#1}9}\roffset{0.5}{\tbu0}\advance\transpose3}%
+
+% whole notes are wider than quarter/half notes:
+\def\Trml#1{\advance\transpose2\loffset0{\ibl0{#1}9}\roffset{1.125}{\tbl0}\advance\transpose-2}%
+\def\Trmu#1{\advance\transpose-3\loffset{1.125}{\ibu0{#1}9}\roffset0{\tbu0}\advance\transpose3}%
+\def\Trrml#1{\advance\transpose2\loffset0{\ibbl0{#1}9}\roffset{1.125}{\tbl0}\advance\transpose-2}%
+\def\Trrmu#1{\advance\transpose-3\loffset{1.125}{\ibbu0{#1}9}\roffset0{\tbu0}\advance\transpose3}%
+\def\Trrrml#1{\advance\transpose2\loffset0{\ibbbl0{#1}9}\roffset{1.125}{\tbl0}\advance\transpose-2}%
+\def\Trrrmu#1{\advance\transpose-3\loffset{1.125}{\ibbbu0{#1}9}\roffset0{\tbu0}\advance\transpose3}%
+
%%% octave lines
\def\octnumberup{\octnumberdefault\vrule width 0pt height2ex}
@@ -4307,7 +4330,11 @@
%%% some specials
-\def\metron#1#2{{\stemlength\f@ur\noteskip\t@n\p@ #1 1\ = #2}}
+% \def\metron#1#2{{\stemlength\f@ur\noteskip\t@n\p@ #1 1\ = #2}}
+% version 1.19 RDT:
+\let\lyricson\relax
+\let\lyricsoff\relax
+\def\metron#1#2{{\lyricsoff\stemlength\f@ur\noteskip\t@n\p@ #1 1\ = #2\lyricson}}
\def\metronequiv#1#2{{\stemlength\f@ur\noteskip\t@n\p@ #1 1\ = #2 1}}