2003 -> 2004

[lilypond.git] / mf / parmesan-flags.mf

diff --git a/mf/parmesan-flags.mf b/mf/parmesan-flags.mf
index 63a5ded432c57c24b6616f5e56a701fab6fcc4b4..994c7840a0220500cd88df77b2d9c00c3ea06d19 100644 (file)
--- a/mf/parmesan-flags.mf
+++ b/mf/parmesan-flags.mf
@@ -3,7 +3,7 @@
 % 
 % source file of LilyPond's pretty-but-neat music font
 % 
-% (c) 2001--2002 Juergen Reuter <reuter@ipd.uka.de>
+% (c) 2001--2004 Juergen Reuter <reuter@ipd.uka.de>
 % 
 
 fet_begingroup ("flags")
@@ -28,10 +28,10 @@ dir_down = -1;
 %
 
 def draw_mensural_outermost_flare (expr staffline_adjustment) =
-       define_pixels(stafflinethickness, staff_space)
+       define_pixels(linethickness, staff_space)
 
        pickup pencircle
-               xscaled 1.00 stafflinethickness
+               xscaled 1.00 linethickness
                yscaled 0.22 staff_space
                rotated -35;
 
@@ -59,10 +59,10 @@ def draw_mensural_outermost_flare (expr staffline_adjustment) =
 enddef;
 
 def draw_mensural_inner_flare(expr il_shift) =
-       define_pixels(stafflinethickness, staff_space)
+       define_pixels(linethickness, staff_space)
 
        pickup pencircle
-               xscaled 1.00 stafflinethickness
+               xscaled 1.00 linethickness
                yscaled 0.22 staff_space
                rotated -35;
 
@@ -89,11 +89,15 @@ def draw_mensural_flag (expr staffline_adjustment, flares, direction) =
        fi;
        char_box_adjust = flare_shift+0.5;
        if direction = dir_up:
-               set_char_box(0, 0.60 staff_space#,
-                            (1.00+char_box_adjust)*staff_space#, 0)
+               set_char_box(0,
+                            0.60 staff_space#,
+                            (flares+char_box_adjust)*staff_space#,
+                            0.10 staff_space#)
        else: % direction = dir_down
-               set_char_box(0.60 staff_space#, 0,
-                            (1.00+char_box_adjust)*staff_space#, 0)
+               set_char_box(0.60 staff_space#,
+                            0,
+                            0.10 staff_space#,
+                            (flares+char_box_adjust)*staff_space#)
        fi;
        draw_mensural_outermost_flare (staffline_adjustment)
        for flare_count := 2 step 1 until 4: