Various feta glyph improvements.

. Fix slope of slashes for sharp signs to make them really
  parallel.  This was especially noticeable in feta11.

. Fix shape of Longa notehead with up-stem.

. Other minor improvements, mainly for mf2pt1; for example, replace
  cyclic penstrokes with a fill/unfill combination.

diff --git a/mf/feta-accordion.mf b/mf/feta-accordion.mf
index dcceba181fb3741320d2541d167995d30264f40a..3b1a2cf00e3a8831a50a39eaef91e19ab8a626c1 100644 (file)
--- a/mf/feta-accordion.mf
+++ b/mf/feta-accordion.mf
@@ -47,11 +47,16 @@ fet_beginchar ("accDiscant", "accDiscant")
        % mf doesn't handle pixel dropouts in outline objects, so we use
        % `draw' if not called by mpost
        if known miterlimit:
-               penstroke z1e
-                         .. z2e
-                         .. z3e
-                         .. z4e
-                         .. cycle;
+               fill z1r
+                    .. z2r
+                    .. z3r
+                    .. z4r
+                    .. cycle;
+               unfill z1l
+                      .. z2l
+                      .. z3l
+                      .. z4l
+                      .. cycle;
        else:
                pickup pencircle xscaled accreg_linethickness yscaled lt;
                draw z1
@@ -125,11 +130,16 @@ fet_beginchar ("accFreebase", "accFreebase")
        % mf doesn't handle pixel dropouts in outline objects, so we use
        % `draw' if not called by mpost
        if known miterlimit:
-               penstroke z1e
-                         .. z2e
-                         .. z3e
-                         .. z4e
-                         .. cycle;
+               fill z1r
+                    .. z2r
+                    .. z3r
+                    .. z4r
+                    .. cycle;
+               unfill z1l
+                      .. z2l
+                      .. z3l
+                      .. z4l
+                      .. cycle;
        else:
                pickup pencircle xscaled accreg_linethickness yscaled lt;
                draw z1
@@ -178,11 +188,16 @@ fet_beginchar ("accStdbase", "accStdbase")
        % mf doesn't handle pixel dropouts in outline objects, so we use
        % `draw' if not called by mpost
        if known miterlimit:
-               penstroke z1e
-                         .. z2e
-                         .. z3e
-                         .. z4e
-                         .. cycle;
+               fill z1r
+                    .. z2r
+                    .. z3r
+                    .. z4r
+                    .. cycle;
+               unfill z1l
+                      .. z2l
+                      .. z3l
+                      .. z4l
+                      .. cycle;
        else:
                pickup pencircle xscaled accreg_linethickness yscaled lt;
                draw z1
@@ -366,7 +381,7 @@ fet_beginchar ("accOldEE", "accOldEE")
 
        pickup pencircle scaled (lr + blot_diameter);
 
-       for pp := 0 step 45 until 180:
+       for pp := 0 step 45 until 135:
                drawdot z2 rotated pp;
                drawdot z3 rotated pp;
 
@@ -402,11 +417,16 @@ fet_beginchar ("accOldEE", "accOldEE")
        % mf doesn't handle pixel dropouts in outline objects, so we use
        % `draw' if not called by mpost
        if known miterlimit:
-               penstroke z10e
-                         .. z11e
-                         .. z12e
-                         .. z13e
-                         .. cycle;
+               fill z10r
+                    .. z11r
+                    .. z12r
+                    .. z13r
+                    .. cycle;
+               unfill z10l
+                      .. z11l
+                      .. z12l
+                      .. z13l
+                      .. cycle;
        else:
                pickup pencircle xscaled accreg_linethickness yscaled lt;
                draw z10

diff --git a/mf/feta-bolletjes.mf b/mf/feta-bolletjes.mf
index b45222e4cc6d06f6b2d00a79bcd7cafcb95fcc97..7be4addb5f29a88888f4c0dbab8067b8670f9e58 100644 (file)
--- a/mf/feta-bolletjes.mf
+++ b/mf/feta-bolletjes.mf
@@ -163,7 +163,7 @@ def draw_longa (expr up) =
 
        if up:
                bot y1 = -d;
-               y2 = h;
+               top y2 = h;
                rt x1 - fudge = 0;
                x1 = x2;
 
@@ -185,6 +185,8 @@ def draw_longa (expr up) =
 
        draw_gridline (z1, z2, stemthick);
        draw_gridline (z3, z4, stemthick);
+
+       labels (1, 2, 3, 4);
 enddef;
 
 

diff --git a/mf/feta-schrift.mf b/mf/feta-schrift.mf
index 207b94b379291b8bc7f211f402acd5274d61ceb6..ed0f359a89ba676f1efada167cd5a38ef5485b79 100644 (file)
--- a/mf/feta-schrift.mf
+++ b/mf/feta-schrift.mf
@@ -1132,11 +1132,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 +1159,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;

diff --git a/mf/feta-toevallig.mf b/mf/feta-toevallig.mf
index 0008ffa04ceb037926ee7c1737eb2dfc8644d500..53564e07f505a97bcc104ebef3138868347ce7ad 100644 (file)
--- a/mf/feta-toevallig.mf
+++ b/mf/feta-toevallig.mf
@@ -73,7 +73,7 @@ def draw_meta_sharp (expr width, offset) =
        pickup pencircle scaled 2 blot_diameter;
 
        rt x2 - lft x1 = beamwidth;
-       y2 - y1 = sharp_beamheight;
+       z2 = z1 + whatever * (beamwidth, sharp_beamheight);
        .5 [z1, z3] = (.5 w, offset);
        x3 = x2;
        top y2 - bot y3 = sharp_beamheight;
@@ -828,8 +828,8 @@ fet_beginchar ("Double Flat", "flatflat");
                      (left_wid + right_wid - overlap) * staff_space#,
                      .6 staff_space#, 1.9 staff_space#);
        draw_meta_flat (0, left_wid * staff_space, 1/3 staff_space);
-       draw_meta_flat (round ((left_wid - overlap) * staff_space),
-                       right_wid * staff_space, 0.33 staff_space);
+       draw_meta_flat (hround ((left_wid - overlap) * staff_space),
+                       right_wid * staff_space, 1/3 staff_space);
 fet_endchar;
 
 
@@ -844,8 +844,8 @@ fet_beginchar ("3/4 Flat", "flatflat.slash");
                      (left_wid + right_wid - overlap) * staff_space#,
                      .6 staff_space#, 1.9 staff_space#);
        draw_meta_flat (0, left_wid * staff_space, 1/3 staff_space);
-       draw_meta_flat (round ((left_wid - overlap) * staff_space),
-                       right_wid * staff_space, 0.33 staff_space);
+       draw_meta_flat (hround ((left_wid - overlap) * staff_space),
+                       right_wid * staff_space, 1/3 staff_space);
 
        %% maybe we should clip part of the stems?
        %% or make the 1st flat smaller?