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

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

diff --git a/mf/feta-bolletjes.mf b/mf/feta-bolletjes.mf
index 36abfcf1a8bd049c18f47352cc0d786fb88a0059..fcda600978cc99541031ab051d7ed902cfdb48c2 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);
@@ -247,7 +249,7 @@ def draw_brevis =
 enddef;
 
 
-fet_beginchar ("Brevis notehead", "s-1");
+fet_beginchar ("Brevis notehead", "sM1");
        draw_brevis;
 
        draw_staff (-2, 2, 0);
@@ -255,7 +257,7 @@ fet_endchar;
 
 
 if test > 0:
-       fet_beginchar ("Brevis notehead", "s-1");
+       fet_beginchar ("Brevis notehead", "sM1");
                draw_brevis;
 
                draw_staff (-2, 2, 0.5);
@@ -286,8 +288,6 @@ if test > 0:
 fi;
 
 
-
-
 fet_beginchar ("Half notehead", "s1");
        draw_outside_ellipse (1.53 - puff_up_factor / 3.0, 34, 0.66, 0.17);
        undraw_inside_ellipse (3.25, 33, 0.81, 2.5 stafflinethickness#);
@@ -318,6 +318,7 @@ fet_beginchar ("Quart notehead", "s2");
        draw_staff (-2, 2, 0);
 fet_endchar;
 
+
 if test > 0:
        fet_beginchar ("Quart notehead", "s2");
                draw_outside_ellipse (1.49 - puff_up_factor / 3.0, 31,
@@ -408,8 +409,7 @@ enddef;
 
 
 %
-%
-% UGH : xs not declared as argument.
+% UGH: xs not declared as argument.
 %
 def define_triangle_shape (expr stemdir) =
        save triangle_a, triangle_b, triangle_c;
@@ -447,7 +447,7 @@ def define_triangle_shape (expr stemdir) =
        set_char_box (0, width#, depth#, height#);
 
        % Formerly, the shape has simply been drawn with an elliptical pen
-       % (`scaled pen_thick xsaled xs'), but the envelope of such a curve
+       % (`scaled pen_thick xscaled xs'), but the envelope of such a curve
        % is of 6th degree.  For the sake of mf2pt1, we approximate it.
 
        pickup pencircle scaled pen_thick xscaled xs;
@@ -514,7 +514,6 @@ def define_triangle_shape (expr stemdir) =
                       & {direction infinity of triangle_out_c}z1'l
                       .. cycle;
 
-
        labels (0, 10, 20, 30);
        penlabels (1, 1', 2, 2', 3, 3', 12, 23, 31);
 
@@ -524,7 +523,7 @@ def define_triangle_shape (expr stemdir) =
                charwx := xpart exact_right_point + .5 pen_thick# * xs;
        else:
                charwy := -ypart exact_down_point;
-               charwx := (width# - (xpart exact_down_point - 0.5 * xs * pen_thick#));
+               charwx := width# - (xpart exact_down_point - .5 pen_thick# * xs);
        fi
 enddef;