* stepmake/stepmake/metafont-rules.make: make single SVG/PFA/PFB

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

diff --git a/mf/feta-klef.mf b/mf/feta-klef.mf
index 3fcb0ef8761558a36bf4bace12b22304818d3017..4ef8e0b7bcc366ef75797d8cc86a0fd731f48867 100644 (file)
--- a/mf/feta-klef.mf
+++ b/mf/feta-klef.mf
@@ -4,12 +4,13 @@
 %
 % source file of the Feta (not the Font-En-Tja) music font
 % 
-% (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>,
+% (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>,
 % Jan Nieuwenhuizen <janneke@gnu.org>,
 % Juergen Reuter <reuter@ipd.uka.de>
 
 
 fet_begingroup("clefs");
+test_staff = 0;
 
 
 % [Wanske] says the bulbs should be positioned about 1/4 right of the
@@ -21,7 +22,7 @@ def draw_c_clef (expr reduction) =
        save hair, norm, reduced_ss, right_edge;
        reduced_ss#=staff_space#*reduction;
        norm#:=2/3reduced_ss#;
-       hair#:=1/6norm#;
+       hair#:=0.06 reduced_ss# + 0.5 linethickness# ;
 
        right_edge# = 15/4norm#+2hair#;
 
@@ -32,9 +33,13 @@ def draw_c_clef (expr reduction) =
        draw_block ((0,-d), (3/4norm+1/2hair,h));
        draw_block ((3/4norm+2hair,-d), 
                (3/4norm+7/2hair,h));
+
        
        save xoff;
        xoff=3/4norm+7/2hair;
+       z5l = (xoff - 3/4 hair, 0);
+       z5r = (x4, 0);
+
        penpos1(hair,-90);
        z1l=(xoff+norm+hair,h);
        penpos2(norm-3/2hair,180);
@@ -43,10 +48,7 @@ def draw_c_clef (expr reduction) =
        z3=(((right_edge -xoff)/2)+xoff,2hair);
 
        penpos4(hair,0);
-       z4=(xoff+1/2norm+1/2hair,reduced_ss-hair);
-       
-       penpos5(4hair,0);
-       z5=(xoff+5/4hair,0);
+       z4=(xoff+1/2norm+1/2hair, reduced_ss - linethickness - .2 hair);
 
        penpos6(norm-hair,90);
        z6=(xoff+3/4norm,0);
@@ -67,15 +69,15 @@ def draw_c_clef (expr reduction) =
 
        enddef;
 
-fet_beginchar ("C clef", "C", "altoclef")
-       if test = 1:
+fet_beginchar ("C clef", "C")
+       if test_staff = 1:
                draw_staff (-2,2, 0.0);
        fi;
        draw_c_clef (1.0);
 fet_endchar;
 
-fet_beginchar ("C clef", "C_change", "caltoclef")
-       if test = 1:
+fet_beginchar ("C clef", "C_change")
+       if test_staff = 1:
                draw_staff (-2,2, 0.0);
        fi;
        draw_c_clef (.8);
@@ -170,12 +172,10 @@ def draw_bass_clef(expr exact_center, reduction) =
         save dot_diam;
         reduced_ss# = staff_space# * reduction;
 
-
         2.2 dot_diam = round reduction* (staff_space - stafflinethickness);
-       right_thickness = 0.48;
-        left_thick = .25;
+       right_thickness = 0.37 staff_space + 1.2 linethickness ;
         swoosh_width# = 2.1 reduced_ss#;
-%      tip_protude := (-stafflinethickness, -.2 staff_space);
+%      tip_protude := (-linethickness, -.2 staff_space);
        tip_protude := (0, 0);  
        bulb_y_offset := 0.15 staff_space;
        overshoot_top := 0.0;
@@ -198,12 +198,11 @@ def draw_bass_clef(expr exact_center, reduction) =
         x2 = .5 [x1,x3];
        x2l = x2r = x2;
 
-       y2l := vround_pixels (reduced_ss#  + 0.5 stafflinethickness#);
-       y2l - y2r = (1.0 + overshoot_top) * stafflinethickness;
-       y2 = .5 [y2l, y2r];
+       y2l := vround_pixels (reduced_ss#  + 0.5 linethickness#);
+       y2l - y2r = (1.0 + overshoot_top) * linethickness;
 
         x3l - x1 =  swoosh_width;
-        x3l - x3r = right_thickness * reduced_ss;
+        x3l - x3r = right_thickness;
 
        % try to correct: the top dot seems farther away if y3l = 0.
         y3l = 0.05 staff_space;
@@ -213,12 +212,12 @@ def draw_bass_clef(expr exact_center, reduction) =
         z5 = (x3l +  1/3 reduced_ss, .5 reduced_ss);
 
         penpos3(whatever,  185);
-        penpos4(stafflinethickness, 135);
+        penpos4(linethickness, 135);
 
        pickup pencircle scaled 1; 
 %      draw
        fill
-           new_bulb (z1, 0.45 reduced_ss, 0.4 reduced_ss, 2.5 stafflinethickness,  1, 1)
+           new_bulb (z1, 0.45 reduced_ss, 0.4 reduced_ss, 2.5 linethickness,  1, 1)
 
 {dir (90)}
                .. z2r{right} .. tension 1.0 .. z3r{down}  .. {curl 0} 
@@ -239,14 +238,14 @@ enddef;
 
 
 
-fet_beginchar("F clef ", "F", "bassclef")
-       if test = 1:
+fet_beginchar("F clef ", "F")
+       if test_staff = 1:
                draw_staff(-3,1, 0.0);
        fi;
        draw_bass_clef((0, 0), 1.0);
 fet_endchar;
 
-fet_beginchar("F clef (reduced)", "F_change", "cbassclef")
+fet_beginchar("F clef (reduced)", "F_change")
        draw_bass_clef((0, 0),0.8);
 fet_endchar;
 
@@ -275,7 +274,7 @@ def draw_gclef (expr reduction)=
        define_pixels(reduced_ss);
        pair downstroke_dir, center;
 
-       thinness = 1.4 stafflinethickness;
+       thinness = 0.08 staff_space + 0.7 linethickness;
        downstroke_dir = unitvector (14, -75);
        downstroke_angle = angle downstroke_dir;
 
@@ -283,7 +282,7 @@ def draw_gclef (expr reduction)=
        breapth_factor = 21.0 /14;
        inner_thick_end = 45;
        inner_start_angle = downstroke_angle - 43;
-       thickness = .4 reduced_ss;
+       thickness = .32 reduced_ss + 1.1 linethickness;
 
        thinnib = thinness;
 
@@ -296,7 +295,7 @@ def draw_gclef (expr reduction)=
        center := (1.0 * breapth_factor* reduced_ss, 0);
 
        save upward_swoosh_angle;
-       upward_swoosh_angle =130 ;
+       upward_swoosh_angle = 132;
        penpos7(thickness, upward_swoosh_angle);
        penpos5(thickness, upward_swoosh_angle);
 
@@ -337,7 +336,7 @@ def draw_gclef (expr reduction)=
 
        z10 = .5 [z10l, z10r];
 
-       z11 =  center + whatever * downstroke_dir +  ( .05 reduced_ss, 0);
+       z11 =  center + whatever * downstroke_dir +  ( .00 reduced_ss, 0);
 
        penpos1(thinnib, inner_start_angle);
        penpos2(thickness, 90);
@@ -349,7 +348,7 @@ def draw_gclef (expr reduction)=
        save lipje;
        pair lipje;
        lipje= .5 [z9l, z9r] +  .25 ((z9r- z9l)  rotated -90);
-       penpos13(2 thinnib, 180);
+       penpos13(thinnib + 0.14 staff_space, 180);
 
        pickup pencircle scaled 1;
 
@@ -359,12 +358,10 @@ def draw_gclef (expr reduction)=
                .. z4l{left}
                .. z5l{up}
                .. z7l{up} 
-               %.. z8l 
                .. tension 1.2 
                .. z9l -- lipje
                --z9r % {dir (downstroke_angle+ 0)}
                .. tension 0.8
-               %.. z8r
                .. z7r{down} .. z5r{down} .. z4r{right}
                .. z3r .. z2r{left} .. 
                tension .95 .. 
@@ -394,8 +391,7 @@ def draw_gclef (expr reduction)=
 
        p := z9 .. z10{down}
                .. z6
-               .. (.52 [z4, z3])
-               .. z11{down}
+               .. z11{dir (-95) }
                .. z12{dir(bot_angle)}
                .. z13{up}
        ;
@@ -431,7 +427,9 @@ def draw_gclef (expr reduction)=
                z11r{dir(start_angle)}
                .. z12r{dir(bot_angle)}
 
-               ..new_bulb (z13r, 0.45 reduced_ss, 0.38 reduced_ss, 3 stafflinethickness,  1, -1) {down}
+               ..new_bulb (z13r, 0.45 reduced_ss, 0.38 reduced_ss, thinnib
+                       + .15 staff_space
+                       ,  1, -1) {down}
 
 %              .. tension 0.98
                .. z12l{-dir (bot_angle)}
@@ -445,13 +443,14 @@ def draw_gclef (expr reduction)=
 enddef;
 
 
-fet_beginchar("G clef", "G", "trebleclef")
-       if test = 1:
+fet_beginchar("G clef", "G")
+       if test_staff = 1:
                draw_staff(-1,3, 0.0);
        fi;
        draw_gclef(1.0);
 fet_endchar;
-fet_beginchar("G clef", "G_change", "ctrebleclef")
+
+fet_beginchar("G clef", "G_change")
        draw_gclef(0.8);
 fet_endchar;
 
@@ -479,11 +478,11 @@ def draw_percussion_clef(expr reduction) =
        draw_block((w-razt,-d),(w,h));
 enddef;
 
-fet_beginchar("percussion clef", "percussion", "percussionclef")
+fet_beginchar("percussion clef", "percussion")
        draw_percussion_clef(1.0);
 fet_endchar;
 
-fet_beginchar("percussion clef (reduced)", "percussion_change", "cpercussionclef")
+fet_beginchar("percussion clef (reduced)", "percussion_change")
        draw_percussion_clef(.8);
 fet_endchar;
 
@@ -662,12 +661,33 @@ def draw_tab_clef(expr reduction) =
          (2.1*reduced_ss,letterheight),0.25);
 enddef;
 
-fet_beginchar("tab clef", "tab", "tabclef")
+fet_beginchar("tab clef", "tab")
        draw_tab_clef(1.0);
 fet_endchar;
 
-fet_beginchar("tab clef (reduced)", "tab_change", "ctabclef")
+fet_beginchar("tab clef (reduced)", "tab_change")
        draw_tab_clef(.8);
 fet_endchar;
 
 fet_endgroup("clefs");
+
+if 0 = 1:
+
+%
+% testing unicode/gnome-canvas
+%
+
+savecode:=code;
+code:=97;
+fet_beginchar("Ascii b", "b")
+%%fet_beginchar("G clef", "G")
+       if test_staff = 1:
+               draw_staff(-1,3, 0.0);
+       fi;
+       draw_gclef(1.0);
+       %% charnamestr:="Ascii b";
+fet_endchar;
+
+code:=savecode;
+
+fi