Run `make grand-replace'.

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

diff --git a/mf/feta-pendaal.mf b/mf/feta-pendaal.mf
index c4e4865dfd51e51a1342773fdeaff34b1e4ae7cd..202a96dea43dc5c013d4dc38a0e1867cb747fb6a 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--2004 Jan Nieuwenhuizen <janneke@gnu.org>
+% (c) 2000--2008 Jan Nieuwenhuizen <janneke@gnu.org>
 %
 % Voor Cup
 
@@ -44,9 +44,9 @@ fet_beginchar ("Pedal asterisk", "*");
 
        pickup pencircle scaled penh;
 
-       penpos 1 (bulb, 180);
-       penpos 2 (bulb, 0);
-       penpos 3 (thin, 0);
+       penpos1 (bulb, 180);
+       penpos2 (bulb, 0);
+       penpos3 (thin, 0);
 
        z1 = z0 + (0, radius);
        z2 = z1;
@@ -78,19 +78,7 @@ fet_beginchar ("Pedal asterisk", "*");
 
        pat := pat
               .. cycle;
-
-       % Uh, oh, there is a bug in metapost 0.641 which makes mf2pt1.mp's
-       % redefinion of `fill' fail for this particular path, using a
-       % wrong path orientation.
-       %
-       % Note that using `unfill' here makes the direct mpost output
-       % wrong, but the `mf2pt1' script fixes it for the Type 1 output.
-
-       if known bp_per_pixel:
-               unfill pat;
-       else:
-               fill pat;
-       fi;
+       fill pat;
 
        pickup pencircle scaled (7/8 inner_r);
 
@@ -100,7 +88,7 @@ fet_endchar;
 
 %% ugh. rounded corners!
 
-fet_beginchar ("Pedal dash", "-");
+fet_beginchar ("Pedal dash", "M");
        save dash_thickness;
 
        dash_thickness# := penw#;
@@ -201,10 +189,10 @@ begingroup;
                  ..tension 1.5.. z3e
                  ..tension 2.5.. {dir (225)}z4e;
 
-       soft_penstroke z8'e{right}
-                      ..tension 1.5.. z9e{dir (-pedalpha)}
-                      .. z10e
-                      ..tension 2.5.. z11e;
+       soft_end_penstroke z8'e{right}
+                          ..tension 1.5.. z9e{dir (-pedalpha)}
+                          .. z10e
+                          ..tension 2.5.. z11e;
 
        fill z4r{dir (225)}
             ..tension 1.5.. z5r{left}
@@ -248,11 +236,11 @@ begingroup;
                penlabels (1, 2, 3, 4, 5);
        fi;
 
-       soft_penstroke z1e{dir (-10)}
-                      ..tension 1.1.. z2e{dir (-90 + 10)}
-                      ..tension 1.1.. z3e{left}
-                      ..tension 1.1.. z4e{up}
-                      ..tension 1.1.. z5e{dir (-70 + 90)};
+       soft_start_penstroke z1e{dir (-10)}
+                            ..tension 1.1.. z2e{dir (-90 + 10)}
+                            ..tension 1.1.. z3e{left}
+                            ..tension 1.1.. z4e{up}
+                            ..tension 1.1.. z5e{dir (-70 + 90)};
 endgroup;
 enddef;