release: 1.0.1

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

diff --git a/mf/feta-klef.mf b/mf/feta-klef.mf
index 11ef0c228de420f5276ec93101cfcf3ea1c75e1e..cccaef43fd3536b3d81991e4b6f73bdb00bc6617 100644 (file)
--- a/mf/feta-klef.mf
+++ b/mf/feta-klef.mf
@@ -4,7 +4,7 @@
 % source file of the Feta (Font-En-Tja) music font
 % 
 % (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>,
-% Jan Nieuwenhuizen <jan@digicash.com>
+% Jan Nieuwenhuizen <janneke@gnu.org>
 
 
 
@@ -176,7 +176,6 @@ fet_endchar;
 %
 % Inspired by Baerenreiter
 % 
-% FIXME top should be thinner at z8,
 % FIXME bulb should curve (see bass clef)
 % FIXME start (inside) should be little thinner
 % FIXME parametrise.
@@ -215,7 +214,7 @@ def draw_gclef (expr exact_center, reduction)=
        
        set_char_box(
                left_space# +
-               -xpart exact_center + 1.1 * breapth_factor* reduced_il#, 
+               -xpart exact_center + 1.0 * breapth_factor* reduced_il#, 
                right_space# +
                xpart exact_center + .66 breapth_factor* reduced_il#,
                -ypart exact_center + 3 * reduced_il#,
@@ -260,7 +259,7 @@ def draw_gclef (expr exact_center, reduction)=
 
        center - z10= whatever * downstroke_dir;
        center - z11 =  whatever * downstroke_dir;
-
+       center - z14 = .8 (center - z11);
        penpos1(thinnib, inner_start_angle);
        penpos2(thickness, 90);
        penpos3(thinnib, -90 + inner_thick_end);
@@ -269,19 +268,20 @@ def draw_gclef (expr exact_center, reduction)=
 
        penpos7(thickness, 135);
        penpos8(1.5 thinnib, - 70 + angle downstroke_dir);
-       penpos9(1.5 thickness, -80);
+       penpos9(1.4 thickness, -80);  % ugh
        penpos10(whatever, downstroke_angle + 10);
        penpos11(thinnib, downstroke_angle + 90);
+       penpos14(thinnib, downstroke_angle + 90);
        penpos12(thinnib, -90);
        penpos13(3 thinnib, 180);
 
-       
        filldraw z2l{right}   .. z3l.. z4l{left} .. z5l{up}  .. z7l{up} 
                %.. z8l 
+               .. tension 1.2 
                .. z9l & z9l ..
                {downstroke_dir}z10l --- z11l -- z11r --- z10r{- downstroke_dir} 
                .. tension .8 
-               .. z9r & z9r  
+               .. z9r & z9r{dir (downstroke_angle+ 40)} % ugh
                %.. z8r
                .. z7r{down} .. z5r{down} .. z4r{right}
                .. z3r .. z2r{left} .. 
@@ -296,7 +296,7 @@ def draw_gclef (expr exact_center, reduction)=
        draw_bulb(-1,  z13l, lft z13r, 6/14 reduced_il, 1.0);
 
        pickup pencircle scaled (thinpen);
-       draw z10 --- z11 .. z12{left};
+       draw z10 --- z14 .. z11  .. tension 0.85 ..  z12{left};
 
        penlabels(range 1 thru 15);
 enddef;