release: 1.0.1

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

diff --git a/mf/feta-klef.mf b/mf/feta-klef.mf
index bd9eb4f542cdee772e01a2098f6e97859b28546d..cccaef43fd3536b3d81991e4b6f73bdb00bc6617 100644 (file)
--- a/mf/feta-klef.mf
+++ b/mf/feta-klef.mf
@@ -4,10 +4,22 @@
 % 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>
+
+
+
 
 fet_begingroup("clefs");
 
+%
+% [Ross] says that clefs take 1 interline space on the left and right
+%
+def set_horizontal_spacing =
+       save left_space ,right_space;
+       left_space# = reduced_il#;
+       right_space# = reduced_il#;
+enddef;
+
 def draw_staff(expr first, last)=
        pickup pencircle scaled stafflinethickness;
        for i:= first step 1 until last:
@@ -18,13 +30,18 @@ def draw_staff(expr first, last)=
 % [Wanske] says the bulbs should be positioned about 1/4 right of the
 % "arrow"
 def draw_c_clef (expr reduction) = 
-       save hair, norm, reduced_il;
+       save hair, norm, reduced_il, right_edge;
        reduced_il#=interline#*reduction;
        norm#:=2/3reduced_il#;
        hair#:=1/6norm#;
-       define_pixels (hair,norm,reduced_il);
-       set_char_box (0, 15/4norm#+2hair#, 
+
+       set_horizontal_spacing;
+       right_edge# = 15/4norm#+2hair#;
+
+       set_char_box (left_space#, right_edge# + right_space#, 
                2 reduced_il#, 2 reduced_il#);
+       define_pixels (hair,norm,reduced_il, right_edge);
+
        draw_block ((0,-d), (3/4norm+1/2hair,h));
        draw_block ((3/4norm+2hair,-d), 
                (3/4norm+7/2hair,h));
@@ -34,9 +51,9 @@ def draw_c_clef (expr reduction) =
        penpos1(hair,-90);
        z1l=(xoff+norm+hair,h);
        penpos2(norm-3/2hair,180);
-       z2l=(w,h/2);
+       z2l=(right_edge,h/2);
        penpos3(hair,90);
-       z3=(((w-xoff)/2)+xoff,2hair);
+       z3=(((right_edge -xoff)/2)+xoff,2hair);
 
        penpos4(hair,0);
        z4=(xoff+1/2norm+1/2hair,reduced_il-hair);
@@ -90,24 +107,29 @@ fet_endchar;
 % the dots, but her picture shows that the extreme is ~ 0.2 ss lower
 
 def draw_bass_klef(expr exact_center, reduction) = 
-       save reduced_il, left_tilt, left_thick;
+       save reduced_il, left_tilt, left_thick, ball_to_right;
        reduced_il# = interline# * reduction;
-       left_tilt = 5;
-       define_pixels(reduced_il);
-       left_thick = .25  reduced_il;
        
-       set_char_box(
-               - xpart exact_center+ .2 reduced_il#, 
-               xpart exact_center + 2.7 reduced_il#, 
+       set_horizontal_spacing;
+       ball_to_right# = 2.1 reduced_il#;
+       set_char_box(left_space# +
+               - xpart exact_center,
+               right_space# +
+               xpart exact_center + ball_to_right#, 
                - ypart exact_center + 2.5 reduced_il#, 
                ypart exact_center +reduced_il#);
+
+       define_pixels(reduced_il, ball_to_right);
+       left_tilt = 5;
+       left_thick = .25  reduced_il;
+
        x1r - x1l = left_thick;
        z1l = (hround_pixels(xpart exact_center), 
                vround_pixels(ypart exact_center));
 
        y2 = reduced_il;
 
-       x3l - x1l =  2.1 reduced_il;
+       x3l - x1l =  ball_to_right;
        x2 = .5 [x1,x3];
        x3l - x3r = .48 reduced_il;
        y3l = -0.05 interline;
@@ -154,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.
@@ -189,7 +210,12 @@ def draw_gclef (expr exact_center, reduction)=
 
        thinnib = thinness - hair;
        thinpen = thinness;
-       set_char_box(-xpart exact_center + 1.1 * breapth_factor* reduced_il#, 
+       set_horizontal_spacing;
+       
+       set_char_box(
+               left_space# +
+               -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#,
                ypart exact_center + 5 * reduced_il#);
@@ -233,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);
@@ -242,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} .. 
@@ -269,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;