lilypond-0.1.48

diff --git a/init/dutch.ly b/init/dutch.ly
index 0a7c423ff5df740155c3a497997575b86a6768d4..12d4b4c111b679ee86c65b29e431a44aea3f854f 100644 (file)
--- a/init/dutch.ly
+++ b/init/dutch.ly
@@ -97,7 +97,3 @@
 
 
 }
-
-
-
-keyCminor =  \key \bes \es \as;

diff --git a/init/dynamic.ly b/init/dynamic.ly
index aee95db89eb470723351b67672088caa2a0ff16c..737a4ffe77a0130087b72d782d11f7e6fbde13c4 100644 (file)
--- a/init/dynamic.ly
+++ b/init/dynamic.ly
@@ -17,5 +17,5 @@ sfz = \absdynamic { 10 }
 
 cr = \spandynamic { 1 1 } 
 decr = \spandynamic { -1 1 }
-rc = \spandynamic { 1 2 } % stop a crescendo (worrks for decrescendo too)
-
+rc = \spandynamic { 1 2 } % stop a crescendo
+rced = \spandynamic { 1 2 } % stop a decrescendo

diff --git a/lily/clef-item.cc b/lily/clef-item.cc
index a63d8b72bd5d910910b6a56c1c34f0519d3d6f83..b3b468047f9761507ab4b28ab4a00cbff159881c 100644 (file)
--- a/lily/clef-item.cc
+++ b/lily/clef-item.cc
@@ -38,23 +38,53 @@ void
 Clef_item::read (String t)
 {
   symbol_= t;
-  if (t == "violin") {
-    y_position_i_ = -2;
-  }
-  else if (t == "soprano") {
-    symbol_="alto";
-    y_position_i_ = -4;
-  }
-  else if (t == "alto") {
-    y_position_i_ = 0;
-  }
-  else if (t == "tenor") {
-    symbol_="alto";
-    y_position_i_ = 2;
-  }
-  else if (t == "bass") {
-    y_position_i_ = 2;
-  }
+  if (t == "violin") 
+    {
+      y_position_i_ = -2;
+    }
+  else if (t == "french") 
+    {
+      symbol_="violin";
+      y_position_i_ = -4;
+    }
+  else if (t == "soprano") 
+    {
+      symbol_="alto";
+      y_position_i_ = -4;
+    }
+  else if (t == "mezzosoprano")
+    {
+      symbol_ = "alto";
+      y_position_i_ = -2;
+    }
+  else if (t == "alto") 
+    {
+      y_position_i_ = 0;
+    }
+  else if (t == "tenor") 
+    {
+      symbol_="alto";
+      y_position_i_ = 2;
+    }
+  else if (t == "baritone")
+    {
+      symbol_ = "alto";
+      y_position_i_ = 4;
+    }
+  else if (t == "varbaritone")
+    {
+      symbol_ = "bass";
+      y_position_i_ = 0;
+    }
+  else if (t == "bass") 
+    {
+      y_position_i_ = 2;
+    }
+  else if (t == "subbass")
+    {
+      symbol_ = "bass";
+      y_position_i_ = 4;
+    }
 }
 
 void

diff --git a/mf/feta-din10.mf b/mf/feta-din10.mf
index 63ed200622d382d165cb4784fa24e4398ffd01d8..f6f948fe3c466191fcaf6682a5e266c9841a06e7 100644 (file)
--- a/mf/feta-din10.mf
+++ b/mf/feta-din10.mf
@@ -167,7 +167,9 @@ input feta-ital-r;
 input feta-ital-s;
 input feta-ital-z;
 
-font_slant slant; font_x_height x_height#;
+font_slant slant;
+font_x_height x_height#;
+font_quad 18u#;             % to have a working em unit
 
 fet_endfont("feta-din");
 end.

diff --git a/tex/fetdefs.tex b/tex/fetdefs.tex
index 0552dd37ae603a96ba87f2a3e09087b66491fbcc..d8e63ccbab8a07071b028b3f5a64559ee3e8e5ac 100644 (file)
--- a/tex/fetdefs.tex
+++ b/tex/fetdefs.tex
@@ -1,45 +1,49 @@
 % 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\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\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\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\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\fingerfont = feta-nummer3
 }
 
 
@@ -48,9 +52,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,12 +63,36 @@
 % 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}}
 
@@ -79,10 +107,9 @@
 %
 % \input lily-mf-defs
 
-\def\EndLilyPondOutput{
-        \embedclose
-        \csname bye\endcsname
+\def\EndLilyPondOutput{%
+  \embedclose
+  \csname bye\endcsname
 }
 
-
-
+\endinput