summaryrefslogtreecommitdiff
path: root/macros/musixtex/tex
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2020-03-21 03:01:37 +0000
committerNorbert Preining <norbert@preining.info>2020-03-21 03:01:37 +0000
commit3e43bc594a14e8c4fc21d6a71f22a23dd78fe252 (patch)
tree19d1a8bb88da795b5317f91775f645e0b7bd9eb9 /macros/musixtex/tex
parentc720a4409b388fa706f3eb1ce275f76f7d49d996 (diff)
CTAN sync 202003210301
Diffstat (limited to 'macros/musixtex/tex')
-rw-r--r--macros/musixtex/tex/musixps.tex11
-rw-r--r--macros/musixtex/tex/musixtex.tex43
2 files changed, 42 insertions, 12 deletions
diff --git a/macros/musixtex/tex/musixps.tex b/macros/musixtex/tex/musixps.tex
index e2033e2b07..6e877494e7 100644
--- a/macros/musixtex/tex/musixps.tex
+++ b/macros/musixtex/tex/musixps.tex
@@ -1,5 +1,6 @@
%% PostScript slurs, ties and crescendos
% Coded by Stanislav Kneifl
+% RDT added \psRslurskip \iRslur \tRslur \psRtieskip \tRtie \psLtieskip \tLtie 2019/06/17
\ifx\undefined\startpiece\errmessage{Input musixtex.tex before musixps.tex}\fi
\ifx\undefined\liftcresc\else\endinput\fi
@@ -26,6 +27,7 @@
\def\psbslurraise{2} % vert. offset for slurs on beams
\def\psLslurskip{-0.2} % horiz. offset of slurs shifted more to the left
+\def\psRslurskip{4} % horiz. offset of slurs shifted more to the right
\def\pslslurskip{0.4} % horiz. offset of slurs shifted to the left
\def\psislurskip{1.4} % horiz. offset of the slur beginnings
\def\pstslurskip{1.2} % horiz. offset of the slur endings
@@ -48,6 +50,8 @@
\def\psttieskip{0.3} % horiz. offset of the tie endings
\def\psltieskip{-0.2} % horiz. offset of ties shifted to the left
\def\psrtieskip{3} % horiz. offset of ties shifted to the right
+\def\psLtieskip{-0.4} % horiz. offset of ties shifted more to the left
+\def\psRtieskip{4} % horiz. offset of ties shifted more to the right
\def\pstiehgt{0.7} % height coeficient of the ties
\def\pstiemaxhgt{30} % maximal height if the ties
@@ -554,7 +558,9 @@
\def\ilsluru#1#2{\iSlur{#1}{#2}{\psslurraise}{\pslslurskip}}
\def\ilslurd#1#2{\iSlur{#1}{#2}{-\psslurraise}{\pslslurskip}}
\def\iLsluru#1#2{\iSlur{#1}{#2}{\psslurraise}{\psLslurskip}}
-\def\iLslurd#1#2{\iSlur{#1}{#2}{-\psslurraise}{\psLslurskip}}
+\def\iLsluru#1#2{\iSlur{#1}{#2}{\psslurraise}{\psLslurskip}}
+\def\iRslurd#1#2{\iSlur{#1}{#2}{-\psslurraise}{\psRslurskip}}
+\def\iRslurd#1#2{\iSlur{#1}{#2}{-\psslurraise}{\psRslurskip}}
\def\tfslur#1#2{\tSlur{#1}{#2}{\psslurraise}{\pstslurskip}{\psfslurhgt}{\psslurangul}}
\def\tslur#1#2{\tSlur{#1}{#2}{\psslurraise}{\pstslurskip}{\psslurhgt}{\psslurangul}}
@@ -576,6 +582,7 @@
\def\tLfslur#1#2{\tSlur{#1}{#2}{\psslurraise}{\psLslurskip}{\psfslurhgt}{\psslurangul}}
\def\tLslur#1#2{\tSlur{#1}{#2}{\psslurraise}{\psLslurskip}{\psslurhgt}{\psslurangul}}
+\def\tRslur#1#2{\tSlur{#1}{#2}{\psslurraise}{\psRslurskip}{\psslurhgt}{\psslurangul}}
\def\tLhslur#1#2{\tSlur{#1}{#2}{\psslurraise}{\psLslurskip}{\pshslurhgt}{\psslurangul}}
\def\tLHslur#1#2{\tSlur{#1}{#2}{\psslurraise}{\psLslurskip}{\psHslurhgt}{\psHslurangul}}
\def\tLHHslur#1#2{\tSlur{#1}{#2}{\psslurraise}{\psLslurskip}{\psHHslurhgt}{\psHHslurangul}}
@@ -599,6 +606,8 @@
\def\ttie#1{\tTie{#1}{\psttieskip}}
\def\tltie#1{\tTie{#1}{\psltieskip}}
\def\trtie#1{\tTie{#1}{\psrtieskip}}
+\def\tLtie#1{\tTie{#1}{\psLtieskip}}
+\def\tRtie#1{\tTie{#1}{\psRtieskip}}
\def\icresc#1{\Icresc{#1}{\d@nh}{0}}
\def\idecresc#1{\Idecresc{#1}{\d@nh}{0}}
diff --git a/macros/musixtex/tex/musixtex.tex b/macros/musixtex/tex/musixtex.tex
index 55382f5dfe..b11caaa6b5 100644
--- a/macros/musixtex/tex/musixtex.tex
+++ b/macros/musixtex/tex/musixtex.tex
@@ -25,16 +25,20 @@
\def\mufl@x{0.83}%
\def\mxmajorvernumber{1}
-\def\mxminorvernumber{29}
+\def\mxminorvernumber{30}
\def\mxvernumber{\mxmajorvernumber\mxminorvernumber}% make it possible to compare with \ifnum
-\def\mxversuffix{}%
+\def\mxversuffix{beta}%
\edef\mxversion{\mxmajorvernumber.\mxminorvernumber\mxversuffix}
-\def\mxdate{2018-08-04}
+\def\mxdate{2018-08-09}
\immediate\write16{MusiXTeX(c) \mxversion\space<\mxdate>}%
\everyjob{\immediate\write16{MusiXTeX(c) \mxversion\space<\mxdate>}}%
+% version 1.30
+% defined \zdoublebar for use within a bar
+% defined \hbp and \hbpp
+
% version 1.29
% defined \tabfnt, \tabcleffnt, \tabstringfnt, \tab etc. to support tablature
@@ -2284,6 +2288,7 @@
% 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\zendpiece{\setemptybar\raggedstoppiece}
\def\Stoppiece{\setdoubleBAR\stoppiece}
\let\Endpiece\Stoppiece
@@ -2580,14 +2585,13 @@
\fi}
\def\zzleftrightrepeat{% % RDT 1.28
- \advance\barno\m@ne
- \setrightrepeat
- \stoppiece
- \let\z@sw\@ne
- \contpiece
- \addspace{\h@lf\afterruleskip}%
- \kernm\afterruleskip\l@eftrepeat\kern\afterruleskip
- \advance\lastbarpos\afterruleskip \b@rrul@
+\advance\barno\m@ne%
+\setrightrepeat%
+\stoppiece%
+\let\z@sw\@ne%
+\contpiece%
+\advance\barno\m@ne%
+\leftrepeat% % RDT revised 1.30
}
\def\zleftrightrepeat@II{% % RDT 1.28
@@ -2603,6 +2607,9 @@
\let\leftrightrepeat\leftrightrepeat@II
\let\zleftrightrepeat\zleftrightrepeat@II % RDT 1.28
+
+\def\zdoublebar{\advance\barno\m@ne\doublebar} % RDT 1.30
+
\def\alapage{\stoppiece\eject\contpiece}
\def\zalapage{\zstoppiece\eject\contpiece}
@@ -3657,6 +3664,8 @@
\def\hlpp{\h@symbol\@qlpp}
\def\hb{\h@symbol\@qb}
+\def\hbp{\h@symbol\@qbp}
+\def\hbpp{\h@symbol\@qbpp}
\def\zh{\h@symbol\@zq}
\def\zhp{\h@symbol\@zqp}
@@ -4156,6 +4165,18 @@
\def\lppt{\g@pt\m@ne\@ne}
\def\lpppt{\g@pt\m@ne\tw@}
+
+% Shifted, pointed chord notes
+%
+\def\lhp#1{\loff{\zhp{#1}}}
+\def\rhp#1{\roff{\zhp{#1}}}
+\def\lqp#1{\loff{\zqp{#1}}}
+\def\rqp#1{\roff{\zqp{#1}}}
+\def\rhpp#1{\roff{\zhpp{#1}}}
+\def\lhpp#1{\loff{\zhpp{#1}}}
+\def\rqpp#1{\roff{\zqpp{#1}}}
+\def\lqpp#1{\loff{\zqpp{#1}}}
+
\def\g@pt#1#2#3{\check@staff
\inhgetn@i#3\relax \relax % two \relax since the first one
\ifnum\n@i<\@c % in swallowed by \inhgetn@i