release: 0.1.58

[lilypond.git] / tex / fetdefs.tex

diff --git a/tex/fetdefs.tex b/tex/fetdefs.tex
index ab31cb344f4df2d76e45abb21035a9828d014a95..b7ba27d28119305e1ac1d8201932fe0746a12fb7 100644 (file)
--- a/tex/fetdefs.tex
+++ b/tex/fetdefs.tex
@@ -1,110 +1,121 @@
 % fetdefs.tex
-% encapsulating tex backend for auto-generated font-en-tja definitions
-
-\def\fetsixteendefs{
-        \font\fontentja=feta16
-        \font\vetfont=feta-beams16
-        \font\fetanummer=feta-nummer8
-        \font\dynfont=feta-din10 scaled \magstep1
-        \font\bracefont=feta-braces16
-        \font\fingerfont=feta-nummer4
-        \interlinedist=4pt
+% encapsulating tex backend for auto-generated feta definitions
+
+\def\fetsixteendefs{%
+  \font\feta = feta16
+  \font\vetfont = feta-beams16
+  \font\fetanummer = feta-nummer8
+  \font\dynfont = feta-din10 scaled \magstep 1
+  \font\bracefont = feta-braces16
+  \font\bracketfont = feta-brackets16
+  \font\fingerfont = feta-nummer4
 }
-\def\fettwentydefs{
-        \interlinedist=5pt
-        \font\fontentja=feta20
-        \font\vetfont=feta-beams20
-        \font\fetanummer=feta-nummer10
-        \font\dynfont=feta-din10 scaled \magstep2
-        \font\bracefont=feta-braces20
-        \font\fingerfont=feta-nummer5
+
+\def\fettwentydefs{%
+  \font\feta = feta20
+  \font\vetfont = feta-beams20
+  \font\fetanummer = feta-nummer10
+  \font\dynfont = feta-din10 scaled \magstep 2
+  \font\bracefont = feta-braces20
+  \font\bracketfont = feta-brackets20
+  \font\fingerfont = feta-nummer5
+}
+
+\def\fettwentysixdefs{%
+  \font\feta = feta26
+  \font\vetfont = feta-beams26
+  \font\fetanummer = feta-nummer12
+  \font\dynfont = feta-din10 scaled \magstep 3
+  \font\bracefont = feta-braces16
+  \font\bracketfont = feta-brackets20
+  \font\fingerfont = feta-nummer7
+}
+
+\def\fetthirteendefs{%
+  \font\feta = feta13
+  \font\vetfont = feta-beams26
+  \font\fetanummer = feta-nummer5
+  \font\dynfont = feta-din10 scaled \magstep 0
+  \font\bracefont = feta-braces16
+  \font\bracketfont = feta-brackets16
+  \font\fingerfont = feta-nummer3
+}
+
+\def\fetelevendefs{%
+  \font\feta = feta11
+  \font\vetfont = feta-beams26
+  \font\fetanummer = feta-nummer5
+  \font\dynfont = feta-din10        % scaled \magstep-1
+  \font\bracefont = feta-braces16
+  \font\bracketfont = feta-brackets16
+  \font\fingerfont = feta-nummer3
 }
 
+
 \def\sixteenfonts{\fetsixteendefs\cmrsixteen}
 \def\twentyfonts{\fettwentydefs\cmrtwenty}
+\def\twentysixfonts{\fettwentysixdefs\cmrtwenty}
+\def\elevenfonts{\fetelevendefs\cmreleven}
+\def\thirteenfonts{\fetthirteendefs\cmrthirteen}
 
-\def\fetdef#1#2{\def#1{%
-        \hbox{\fetchar{#2}}}}
-
-\def\fetchar#1{\fontentja\char#1}
+\def\fetdef#1#2{%
+  \def#1{\hbox{\fetchar{#2}}}}
+\def\fetchar#1{\feta\char#1}
 
 %\input feta16
 \input feta20
 
-\def\beamslope#1#2{{\count0=#2\advance\count0 by#1
-        \advance\count0by128
-        {\vetfont\char\count0}}}
-
 % stacked numbers; overrules def in lilyponddefs
 % widest num should be .40 balkheight
 % oeps: \meter 12/8;
-\def\generalmeter#1#2{%
-        \vbox to 0pt{\vss%
-        \hbox to0.45\staffheight{\hss\fetanummer #1\hss}%
-        \nointerlineskip%
-        \hbox to0.45\staffheight{\hss\fetanummer #2\hss}%
-        \vss}}
-
-\def\pianobrace#1{{\bracefont\char #1}}
-
-\newcount\embedcount\embedcount=0
-\newwrite\checkexists
-\newwrite\embedfile
-\def\inputifexists#1{%
-        \openin\checkexists #1
-        \ifeof\checkexists
-                 \closein\checkexists
-        \else
-                \closein\checkexists
-                \input #1
-        \fi
-}
-\def\embedcountid{feta-embed}
-\inputifexists{\embedcountid.aux}
 %
-% let's not overwrite -- and be sure to create new
-\def\storeembedcount{%
-        \immediate\openout\embedfile=\embedcountid.aux
-        \immediate\write\embedfile{\embedcount=\the\embedcount}
-        \immediate\closeout\embedfile
-}
+% \allabreve, \threetwometer etc. have zero as the second parameter.
 
+\def\generalmeter#1#2{%
+  \ifnum #2 = 0\relax
+    \ifcase #1
+    \or\or
+      % 2
+      \allabreve
+    \or
+      % 3
+      \threetwometer    % tempus perfectum cum prolatione imperfecta
+    \or
+      % 4
+      \fourfourmeter    % tempus imperfectum cum prolatione imperfecta
+    \or\or
+      % 6
+      \sixfourmeter     % tempus imperfectum cum prolatione perfecta
+    \or\or\or
+      % 9
+      \ninefourmeter    % tempus perfectum cum prolatione perfecta
+    \fi
+  \else
+    \vbox to 0pt{%
+      \vss
+      \hbox to 0.45\staffheight{\hss\fetanummer #1\hss}%
+      \nointerlineskip
+      \hbox to 0.45\staffheight{\hss\fetanummer #2\hss}%
+      \vss}%
+  \fi}
 
+\def\pianobrace#1{{\bracefont\char #1}}
+\def\staffbracket#1{{\centeralign{\bracketfont\char #1}}}
 
+\def\embeddedtex#1{}
+\def\embeddedps#1{}
+\def\embeddedmf#1#2{}
+\def\embedclose{}
 
 \input lily-ps-defs
-\def\embeddedtex#1{#1}
-
-\def\embeddedmf#1{
-        \edef\embedid{feta-sleur-\number\embedcount}
-        \immediate\openout\embedfile=\embedid.mf
-        \global\advance\embedcount by 1
-
-% should write ``automatically generated.''
-%        \immediate\write\embedfile{\def\
-%       
-%      }
-
-        \immediate\write\embedfile{#1}
 
-        \immediate\closeout\embedfile
-        \font\expandafter\embedid\expandafter=\embedid
-        \embedid\char0
-}
-
-\def\notex{\def\embeddedtex##1{}}
-\def\nopostscript{\def\embeddedps##1{}}
-\def\nometafont{\def\embeddedmf##1{}}
-
-% dat heb je handig gedaan, lieverd!
-\nometafont
-%\nopostscript
-\notex
+% uncomment to use runtime MF
+%
+% \input lily-mf-defs
 
-\def\EndLilyPondOutput{
-        \storeembedcount
-        \csname bye\endcsname
+\def\EndLilyPondOutput{%
+  \embedclose
+  \csname bye\endcsname
 }
 
-
-
+\endinput