Run `make grand-replace'.

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

diff --git a/mf/feta-schrift.mf b/mf/feta-schrift.mf
index 9048afc5b9c11ca3491f41e970036acf328187aa..6c003c4685ba09ccbe5ca3490dcb167ef40e0759 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--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+% (c) 1997--2008 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;
@@ -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}
@@ -1439,13 +1445,12 @@ fet_endchar;
 input feta-slag;
 
 
-% railroad tracks.
 %
-% I actually have no clue how they should look, so we use a slightly curvy
-% and tapered shape.
+% Railroad tracks.  We define two variants of these -- both as slightly
+% tapered, comma-shaped curves and as two straight parallel slashes.
 %
 
-fet_beginchar ("Caesura", "caesura");
+fet_beginchar ("Curved caesura", "caesura.curved");
        save slant, space_between, clearance;
        save alpha, pat;
        save botthick, topthick;
@@ -1499,4 +1504,57 @@ fet_beginchar ("Caesura", "caesura");
 fet_endchar;
 
 
+fet_beginchar ("Straight caesura", "caesura.straight");
+       save slant, space_between, clearance;
+       save thick, ne, pat;
+       path pat;
+       pair ne;
+
+       slant = 2.0;
+       thick = 2.88 linethickness;
+
+       space_between# = 0.56 staff_space#;
+       clearance# = 0.2 staff_space#;
+
+       set_char_box (0, 2.0 staff_space#,
+                     staff_space# - clearance#, 1.2 staff_space#);
+       define_whole_pixels (space_between);
+
+       x1 = 0;
+       x2 = x1 + thick;
+       y1 = y2 = -d;
+
+       x3 = x4 + thick;
+       x4 = x1 + (h + d) / slant;
+       y3 = y4 = h;
+
+       ne = unitvector (z4 - z1);
+       
+       z1a = z1 + blot_diameter * ne;
+       z1b = z1 + blot_diameter * right;
+       z2a = z2 + blot_diameter * ne;
+       z2b = z2 + blot_diameter * left;
+
+       z3a = z3 - blot_diameter * ne;
+       z3b = z3 + blot_diameter * left;
+       z4a = z4 - blot_diameter * ne;
+       z4b = z4 + blot_diameter * right;
+
+       pat = z1a{-ne}
+             .. {right}z1b
+             -- z2b{right}
+             .. {ne}z2a
+             -- z3a{ne}
+             .. {left}z3b
+             -- z4b{left}
+             .. {-ne}z4a
+             -- cycle;
+
+       fill pat;
+       fill pat shifted (space_between, 0);
+
+       labels(range 1 thru 4);
+       labels(1a, 1b, 2a, 2b, 3a, 3b, 4a, 4b);
+fet_endchar;
+
 fet_endgroup ("scripts");