use skylines in VerticalAlignment.

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

diff --git a/mf/feta-schrift.mf b/mf/feta-schrift.mf
index 987f5d52b61ef90cddd9d74896f80e49faf7bbe3..207b94b379291b8bc7f211f402acd5274d61ceb6 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,7 @@ def draw_short_fermata =
 
        pickup pencircle scaled dot_size;
 
-       x1 - 2x6 = x2;
+       x1 - 2 x6 = x2;
        bot y6 = -d;
 
        drawdot z6;
@@ -327,13 +327,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 +342,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 +379,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;
@@ -460,12 +460,12 @@ def draw_portato =
 enddef;
 
 
-fet_beginchar ("portato/tenuto with staccato", "dportato");
+fet_beginchar ("portato/tenuto with staccato", "uportato");
        draw_portato;
 fet_endchar;
 
 
-fet_beginchar ("portato/tenuto with staccato", "uportato");
+fet_beginchar ("portato/tenuto with staccato", "dportato");
        draw_portato;
        y_mirror_char
 fet_endchar;
@@ -822,7 +822,6 @@ fet_beginchar ("Trill (`tr')", "trill");
             .. z4r{down}
             .. z3r{left}
             ..tension (1.5 + .7 slant).. z2r{up}
-            .. z1r
             -- cycle;
 
        z5' = point 1.1 of krul_p;
@@ -863,7 +862,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);
@@ -888,8 +887,8 @@ fet_beginchar ("Trill (`tr')", "trill");
 
        % the connection between `t' and `r', the body of the `r',
        % and the bulb
-       fill z7'l{z7 - z7'}
-            -- z7l
+       fill z7'l
+            -- z7l{z7 - z7'}
             .. z9l{down}
             -- simple_serif (z10l, z10r, -30)
             -- z9r{up}
@@ -1155,15 +1154,15 @@ fet_beginchar ("Varied Coda", "varcoda");
        set_char_box (codawidth# + thick#, codawidth# + thick#,
                      codaheight# + thick#, codaheight# + thick#);
 
-       x1 = -codawidth;
+       x1 = -codawidth + .5 thick;
        y1 = y2 - thin;
-       x2 = codawidth;
+       x2 = codawidth - .5 thick;
        y2 = codaheight;
        draw_block (z1, z2);
 
-       x3 = x1;
+       x3 = -codawidth;
        y3 = -codaheight;
-       x4 = x1 + thick;
+       x4 = x3 + thick;
        y4 = y2;
        draw_block (z3, z4);
 
@@ -1262,7 +1261,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;