X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=tex%2Ffetdefs.tex;h=b7ba27d28119305e1ac1d8201932fe0746a12fb7;hb=472c212541034e95c30f5a1a6bc99d7f36f15b68;hp=0552dd37ae603a96ba87f2a3e09087b66491fbcc;hpb=c24b8835be7d548804a94f6caceadcf914bb8198;p=lilypond.git

diff --git a/tex/fetdefs.tex b/tex/fetdefs.tex
index 0552dd37ae..b7ba27d281 100644
--- a/tex/fetdefs.tex
+++ b/tex/fetdefs.tex
@@ -1,45 +1,54 @@
 % fetdefs.tex
 % 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 \magstep1
-        \font\bracefont=feta-braces16
-        \font\fingerfont=feta-nummer4
+\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{
-        \font\feta=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 \magstep3
-        \font\bracefont=feta-braces16
-        \font\fingerfont=feta-nummer7
+
+\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 \magstep0
-        \font\bracefont=feta-braces16
-        \font\fingerfont=feta-nummer3
+
+\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\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
 }
 
 
@@ -48,9 +57,9 @@
 \def\twentysixfonts{\fettwentysixdefs\cmrtwenty}
 \def\elevenfonts{\fetelevendefs\cmreleven}
 \def\thirteenfonts{\fetthirteendefs\cmrthirteen}
-\def\fetdef#1#2{\def#1{%
-        \hbox{\fetchar{#2}}}}
 
+\def\fetdef#1#2{%
+  \def#1{\hbox{\fetchar{#2}}}}
 \def\fetchar#1{\feta\char#1}
 
 %\input feta16
@@ -59,14 +68,39 @@
 % stacked numbers; overrules def in lilyponddefs
 % widest num should be .40 balkheight
 % oeps: \meter 12/8;
+%
+% \allabreve, \threetwometer etc. have zero as the second parameter.
+
 \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}}
+  \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{}
@@ -79,10 +113,9 @@
 %
 % \input lily-mf-defs
 
-\def\EndLilyPondOutput{
-        \embedclose
-        \csname bye\endcsname
+\def\EndLilyPondOutput{%
+  \embedclose
+  \csname bye\endcsname
 }
 
-
-
+\endinput