* scm/output-ps.scm (lily-traced-cm-fonts): substitution for lily

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

diff --git a/mf/feta-toevallig.mf b/mf/feta-toevallig.mf
index 9616c63d75fa1f4f3d444b17e7890053c0aa576a..944ee8a278f08f9cebf1304cca231aaf58e2e14c 100644 (file)
--- a/mf/feta-toevallig.mf
+++ b/mf/feta-toevallig.mf
@@ -170,6 +170,7 @@ def draw_meta_flat(expr xcenter, w, crook_fatness) =
        save crook_thinness;
        save bottom_overshoot;
        save top_stem_thick, bottom_stem_thick, hair, smaller_hole;
+       save top_crook_thinness;
        save zwiep; 
        save center;
        pair center;
@@ -184,16 +185,22 @@ def draw_meta_flat(expr xcenter, w, crook_fatness) =
 %  TODO: parameterize  this
 %
        if w >= 0.75 staff_space:
-               smaller_hole = 0.2 stafflinethickness;
+               smaller_hole = 0.35 stafflinethickness;
        else:
                smaller_hole = 0.0 stafflinethickness;
        fi
-       crook_thinness = 1.1 stafflinethickness;
-       top_stem_thick = 2.2 stafflinethickness;
+       crook_thinness = 1.3 stafflinethickness;
+       top_crook_thinness = 1.65 stafflinethickness;
+
+       % actually, this used to be 2.2 stafflinethickness,
+       % that looks very awful in 600dpi.
+       % TODO: a better (resolution indepedendent) fix  
+       
+       top_stem_thick# = 2.3 stafflinethickness#;
+       define_blacker_pixels (top_stem_thick);
        bottom_overshoot = stafflinethickness;
        bottom_stem_thick = 1.2 stafflinethickness;
 
-
        z1 = (0, 2 staff_space) + center - (0, stafflinethickness/2
                + clearing);
        z2 =  (0, - 1/2 staff_space - stafflinethickness/2 )+  center;
@@ -214,7 +221,8 @@ def draw_meta_flat(expr xcenter, w, crook_fatness) =
                -staff_space/2 - stafflinethickness/2) - (0,bottom_overshoot);
 
        penpos4(whatever, 53);
-       y4l - y4r = 1.5 crook_thinness ;
+
+       y4l - y4r =  top_crook_thinness ;
 
        y5r = .20 staff_space + ypart center;
        x5l = w + xpart center;
@@ -231,19 +239,21 @@ def draw_meta_flat(expr xcenter, w, crook_fatness) =
 
        z7 = z8 + whatever * bot_crook_dir + crook_thinness  * (bot_crook_dir rotated 90);
 
-       x7 = .5 [x11, x8];
+       x7 = .1 [x3r, x8];
 
        penlabels(range 0 thru 10);
 
-       y10 = -1/5 staff_space;
+       y10 = -1/10 staff_space;
 %      draw_staff (-2, 2, 0.5);
 %      draw_staff (-2, 2, 0.0);
 
        unfill z3r{z3r-z10} .. z4r{right} .. z5r{down}
 
                ..  z7{- bot_crook_dir}
-               & z7 .. tension 1.3
-               .. z10{z3r-z10}  -- cycle;
+               & z7 % .. tension 1.3
+               .. z10{z3r-z10}
+
+               -- cycle;
        fill z2l{down}
                
                .. z11{right}
@@ -251,7 +261,7 @@ def draw_meta_flat(expr xcenter, w, crook_fatness) =
                .. z5l{up}
                .. z4l{left} .. z3l -- cycle;
                
-       labels(11);
+       labels(10);
 enddef;
 
        
@@ -271,7 +281,7 @@ fet_beginchar("Double Flat", "-2", "flatflat")
        overlap = .05;
        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,  
+       draw_meta_flat(round ((left_wid - overlap) *staff_space),
                right_wid *staff_space, 0.33 staff_space);
        fet_endchar;