* Another grand 2003 update.

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

diff --git a/mf/feta-toevallig.mf b/mf/feta-toevallig.mf
index cd57e956fe82c783101ae35e980f2329cf9abad6..be80c6089dc1c93385362603969330c9c573d9ee 100644 (file)
--- a/mf/feta-toevallig.mf
+++ b/mf/feta-toevallig.mf
@@ -3,7 +3,7 @@
 % 
 % source file of the Feta (Font-En-Tja) music font
 % 
-% (c) 1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+% (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 % 
 
 
@@ -96,7 +96,7 @@ fet_beginchar("Sharp" , "1", "sharp");
 %
 
 fet_beginchar( "Natural", "0", "natural")
-       save height;    
+       save height, xcenter;
        save interbeam, interstem, beamheight, beamwidth, 
        stemwidth;
        save top_stem_thick;
@@ -171,8 +171,13 @@ def draw_meta_flat(expr xcenter, w, crook_fatness) =
        save top_stem_thick, bottom_stem_thick, hair, smaller_hole;
        save center;
        pair center;
+       save clearing;
        center = (xcenter, 0);
 
+% the shouldn't reach to the top staff line.
+%% TODO: should take from height.
+       clearing = 1.2 stafflinethickness; 
+
 %
 %  TODO: parameterize  this
 %
@@ -181,12 +186,12 @@ def draw_meta_flat(expr xcenter, w, crook_fatness) =
        else:
                smaller_hole = 0.0 stafflinethickness;
        fi
-       crook_thinness = 1.1 stafflinethickness;
-       top_stem_thick = 2 stafflinethickness;
+       crook_thinness = 1.25 stafflinethickness;
+       top_stem_thick = 2.2 stafflinethickness;
        bottom_stem_thick = 1.2 stafflinethickness;
 
 
-       z1 = (0, 2 staff_space) + center;
+       z1 = (0, 2 staff_space) + center - (0, stafflinethickness/2 + clearing);
        z2 = (0, - 1/2 staff_space)+  center;
 
        penpos1(top_stem_thick, 0);
@@ -251,8 +256,8 @@ enddef;
 % unfortunately, 600dpi is not enough to show the brush of the stem.
 %
 fet_beginchar("Flat", "-1", "flat")
-       set_char_box(1.2 stafflinethickness#, .8 staff_space#, .5 staff_space#, 2 staff_space#);
-       draw_meta_flat(0, w, 1/3 staff_space);
+       set_char_box(1.2 stafflinethickness#, .8 staff_space#, 0.6 staff_space#, 1.9 staff_space#);
+       draw_meta_flat(0, w, 0.31 staff_space);
        fet_endchar;
 
 
@@ -261,10 +266,10 @@ fet_beginchar("Double Flat", "-2", "flatflat")
        left_wid = .7;
        right_wid = .8;
        overlap = .05;
-       set_char_box(1.2 stafflinethickness#, (left_wid + right_wid -overlap) *staff_space#, .5 staff_space#, 2 staff_space#);
+       set_char_box(1.2 stafflinethickness#, (left_wid + right_wid -overlap) *staff_space#, .6 staff_space#, 1.9 staff_space#);
        draw_meta_flat(0, left_wid*  staff_space, 1/3 staff_space);
        draw_meta_flat((left_wid - overlap) *staff_space,  
-               right_wid *staff_space, 1/3 staff_space);
+               right_wid *staff_space, 0.33 staff_space);
        fet_endchar;
 
 fet_beginchar("Double Sharp", "2", "sharpsharp")