release: 1.5.43

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

diff --git a/mf/feta-schrift.mf b/mf/feta-schrift.mf
index 49f18ee26272c7bfbb6f82f6638e8b35346c7014..5999f7120ba498d39bfdb8033bbf1c2a70ca0045 100644 (file)
--- a/mf/feta-schrift.mf
+++ b/mf/feta-schrift.mf
@@ -277,27 +277,47 @@ fet_beginchar("plus (stopped)", "stopped", "plusstop")
        addto currentpicture also currentpicture rotated 90;
 fet_endchar;
 
+
 %
-% FIXME: blotting 
+% A vee with tapered insides to prevent visual blotting
 %
-fet_beginchar("Upbow", "upbow", "upbow")
-       save ht, wd, thick;
 
-       thick = 1.4 stafflinethickness;
-       wd# = 1.3 staff_space#;
-       ht# = 1.6 wd#; 
+def draw_vee (expr width, height, thickness) =
+begingroup
+       save diminish;
 
-       
-       set_char_box(wd#/2, wd#/2, 0, ht#);
-       pickup pencircle scaled thick;
+       diminish = 0.75;
 
+       pickup pencircle scaled thickness;
+       
        x1 = 0;
        bot y1 = 0;
        rt x2 =  w;
        top y2 = h;
 
+       z3 = 0.6 [z2, z1];
+       penpos3(thickness, 0);
+       penpos4(thickness * diminish, 0);
+       x4r = thickness/2;
+       y4 = thickness/2;
        labels(1,2);
-       draw z2 -- z1 -- (z2 xscaled -1);
+       penlabels(3,4);
+
+       draw z1;
+       draw z3 -- z2;
+       penstroke z3e .. z4e;
+       addto currentpicture also currentpicture xscaled -1;
+endgroup;
+enddef;
+
+fet_beginchar("Upbow", "upbow", "upbow")
+       save ht, wd, thick, diminish;
+       
+       thick = 1.4 stafflinethickness;
+       wd# = 1.3 staff_space#;
+       ht# = 1.6 wd#; 
+       set_char_box(wd#/2, wd#/2, 0, ht#);
+       draw_vee (wd, ht, thick);
 fet_endchar;
 
 
@@ -410,20 +430,22 @@ fet_beginchar("Trill (`tr')","trill","trill")
        ascender_extra# = 1/2 ex#;
        ascender# = ascender_extra# + ex#;
        ex# = 1.4 staff_space#;
-       kerning# = .550 ex#;
+       kerning# = .60 ex#;
        start_nib_angle = 20;
-       bulb_size = 0.55;
+       bulb_size = 0.70;
        define_pixels(ex, ascender_extra, ascender, kerning);
 
        t_overshoot = 0.03 ex;
        fatness = 12/40 ex;
-       t_fatness = 0.780 fatness;
-       t_width =  1.8 t_fatness;
-       r_fatness = 0.75 fatness;
-       uitschieter = 0.43 ex;
+       t_fatness = 0.78 fatness;
+       t_width =  1.9 t_fatness;
+       r_fatness = 0.78 fatness;
+       uitschieter = 0.48 ex;
        hair_thick =  blot_diameter;
-
+       r_flare = 0.45  r_fatness;
+       r_width =  2 r_fatness + 0.25 kerning;
        slant = .2;
+
 %      slant = .0;
 
        local_copy(transform)(currenttransform);
@@ -454,7 +476,8 @@ fet_beginchar("Trill (`tr')","trill","trill")
        z5 = (t_fatness/2, 2/3 ex);
 %      penpos5(hair_thick, ); 
 
-       t_p := simple_serif (z1r, z1l, -40) -- z2l {down}
+       t_p := z1r{dir (angle(z1l-z1r) + 30)} .. z1l{-dir (angle(z1r-z1l) - 45)}
+               -- z2l {down}
                .. tension (1 + .5 slant)
                .. z3l{right} 
                
@@ -501,22 +524,22 @@ fet_beginchar("Trill (`tr')","trill","trill")
        set_char_box(.85 staff_space# , .85 staff_space#, 0,ascender#);
 
 
-       penpos11(1/4 r_fatness, -20);
+       penpos11(1/4 r_fatness, -4);
        z11r = z9r;
        
-       z13 = (x9 + 1.9 r_fatness, y11 -  stafflinethickness );
-       penpos13(0.45  r_fatness, 170);
+       z13l = (x9l + r_width, y11 -  stafflinethickness );
+       penpos13(r_flare, 180);
 
        z15 = z13r  - (bulb_size * r_fatness,0);
        z14 = 0.5 [z13l, z15] - (0,bulb_size* r_fatness);
        z16 = 0.5 [z13l, z15] + (0,bulb_size* r_fatness);
 
 
-       fill z11r{dir 70} .. tension 0.94 .. z13r{down} -- z15{down}
-               .. tension 0.97 .. z13l{up}
-               .. z11l{dir 250} -- cycle;
+       fill z11r{up} .. tension 0.94 .. z13r{down} -- z15{down}
+               .. tension 1.0 .. z13l{up}
+               .. z11l{down} -- cycle;
 
-       fill z15{up} .. tension 1.1 .. z13l{down} .. z14 .. cycle;
+       fill z15{up} .. tension 1.06 .. z13l{down} .. z14 .. cycle;
 
 
 
@@ -570,17 +593,7 @@ def draw_toe =
 
 
        set_char_box(wd#, wd#, 0, ht#);
-       
-       pickup pencircle scaled thickness;
-       lft x1 = -b;
-       bot y1 = 0;
-       x2 =0;
-       top y2 = h;
-       z3 = z1 xscaled -1;
-
-
-       draw z1 -- z2 -- z3;
-
+       draw_vee (wd, ht, thickness);
 enddef;
        
 fet_beginchar("left toe", "upedaltoe", "upedaltoe")