release: 1.3.18

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

diff --git a/mf/feta-klef.mf b/mf/feta-klef.mf
index 2cf10ca78826931f26477ad0b9fa28e8029fbd18..9ec3c74e8b3a0cbdc823e2b52bfea59e2713f817 100644 (file)
--- a/mf/feta-klef.mf
+++ b/mf/feta-klef.mf
@@ -1,12 +1,11 @@
+% feta-klef.mf --  implement Clefs -*-Fundamental-*-
 % 
-% feta-klef.mf --  implement Clefs
-% 
-% source file of the Feta (Font-En-Tja) music font
+% part of LilyPond's pretty-but-neat music font
+%
+% source file of the Feta (not the Font-En-Tja) music font
 % 
-% (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>,
-% Jan Nieuwenhuizen <jan@digicash.com>
-
-
+% (c) 1997, 1998 Han-Wen Nienhuys <hanwen@stack.nl>,
+% Jan Nieuwenhuizen <janneke@gnu.org>
 
 
 fet_begingroup("clefs");
@@ -16,16 +15,10 @@ fet_begingroup("clefs");
 %
 def set_horizontal_spacing =
        save left_space ,right_space;
-       left_space# = reduced_il#;
-       right_space# = reduced_il#;
+       left_space# = 0;
+       right_space# = 0;
 enddef;
 
-def draw_staff(expr first, last)=
-       pickup pencircle scaled stafflinethickness;
-       for i:= first step 1 until last:
-               draw (- interline, i* interline) .. (4 interline, i* interline);
-       endfor
-       enddef;
 
 % [Wanske] says the bulbs should be positioned about 1/4 right of the
 % "arrow"
@@ -81,14 +74,14 @@ def draw_c_clef (expr reduction) =
        draw_flare(z7r,180,-90,hair,norm-1/2hair);
        enddef;
 
-fet_beginchar ("C clef", "alto", "altoclef")
+fet_beginchar ("C clef", "C", "altoclef")
        if test = 1:
                draw_staff (-2,2);
        fi;
        draw_c_clef (1.0);
 fet_endchar;
 
-fet_beginchar ("C clef", "alto_change", "caltoclef")
+fet_beginchar ("C clef", "C_change", "caltoclef")
        if test = 1:
                draw_staff (-2,2);
        fi;
@@ -106,7 +99,7 @@ fet_endchar;
 % [Wanske] says that the extreme x point should be exactly between 
 % the dots, but her picture shows that the extreme is ~ 0.2 ss lower
 
-def draw_bass_klef(expr exact_center, reduction) = 
+def draw_bass_clef(expr exact_center, reduction) = 
        save reduced_il, left_tilt, left_thick, ball_to_right;
        reduced_il# = interline# * reduction;
        
@@ -161,14 +154,14 @@ enddef;
 
 
 
-fet_beginchar("F clef ", "bass", "bassclef")
+fet_beginchar("F clef ", "F", "bassclef")
        if test = 1:
                draw_staff(-3,1);
        fi;
-       draw_bass_klef((.5 interline#, 0), 1.0);
+       draw_bass_clef((.5 interline#, 0), 1.0);
 fet_endchar;
-fet_beginchar("F clef (reduced)", "bass_change", "cbassclef")
-       draw_bass_klef((.4 interline#, 0),0.8);
+fet_beginchar("F clef (reduced)", "F_change", "cbassclef")
+       draw_bass_clef((.4 interline#, 0),0.8);
 fet_endchar;
 
 
@@ -189,6 +182,9 @@ fet_endchar;
 % Ikzelf heb bijvoorbeeld over mijn eerste gave G-sleutel
 % 35 kilobyte metafont, 12 patchlevels, 0 vriendinnen en 45 dagen gedaan
 %
+%  -- vrij naar Van Kooten & De Bie
+%
+
 def draw_gclef (expr exact_center, reduction)=
        save reduced_il, downstroke_dir, downstroke_angle, hair, center;
        save breapth_factor, inner_thick_end, thinness, thickness, thinnib;
@@ -302,13 +298,13 @@ def draw_gclef (expr exact_center, reduction)=
 enddef;
 
 
-fet_beginchar("G clef", "violin", "violinclef")
+fet_beginchar("G clef", "G", "trebleclef")
        if test = 1:
                draw_staff(-1,3);
        fi;
        draw_gclef((1.7 interline#,0), 1.0);
 fet_endchar;
-fet_beginchar("G clef", "violin_change", "cviolinclef")
+fet_beginchar("G clef", "G_change", "ctrebleclef")
        draw_gclef((1.3 interline#,0), .8);
 fet_endchar;