(interpret_finale_key_sig): handle minor keys

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

diff --git a/mf/feta-pendaal.mf b/mf/feta-pendaal.mf
index 2fa526a1350cacbcfd5ddd83dd130482d907d789..f783f302efad2f2254cda31f5612cc4966cbaef7 100644 (file)
--- a/mf/feta-pendaal.mf
+++ b/mf/feta-pendaal.mf
@@ -5,7 +5,7 @@
 %
 % source file of the Feta (not the Font-En-Tja) music font
 % 
-% (c) 2000 Jan Nieuwenhuizen <janneke@gnu.org>
+% (c)  2000--2003 Jan Nieuwenhuizen <janneke@gnu.org>
 %
 % Voor Cup
 
@@ -59,7 +59,7 @@ def draw_asterisk_bulb (expr w, h, i) =
        endgroup;
        enddef;
 
-fet_beginchar("Pedal asterisk", "*", "pedal-asterisk")
+fet_beginchar("Pedal asterisk", "*", "pedalasterisk")
        set_char_box(0, 7/9pedalh#, 0, pedalh#);
        z0 = (1/2w, h - 1/2w);
        for i = 0 upto 7:
@@ -73,7 +73,7 @@ fet_endchar;
 
 % code := 44;  % - = 45
 
-fet_beginchar("Pedal dash", "-", "pedal-dash")
+fet_beginchar("Pedal dash", "-", "pedaldash")
        set_char_box(0, 3penw#, 0, pedalbh#);
        pickup pencircle scaled penh;
 
@@ -85,7 +85,7 @@ fet_beginchar("Pedal dash", "-", "pedal-dash")
        penstroke z1e{dir 40}..tension 1.2 ..z2e{dir 40};
 fet_endchar;
 
-fet_beginchar("Pedal dot", ".", "pedal-dot")
+fet_beginchar("Pedal dot", ".", "pedaldot")
        set_char_box(0, penw#, 0, penw#);
        pickup pencircle scaled penw;
        draw (1/2penw,1/2penw);
@@ -127,7 +127,7 @@ def draw_pedal_P =
        y11 = 1/5h;
 
        penlabels (1,2,3,4,5,6,7,8,9,10,11);
-       penstroke z1e..tension 2.5 .. z2e.. tension 1.5 .. z3e ..tension 2.5
+       soft_penstroke z1e..tension 2.5 .. z2e.. tension 1.5 .. z3e ..tension 2.5
                ..z4e..tension 1.5
                ..z5e..z6e..tension 1.5
                ..z7e..tension 1.5
@@ -148,7 +148,7 @@ def draw_pedal_P =
        y16r = y2r;
 
        penlabels (12,13,14,15,16);
-       penstroke z12e{down}..tension 1.1
+       soft_penstroke z12e{down}..tension 1.1
                ..z13e{dir (180-pedbeta)}..tension 1.1
                ..z14e{right}..tension 1.1
                ..z15e{dir (180+pedbeta)}..tension 1.1
@@ -177,7 +177,7 @@ def draw_pedal_d =
 
        penlabels (1,2,3,4,5);
 
-       penstroke z1e{dir (-70-90)}..tension 1.1
+       soft_penstroke z1e{dir (-70-90)}..tension 1.1
                ..z2e{down}..tension 1.1
                ..z3e{right}..tension 1.1
                ..z4e{dir (90+10)}..tension 1.1
@@ -217,7 +217,7 @@ def draw_pedal_e =
        y8 = 1/5pedalh;
 
        penlabels (1,2,3,4,5,6,7,8);
-       penstroke z1e{dir pedalpha}
+       soft_penstroke z1e{dir pedalpha}
                ..z2e{dir pedalpha}.. tension 1.1
                %urg
                ..z3e..tension 1.05
@@ -232,19 +232,19 @@ def draw_pedal_e =
 
 % code := 79;  % P = 80
 
-fet_beginchar("Pedal P", "P", "pedal-P")
+fet_beginchar("Pedal P", "P", "pedalP")
        set_char_box(0, 5/6pedalh#, 0, pedalh#);
        draw_pedal_P;
 fet_endchar;
 
 % code := 99;  % d = 100
 
-fet_beginchar("Pedal d", "d", "pedal-d")
+fet_beginchar("Pedal d", "d", "pedald")
        set_char_box(0, 2/3pedalh#, 0, 7/8pedalh#);
        draw_pedal_d;
 fet_endchar;
 
-fet_beginchar("Pedal e", "e", "pedal-e")
+fet_beginchar("Pedal e", "e", "pedale")
        set_char_box(0, 2/5pedalh#, 0, pedalbh#);
        draw_pedal_e;
 fet_endchar;
@@ -254,7 +254,7 @@ fet_endchar;
 % The pre 1.3.59 user-scm kerning sucks, but I'm not struck by
 % the looks of this either.
 %
-fet_beginchar("Pedal Ped", "Ped", "pedal-Ped")
+fet_beginchar("Pedal Ped", "Ped", "pedalPed")
        P_width# = 5/6pedalh#;
        e_width# = 2/5pedalh#;
        d_width# = 2/3pedalh#;