From 6a7900c93acc16d1bbd2f1e26286c7dd7387e6c0 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Thu, 12 Jan 2023 03:01:29 +0000 Subject: CTAN sync 202301120301 --- macros/musixtex/README | 2 +- macros/musixtex/doc/musixdoc.pdf | Bin 1434694 -> 1437432 bytes macros/musixtex/doc/musixdoc/accidentals.tex | 5 +- macros/musixtex/doc/musixdoc/barlines.tex | 6 +++ macros/musixtex/doc/musixdoc/extensions.tex | 62 +++++++++++++++++++++++-- macros/musixtex/doc/musixdoc/frontmatter.tex | 4 +- macros/musixtex/doc/musixdoc/miscellaneous.tex | 6 +-- macros/musixtex/doc/musixdoc/settingup.tex | 14 +++--- macros/musixtex/dvips/psslurs.pro | 6 +-- macros/musixtex/tex/musixmkm.tex | 54 +++++++++++++++++++++ macros/musixtex/tex/musixps.tex | 1 + macros/musixtex/tex/musixtex.tex | 47 +++++++++++++++++-- macros/musixtex/tex/musixthacc.tex | 49 +++++++++++++++++++ 13 files changed, 232 insertions(+), 24 deletions(-) create mode 100644 macros/musixtex/tex/musixmkm.tex create mode 100644 macros/musixtex/tex/musixthacc.tex (limited to 'macros/musixtex') diff --git a/macros/musixtex/README b/macros/musixtex/README index eef46a1144..4047ef5726 100644 --- a/macros/musixtex/README +++ b/macros/musixtex/README @@ -1,4 +1,4 @@ -This is MusiXTeX, version 1.35 (2021-08-30). +This is MusiXTeX, version 1.36 (2023-01-11). MusiXTeX is a TeX-based system for typesetting music. The main author was Daniel Taupin, who died in a climbing diff --git a/macros/musixtex/doc/musixdoc.pdf b/macros/musixtex/doc/musixdoc.pdf index a3b49fe947..adbcbfc912 100644 Binary files a/macros/musixtex/doc/musixdoc.pdf and b/macros/musixtex/doc/musixdoc.pdf differ diff --git a/macros/musixtex/doc/musixdoc/accidentals.tex b/macros/musixtex/doc/musixdoc/accidentals.tex index a504837530..de374139be 100644 --- a/macros/musixtex/doc/musixdoc/accidentals.tex +++ b/macros/musixtex/doc/musixdoc/accidentals.tex @@ -1,5 +1,6 @@ \chapter{Accidentals} -\vspace*{-3ex} +\vspace*{-4ex} +\enlargethispage*{2ex} Accidentals can be introduced in two ways. The first way, using explicit macros, consists for example in coding \keyindex{fl}\pitchp~to put a \ital{flat} at the @@ -8,6 +9,8 @@ non-spacing command and will automatically place the accidental an appropriate distance to the left of the anticipated note head. Naturals, sharps, double flats and double sharps are coded \keyindex{na}\pitchp, \keyindex{sh}\pitchp, \keyindex{dfl}\pitchp~and \keyindex{dsh}\pitchp~respectively. +Thinner accidentals are available using the definitions enabled by extension library \keyindex{musixthacc} +described in Section~\ref{musixthacc}. The alternate macros \keyindex{lfl}, \keyindex{lna}, \keyindex{lsh}, \keyindex{ldfl} and \keyindex{ldsh} diff --git a/macros/musixtex/doc/musixdoc/barlines.tex b/macros/musixtex/doc/musixdoc/barlines.tex index b3f1d545a7..6d39c30985 100644 --- a/macros/musixtex/doc/musixdoc/barlines.tex +++ b/macros/musixtex/doc/musixdoc/barlines.tex @@ -308,3 +308,9 @@ This is the code: \NOTes\en\setdoubleBAR\zendextract \end{verbatim}\end{quote} +\section{Ledger Lines} + +Ledger lines are the short horizontal lines above or below the staff for high or low notes. +As of version 1.36, these have been thickened. To restore the thickness used in +previous versions, add \verb|\def\hlthick{0.2pt}| to the preamble after inputting +\verb|musixtex.tex|. diff --git a/macros/musixtex/doc/musixdoc/extensions.tex b/macros/musixtex/doc/musixdoc/extensions.tex index 8d66b23cd7..d2bdd3d75a 100644 --- a/macros/musixtex/doc/musixdoc/extensions.tex +++ b/macros/musixtex/doc/musixdoc/extensions.tex @@ -1652,8 +1652,44 @@ If you need greater numbers of these elements, see Sections~\ref{musixmad_setmax \ref{musixmad_setmaxslurs} and \ref{musixmad_setmaxtrills}. + \section{musixmkm} \ixtt{musixmkm.tex} + The following special accidentals used in Turkish classical music (makam\index{makam}) +are supported: +\smallskip +\begin{music} +\input musixmkm +\normalmusicsize +\startextract +\Notes\shtanini i\en +\Notes\shbuyukmucenneb i\en +\Notes\shkucuk i\en +\Notes\shbakiye i\en +\Notes\shkoma i\en +\Notes\flkoma i\en +\Notes\flbakiye i\en +\Notes\flkucuk i\en +\Notes\flbuyukmucenneb i\en +\Notes\fltanini i\en +\endextract% +\end{music}% +These are generated by, respectively, +\begin{list}{}{} +\item{} +\begin{tabular}{l} +\keyindex{shtanini} $p$\\ +\keyindex{shbuyukmucenneb} $p$\\ +\keyindex{shkucuk} $p$\\ +\keyindex{shbakiye} $p$\\ +\keyindex{shkoma} $p$\\ +\keyindex{flkoma} $p$\\ +\keyindex{flbakiye} $p$\\ +\keyindex{flkucuk} $p$\\ +\keyindex{flbuyukmucenneb} $p$\\ +\keyindex{fltanini} $p$\\ +\end{tabular} +\end{list} -\section{musixper}\label{perc} + \section{musixper}\label{perc} Provides special symbols intended for percussion parts. Included are a \ital{drum clef}---comprising two vertical parallel lines---and notes with @@ -1911,6 +1947,7 @@ Use as follows: \input musixplt ... \end{verbatim}\end{quote} +You may need to install additional packages: \texttt{psnfss}, \texttt{palatino} and \texttt{fpl}. The usual ``small'' type commands are supported: \begin{quote} @@ -1946,7 +1983,7 @@ the ``big'' ones, small-caps; however, \keyindex{font} commands are defined for all the usual variants at all of these sizes. To letter-space a title, use the \verb|\so| -command in the \verb\soul\ package. +command in the \verb\soul\ package. The following bold-italic fonts for dynamic marks are defined: @@ -2127,6 +2164,25 @@ either before \keyindex{startpiece} or between \keyindex{stoppiece} and \end{itemize} + \section{musixthacc}\index{musixthacc@{\tt musixthacc.tex}}\label{musixthacc} +Provides ``thin'' accidentals +\keyindex{thna}~$p$, \keyindex{thsh}~$p$, \keyindex{thfl}~$p$, \keyindex{thdsh}~$p$ +and \keyindex{thdfl}~$p$: +\smallskip +\begin{music} +\input musixthacc +\normalmusicsize +\startextract +\Notes\thna i\en +\Notes\thsh i\en +\Notes\thfl i\en +\Notes\thdsh i\en +\Notes\thdfl i\en +\endextract% +\end{music}% +Any necessary adjustment of horizontal position and spacing is up to +the user and \keyindex{relativeaccid} adjustment is not effective. + \section{musixtmr}\index{musixtmr@{\tt musixtmr.tex}}\label{times} Replaces the default Computer Modern text fonts by Times fonts; see Section~\ref{UserFonts}. @@ -2216,7 +2272,7 @@ An auxiliary program \verb|msxlint| distributed in the \verb\musixtnt\ package c \keyindex{TransformNotes} may be used anywhere between \keyindex{startpiece} and the command that ends the piece. -\subsection{Extracting single-instrument parts from multi-instrument scores} +\subsection{Extracting single-instrument parts from multi-instrument scores}\index{extracting parts} To extract a single-instrument part from a (copy of a) multi-instrument \musixtex\ score: diff --git a/macros/musixtex/doc/musixdoc/frontmatter.tex b/macros/musixtex/doc/musixdoc/frontmatter.tex index e2f919ce7e..6079e9b04d 100644 --- a/macros/musixtex/doc/musixdoc/frontmatter.tex +++ b/macros/musixtex/doc/musixdoc/frontmatter.tex @@ -1,6 +1,6 @@ \title{\Huge\bfseries\musixtex\\[\bigskipamount] \LARGE\bfseries Using \TeX{} to write polyphonic\\or -instrumental music\\\Large\itshape Version 1.35} +instrumental music\\\Large\itshape Version 1.36} \author{} @@ -68,7 +68,7 @@ Since then, the only significant update to \musixtex\ has been in version 1.15 ( takes advantage of the greater capacity of the e\TeX\ version of \TeX. This manual is the definitive reference to all features of -\musixtex\ version~1.33a. +\musixtex\ version~1.36. Novice users need not start here. Most diff --git a/macros/musixtex/doc/musixdoc/miscellaneous.tex b/macros/musixtex/doc/musixdoc/miscellaneous.tex index 83b62bed6d..7b568bda91 100644 --- a/macros/musixtex/doc/musixdoc/miscellaneous.tex +++ b/macros/musixtex/doc/musixdoc/miscellaneous.tex @@ -349,7 +349,7 @@ the place it is entered, while adding no space: \end{music} - \subsection{Arpeggios} + \subsection{Arpeggios}\index{arpeggios} \ital{Arpeggios} (i.e.~~~\arpeggio{-2}3) can be coded with the macro \keyindex{arpeggio}\pitchp\itbrace{m} where $p$ is the pitch of @@ -361,7 +361,7 @@ Its variant \keyindex{larpeggio} sets the arpeggio symbol roughly one note head width to the left of the default position, and is intended to avoid collision with single accidentals on chord notes. - \subsection{Arbitrary length trills} + \subsection{Arbitrary length trills}\index{arbitrary length trills} There are two styles of arbitrary length trills\index{trills}, each with two variants. For a trill with preassigned length, use \keyindex{trille}\pitchp\itbrace{l} @@ -423,7 +423,7 @@ whose coding is \end{verbatim}\end{quote} - \subsection{Tremolos}\label{tremolos} + \subsection{Tremolos}\label{tremolos}\index{tremolos} The command \keyindex{trml}\verb|{|$p$\verb|}|~is used to indicate that the immediately following diff --git a/macros/musixtex/doc/musixdoc/settingup.tex b/macros/musixtex/doc/musixdoc/settingup.tex index 5de88fc3e6..17b8697848 100644 --- a/macros/musixtex/doc/musixdoc/settingup.tex +++ b/macros/musixtex/doc/musixdoc/settingup.tex @@ -68,7 +68,7 @@ or \verb|\relax|. \section{Usual setup commands}\label{whatspecify} -\subsection{Music size} +\subsection{Music size}\index{music size} The first decision is what size type to use. \musixtex\ offers four sizes: ``small'' \mbox{(\texttt{16pt}-high staves),} ``normal'' (\texttt{20pt}),\index{sizes} ``large'' @@ -79,7 +79,7 @@ enter \keyindex{smallmusicsize}, \keyindex{largemusicsize}, or desired staff size but many other related sizes such as note heads, ornaments, stem lengths, etc. -\subsection{Number of instruments} +\subsection{Number of instruments}\index{number of instruments} The command \keyindex{instrumentnumber}\onen~defines the number of instruments to be $n$. If not entered, the default is $1$. This number is used in loops @@ -88,7 +88,7 @@ set key signatures, set meters, etc., so if it differs from $1$ it must be expli defined before any further commands. The default maximum number of instruments is $6$ but this can be increased by using \keyindex{setmaxinstruments}\onen. -\subsection{Number of staves per instrument} +\subsection{Number of staves per instrument}\index{number of staves per instrument} An instrument may have one or more staves (e.g.,~a piano would normally have 2 staves). The differences between one @@ -111,7 +111,7 @@ number of the instrument. In \musixtex, instruments are numbered So for example \verb|setstaffs32| assigns two staves to the third instrument from the bottom. -\subsection{Clefs for each staff} +\subsection{Clefs for each staff}\index{clefs for each staff} The default clef for every staff is the \ital{treble} clef. To assign any other clef, the command is @@ -141,7 +141,7 @@ could be specified by Treble and bass clefs with the digit $8$ above or below are also possible; see Section~\ref{treblelowoct}. -\subsection{Key signatures} +\subsection{Key signatures}\index{key signatures} To set a common key signature for all instruments, use \keyindex{generalsignature}\verb|{|$s$\verb|}|, @@ -153,7 +153,7 @@ the common key signature for instrument $n$, use \keyindex{setsign}\verb|{|$n$\verb|}{|$s$\verb|}|. Note that differing key signatures cannot be assigned to different staves of the same instrument. -\subsection{Meters} +\subsection{Meters}\index{meters} A common \itxem{meter} for all staves can be specified by \keyindex{generalmeter}\verb|{|$m$\verb|}|,\label{generalmeter} @@ -219,7 +219,7 @@ sets the meter to 12/8 for the first staff of the third instrument, and \ital{alla breve} for the second staff. -\subsection{Instrument names} +\subsection{Instrument names}\index{instrument names} To set an \itxem{instrument name}, use \keyindex{setname}\verb|{|$n$\verb|}{|\ital{name of the instrument}\verb|}|. diff --git a/macros/musixtex/dvips/psslurs.pro b/macros/musixtex/dvips/psslurs.pro index b1ba95253d..b18ba9bd3a 100644 --- a/macros/musixtex/dvips/psslurs.pro +++ b/macros/musixtex/dvips/psslurs.pro @@ -219,8 +219,8 @@ slur@Dict begin /y1 ED /x1 ED gsave - 1 psxAR ceiling setlinewidth % line thickness: this results - 1 setlinecap % to exactly 2 pixels in 300 dpi + 2.5 psxAR ceiling setlinewidth % line thickness: this results + 1 setlinecap % to exactly 2.5 pixels in 300 dpi 1 setlinejoin x2 y2 10 psxAR add moveto % the 10's specify wideness of the x1 y1 lineto % open end of the crescendo, @@ -236,7 +236,7 @@ slur@Dict begin /y1 ED /x1 ED gsave - 1 psxAR ceiling setlinewidth + 2.5 psxAR ceiling setlinewidth 1 setlinecap 1 setlinejoin x2 y2 11 psxAR add moveto 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 -- cgit v1.2.3