summaryrefslogtreecommitdiff
path: root/macros/musixtex/tex
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2023-01-12 03:01:29 +0000
committerNorbert Preining <norbert@preining.info>2023-01-12 03:01:29 +0000
commit6a7900c93acc16d1bbd2f1e26286c7dd7387e6c0 (patch)
tree76196287351cba68a51934c49468bf1a7846aa76 /macros/musixtex/tex
parentc1c19023b4b1d43cb874f84df5102b485853e672 (diff)
CTAN sync 202301120301
Diffstat (limited to 'macros/musixtex/tex')
-rw-r--r--macros/musixtex/tex/musixmkm.tex54
-rw-r--r--macros/musixtex/tex/musixps.tex1
-rw-r--r--macros/musixtex/tex/musixtex.tex47
-rw-r--r--macros/musixtex/tex/musixthacc.tex49
4 files changed, 147 insertions, 4 deletions
diff --git a/macros/musixtex/tex/musixmkm.tex b/macros/musixtex/tex/musixmkm.tex
new file mode 100644
index 0000000000..1aca900845
--- /dev/null
+++ b/macros/musixtex/tex/musixmkm.tex
@@ -0,0 +1,54 @@
+%
+% This file is part of MusiXTeX
+%
+% MusiXTeX 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.
+%
+% MusiXTeX 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.
+%
+\immediate\write16{MusiXMaKaM v.001\space<2022-12-25>}%
+
+\edef\catcodeat{\the\catcode`\@}\catcode`\@=11
+\catcodesmusic
+
+
+\font\fetaeleven=feta20 scaled \magstephalf
+\font\fetathirteen=feta20 scaled \magstep1
+\font\fetasixteen=feta20 scaled \magstep2
+\font\fetatwenty=feta20 scaled \magstep3
+\font\fetatwentyfour=feta20 scaled \magstep4
+\font\fetatwentynine=feta20 scaled \magstep5
+
+\let\fetanorfont\fetatwenty
+\def\fetachar{\fetafont\char}
+
+
+\def\writ@ka{\pl@base\raise\y@i\llap{\fetachar\n@v\kern\accshift}}
+\def\set@ka{\let\@Ti=\writ@ka}
+
+\def\shtanini#1{\set@ka \n@v30 \check@staff \inhgetn@i#1\relax\expandafter\@Ti\fi}
+\def\shbuyukmucenneb#1{\set@ka \n@v26 \check@staff \inhgetn@i#1\relax\expandafter\@Ti\fi}
+\def\shkucuk#1{\set@ka \n@v27 \check@staff \inhgetn@i#1\relax\expandafter\@Ti\fi}
+\def\shbakiye#1{\set@ka \n@v20 \check@staff \inhgetn@i#1\relax\expandafter\@Ti\fi}
+\def\shkoma#1{\set@ka \n@v25 \check@staff \inhgetn@i#1\relax\expandafter\@Ti\fi}
+\def\flkoma#1{\set@ka \n@v45 \check@staff \inhgetn@i#1\relax\expandafter\@Ti\fi}
+\def\flbakiye#1{\set@ka \n@v42 \check@staff \inhgetn@i#1\relax\expandafter\@Ti\fi}
+\def\flkucuk#1{\set@ka \n@v37 \check@staff \inhgetn@i#1\relax\expandafter\@Ti\fi}
+\def\flbuyukmucenneb#1{\set@ka \n@v43 \check@staff \inhgetn@i#1\relax\expandafter\@Ti\fi}
+\def\fltanini#1{\set@ka \n@v47 \check@staff \inhgetn@i#1\relax\expandafter\@Ti\fi}
+
+\let\fetafont\fetanorfont
+
+\endcatcodesmusic
+\catcode`\@=\catcodeat
+\endinput
diff --git a/macros/musixtex/tex/musixps.tex b/macros/musixtex/tex/musixps.tex
index 9ab8b0ce3f..7bff890330 100644
--- a/macros/musixtex/tex/musixps.tex
+++ b/macros/musixtex/tex/musixps.tex
@@ -2,6 +2,7 @@
% Coded by Stanislav Kneifl
% RDT added \psRslurskip \iRslur \tRslur \psRtieskip \tRtie \psLtieskip \tLtie 2019/06/17
% RDT added \iRtieu \iRtied 2020/09/07
+% RDT modified /DC to produce thicker hairpins 2022/12/29
\ifx\undefined\startpiece\errmessage{Input musixtex.tex before musixps.tex}\fi
\ifx\undefined\liftcresc\else\endinput\fi
diff --git a/macros/musixtex/tex/musixtex.tex b/macros/musixtex/tex/musixtex.tex
index 7dda85bd90..06333281b9 100644
--- a/macros/musixtex/tex/musixtex.tex
+++ b/macros/musixtex/tex/musixtex.tex
@@ -25,15 +25,27 @@
\def\mufl@x{0.83}%
\def\mxmajorvernumber{1}
-\def\mxminorvernumber{34}
+\def\mxminorvernumber{36}
\def\mxvernumber{\mxmajorvernumber\mxminorvernumber}% make it possible to compare with \ifnum
\def\mxversuffix{}%
\edef\mxversion{\mxmajorvernumber.\mxminorvernumber\mxversuffix}
-\def\mxdate{2021-07-24}
+\def\mxdate{2023-01-11}
\immediate\write16{MusiXTeX(c) \mxversion\space<\mxdate>}%
\everyjob{\immediate\write16{MusiXTeX(c) \mxversion\space<\mxdate>}}%
+% version 1.36
+%
+% Support for Turkish classical music accidentalsi; see musixmkm.tex.
+% Re-define \hlthick to produce thicker ledger lines.
+% Provide thinner accidentals; see musixthacc.tex.
+% Thicker Postscript hairpins.
+
+% version 1.35
+%
+% This release includes a handwriting font from MuseScore and an extension
+% library musixjt.tex to support it.
+
% version 1.34
%
% redefine \tabfnt... commands to allow re-definition in musixftab.tex
@@ -1643,6 +1655,7 @@
\newdimen\b@amthick % half beamthickness
\newdimen\Interligne% de la base d'une ligne a l'autre
\newdimen\Internote % la moitie de \Interligne
+
\let\internote\Internote
\def\musixchar{\musixfont\char}
\def\keychar{\musickeyfont\char}
@@ -1651,22 +1664,27 @@
\def\set@Largenotesize{\let\musixfont\musicLargefont
\let\xgregfont\xgregLargefont
+ \let\fetafont\fetaLargefont % RDT 1.36
\b@amthick.3456\Interligne \interbeam1.08\Interligne }
\def\set@largenotesize{\let\musixfont\musiclargefont
\let\xgregfont\xgreglargefont
+ \let\fetafont\fetalargefont % RDT 1.36
\b@amthick.288\Interligne \interbeam.9\Interligne }
\def\set@normalnotesize{\let\musixfont\musicnorfont
\let\xgregfont\xgregnorfont
+ \let\fetafont\fetanorfont % RDT 1.36
\b@amthick.24\Interligne \interbeam\p@seven5\Interligne }
\def\set@smallnotesize{\let\musixfont\musicsmallfont
\let\xgregfont\xgregsmallfont
+ \let\fetafont\fetasmallfont % RDT 1.36
\b@amthick\p@ne92\Interligne \interbeam.6\Interligne }
\def\set@tinynotesize{\let\musixfont\musictinyfont
\let\xgregfont\xgregtinyfont
+ \let\fetafont\fetatinyfont % RDT 1.36
\b@amthick\p@ne536\Interligne \interbeam.48\Interligne }
\def\normalnotesize{\set@normalnotesize\comput@specifics
@@ -1742,7 +1760,8 @@
\newskip\big@spc
\newdimen\lthick \lthick=.4pt
-\def\hlthick{\h@lf\lthick}
+% \def\hlthick{\h@lf\lthick}
+\def\hlthick{0.4pt} % 1.36 RDT
%%%
@@ -1767,6 +1786,11 @@
\let\xgregnorfont\xgregsixteen
\let\xgregsmallfont\xgregthirteen
\let\xgregtinyfont\xgregeleven
+ \let\fetaLargefont\fetatwentyfour % 1.36 RDT
+ \let\fetalargefont\fetatwenty
+ \let\fetanorfont\fetasixteen
+ \let\fetasmallfont\fetathirteen
+ \let\fetatinyfont\fetaeleven
\let\slurd\slurdsixteen \let\sluru\slurusixteen
\let\hslurd\hslurdsixteen \let\hsluru\hslurusixteen
\let\meternorfont\tenbf \let\metersmallfont\eightbf % version 1.16 RDT
@@ -1780,7 +1804,7 @@
\else\ifdim\internote<1.19\Internote \smalltype\it
\else\ifdim\internote<1.43\Internote \Smalltype\it
\else\normtype\it\fi\fi\fi}%
- \let\tabnorfnt\tabfntsixteen \let\tablargefnt\tabfnttwenty % 1.34 RDT
+ \let\tabnorfnt\tabfntsixteen \let\tablargefnt\tabfnttwenty % 1.34 RDT
\let\tabLargefnt\tabfnttwentyfour \let\tabsmallfnt\tabfntthirteen
\let\tabnorcleffnt\eightdc \let\tablargecleffnt\tendc
\let\tabLargecleffnt\twelvedc \let\tabsmallcleffnt\sixdc
@@ -1799,6 +1823,11 @@
\let\xgregnorfont\xgregtwentyfour
\let\xgregsmallfont\xgregtwenty
\let\xgregtinyfont\xgregsixteen
+ \let\fetaLargefont\fetatwentynine % 1.36 RDT
+ \let\fetalargefont\fetatwentynine
+ \let\fetanorfont\fetatwentyfour
+ \let\fetasmallfont\fetatwenty
+ \let\fetatinyfont\fetasixteen
\let\sluru\slurutwenty \let\slurd\slurdtwenty
\let\hsluru\hslurutwenty \let\hslurd\hslurdtwenty
\let\meternorfont\frtbf \let\metersmallfont\twelvebf % version 1.18 RDT
@@ -1831,6 +1860,11 @@
\let\xgregnorfont\xgregtwentynine
\let\xgregsmallfont\xgregtwentyfour
\let\xgregtinyfont\xgregtwenty
+ \let\fetaLargefont\fetatwentynine % 1.36 RDT
+ \let\fetalargefont\fetatwentynine
+ \let\fetanorfont\fetatwentynine
+ \let\fetasmallfont\fetatwentyfour
+ \let\fetatinyfont\fetatwenty
\let\sluru\slurutwenty \let\slurd\slurdtwenty
\let\hsluru\hslurutwenty \let\hslurd\hslurdtwenty
\let\slurud\slurutwentyd \let\slurdd\slurdtwentyd % +ickd
@@ -1871,6 +1905,11 @@
\let\xgregnorfont\xgregtwenty
\let\xgregsmallfont\xgregsixteen
\let\xgregtinyfont\xgregthirteen
+ \let\fetalargefont\fetatwentyfour % 1.36 RDT
+ \let\fetaLargefont\fetatwentynine
+ \let\fetanorfont\fetatwenty
+ \let\fetasmallfont\fetasixteen
+ \let\fetatinyfont\fetathirteen
\let\sluru\slurutwenty \let\slurd\slurdtwenty
\let\hsluru\hslurutwenty \let\hslurd\hslurdtwenty
\let\meternorfont\twelvebf \let\metersmallfont\tenbf % version 1.18 RDT
diff --git a/macros/musixtex/tex/musixthacc.tex b/macros/musixtex/tex/musixthacc.tex
new file mode 100644
index 0000000000..b20ed567cb
--- /dev/null
+++ b/macros/musixtex/tex/musixthacc.tex
@@ -0,0 +1,49 @@
+%
+% This file is part of MusiXTeX
+%
+% MusiXTeX 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.
+%
+% MusiXTeX 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.
+%
+\immediate\write16{MusiXTHinACCidentals v.001\space<2022-12-29>}%
+
+\edef\catcodeat{\the\catcode`\@}\catcode`\@=11
+\catcodesmusic
+
+
+\font\fetaeleven=feta20 scaled \magstephalf
+\font\fetathirteen=feta20 scaled \magstep1
+\font\fetasixteen=feta20 scaled \magstep2
+\font\fetatwenty=feta20 scaled \magstep3
+\font\fetatwentyfour=feta20 scaled \magstep4
+\font\fetatwentynine=feta20 scaled \magstep5
+
+\let\fetanorfont\fetatwenty
+\def\fetachar{\fetafont\char}
+
+
+\def\writ@ka{\pl@base\raise\y@i\llap{\fetachar\n@v\kern\accshift}}
+\def\set@ka{\let\@Ti=\writ@ka}
+
+\def\thdsh#1{\set@ka \n@v30 \check@staff \inhgetn@i#1\relax\expandafter\@Ti\fi}
+\def\thsh#1{\set@ka \n@v20 \check@staff \inhgetn@i#1\relax\expandafter\@Ti\fi}
+\def\thna#1{\set@ka \n@v32 \check@staff \inhgetn@i#1\relax\expandafter\@Ti\fi}
+\def\thfl#1{\set@ka \n@v37 \check@staff \inhgetn@i#1\relax\expandafter\@Ti\fi}
+\def\thdfl#1{\set@ka \n@v47 \check@staff \inhgetn@i#1\relax\expandafter\@Ti\fi}
+
+\let\fetafont\fetanorfont
+
+\endcatcodesmusic
+\catcode`\@=\catcodeat
+\endinput