Improve overlapping in `petrucci f clef'

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

diff --git a/mf/feta-schrift.mf b/mf/feta-schrift.mf
index 69b7f60742351ccc64ff28cbb27b665937fcd488..7b2cdd932b5e7511cabeb62ba8234ce8d71b4279 100644 (file)
--- a/mf/feta-schrift.mf
+++ b/mf/feta-schrift.mf
@@ -4,7 +4,7 @@
 % source file of the Feta (defintively not an abbreviation for Font-En-Tja)
 % music font
 %
-% (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+% (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 %      Jan Nieuwenhuizen <janneke@gnu.org>
 %
 
@@ -114,7 +114,8 @@ def draw_short_fermata =
 
        pickup pencircle scaled dot_size;
 
-       x1 - 2x6 = x2;
+       x1 - 2 x6 = x2;
+       x6 := vround (x6);
        bot y6 = -d;
 
        drawdot z6;
@@ -327,13 +328,13 @@ fet_beginchar ("Thumb", "thumb");
 fet_endchar;
 
 
-%
-% FIXME: rounded endings
 %
 % `\accent' is TeX reserved.
 %
 
 def draw_accent (expr bottom_left, top_right, thickness, diminish) =
+       save thinning_start;
+       thinning_start = 0.4;
        pickup pencircle scaled thickness;
 
        lft x1 = xpart bottom_left;
@@ -342,7 +343,7 @@ def draw_accent (expr bottom_left, top_right, thickness, diminish) =
        bot y6 = ypart bottom_left;
 
        rt z4 = (xpart top_right, (ypart top_right + ypart bottom_left) / 2);
-       x5 = x3 = (xpart top_right + xpart bottom_left) / 2
+       x5 = x3 = thinning_start [xpart top_right, xpart bottom_left]
                  - linethickness + 0.1 staff_space;
        z3 = whatever [z1, z4];
        z5 = whatever [z6, z4];
@@ -379,7 +380,7 @@ fet_beginchar ("> accent", "sforzato");
                      .5 staff_space#, .5 staff_space#);
 
        draw_accent ((-w, -d), (w, h),
-                    0.05 staff_space + linethickness, 0.6);
+                    0.05 staff_space + linethickness, 0.7);
        penlabels (1, 3, 4, 5, 6);
        labels (7);
 fet_endchar;
@@ -862,7 +863,7 @@ fet_beginchar ("Trill (`tr')", "trill");
        penpos11 (hair_thick, -4);
        z11r = z9r;
 
-       z13l = (x9l + r_width, y11 -  linethickness);
+       z13l = (x9l + r_width, y11 - linethickness);
        penpos13 (r_flare, 180);
 
        z15 = z13r - (bulb_size * r_fatness, 0);
@@ -1132,11 +1133,16 @@ fet_beginchar ("Coda", "coda");
 
        penlabels (1, 2, 3, 4);
 
-       penstroke z1e{up}
-                 .. z2e{right}
-                 .. z3e{down}
-                 .. z4e{left}
-                 .. cycle;
+       fill z1l{up}
+            .. z2l{right}
+            .. z3l{down}
+            .. z4l{left}
+            .. cycle;
+       unfill z1r{up}
+              .. z2r{right}
+              .. z3r{down}
+              .. z4r{left}
+              .. cycle;
 
        draw_gridline ((0, -h), (0, h), thin);
        draw_gridline ((-w, 0), (w, 0), thin);
@@ -1154,11 +1160,11 @@ fet_beginchar ("Varied Coda", "varcoda");
        set_char_box (codawidth# + thick#, codawidth# + thick#,
                      codaheight# + thick#, codaheight# + thick#);
 
-       x1 = -codawidth + .5 thick;
+       x1 = -codawidth + thick - .5 blot_diameter;
        y1 = y2 - thin;
-       x2 = codawidth - .5 thick;
+       x2 = codawidth - thick + .5 blot_diameter;
        y2 = codaheight;
-       draw_block (z1, z2);
+       draw_square_block (z1, z2);
 
        x3 = -codawidth;
        y3 = -codaheight;
@@ -1261,7 +1267,7 @@ def draw_arpeggio =
        save alpha;
        save ne, nw, se, sw;
        save x, y;
-       pair ne,nw,se,sw;
+       pair ne, nw, se, sw;
 
        alpha := -40;
 
@@ -1380,8 +1386,8 @@ def draw_arpeggio_arrow =
        pickup pencircle scaled vround (0.5 rthin);
 
        bot z10 = (0.5 w, 0);
-       lft z11 = (-0.3 w, 0.8 h);
-       rt z12 = (1.3 w, 0.8 h);
+       lft z11 = (0.5 w - hround (0.8 w), 0.8 h);
+       rt z12 = (0.5 w + hround (0.8 w), 0.8 h);
 
        before_left := z1l
                       -- z6{z6 - z1l}