Merge branch 'lilypond/translation' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond

[lilypond.git] / mf / feta-bolletjes.mf

diff --git a/mf/feta-bolletjes.mf b/mf/feta-bolletjes.mf
index b45222e4cc6d06f6b2d00a79bcd7cafcb95fcc97..e8d8ff0fa34f3aeb346c900106ecd9628eab6b14 100644 (file)
--- a/mf/feta-bolletjes.mf
+++ b/mf/feta-bolletjes.mf
@@ -3,7 +3,7 @@
 %
 % source file of LilyPond's pretty-but-neat music font
 %
-% (c) 1997--2006 Jan Nieuwenhuizen <janneke@gnu.org>
+% (c) 1997--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 % & Han-Wen Nienhuys <hanwen@xs4all.nl>
 % & Juergen Reuter <reuter@ipd.uka.de>
 %
@@ -163,7 +163,7 @@ def draw_longa (expr up) =
 
        if up:
                bot y1 = -d;
-               y2 = h;
+               top y2 = h;
                rt x1 - fudge = 0;
                x1 = x2;
 
@@ -185,16 +185,18 @@ def draw_longa (expr up) =
 
        draw_gridline (z1, z2, stemthick);
        draw_gridline (z3, z4, stemthick);
+
+       labels (1, 2, 3, 4);
 enddef;
 
 
-fet_beginchar ("Longa notehead", "u-2");
+fet_beginchar ("Longa notehead", "uM2");
        draw_longa (true);
 
        draw_staff (-2, 2, 0);
 fet_endchar;
 
-fet_beginchar ("Longa notehead", "d-2");
+fet_beginchar ("Longa notehead", "dM2");
        draw_longa (false);
 
        draw_staff (-2, 2, 0);
@@ -202,13 +204,13 @@ fet_endchar;
 
 
 if test > 0:
-       fet_beginchar ("Longa notehead", "u-2");
+       fet_beginchar ("Longa notehead", "uM2");
                draw_longa (true);
 
                draw_staff (-2, 2, 0.5);
        fet_endchar;
 
-       fet_beginchar ("Longa notehead", "d-2");
+       fet_beginchar ("Longa notehead", "dM2");
                draw_longa (false);
 
                draw_staff (-2, 2, 0.5);
@@ -219,7 +221,7 @@ fi;
 %
 % dimensions aren't entirely right.
 %
-def draw_brevis =
+def draw_brevis (expr linecount) =
        save stemthick, fudge;
 
        stemthick# = 2 stafflinethickness#;
@@ -242,21 +244,41 @@ def draw_brevis =
        y4 = y2;
        y3 = y1;
 
-       draw_gridline (z1, z2, stemthick);
-       draw_gridline (z3, z4, stemthick);
+       for i := 0 step 1 until linecount - 1:
+               draw_gridline (z1 - (1.5 * i * stemthick, 0),
+                              z2 - (1.5 * i * stemthick, 0), stemthick);
+               draw_gridline (z3 + (1.5 * i * stemthick, 0),
+                              z4 + (1.5 * i * stemthick, 0), stemthick);
+       endfor;
 enddef;
 
 
-fet_beginchar ("Brevis notehead", "s-1");
-       draw_brevis;
+fet_beginchar ("Brevis notehead", "sM1");
+       draw_brevis (1);
+
+       draw_staff (-2, 2, 0);
+fet_endchar;
+
+
+if test > 0:
+       fet_beginchar ("Brevis notehead", "sM1");
+               draw_brevis(1);
+
+               draw_staff (-2, 2, 0.5);
+       fet_endchar;
+fi;
+
+
+fet_beginchar ("Double-lined brevis notehead", "sM1double");
+       draw_brevis (2);
 
        draw_staff (-2, 2, 0);
 fet_endchar;
 
 
 if test > 0:
-       fet_beginchar ("Brevis notehead", "s-1");
-               draw_brevis;
+       fet_beginchar ("Double-lined brevis notehead", "sM1double");
+               draw_brevis (2);
 
                draw_staff (-2, 2, 0.5);
        fet_endchar;