[mf] Improve and simplify Kievan outlines.

Some fixes change outlines to ensure proper overlap handling with FontForge
(this doesn't alter the final shape, however).

One change (in `barline.kievan') slightly changes the shape to avoid gracing
intersections.

diff --git a/mf/parmesan-accidentals.mf b/mf/parmesan-accidentals.mf
index 956fffcbaa58b4b28d5e2eac9c431ffc5c00febd..7ea7f14f68d8800602a6aae067514d2d10f30c9b 100644 (file)
--- a/mf/parmesan-accidentals.mf
+++ b/mf/parmesan-accidentals.mf
@@ -400,7 +400,7 @@ fet_endchar;
 %%%%%%%%%%%%%%%
 
 
-fet_beginchar ("kievan sharp", "kievan1");
+fet_beginchar ("Kievan sharp", "kievan1");
        % This draws the sharp.
        % It never occurs in Synodal music and
        % can only be found in some early manuscripts.
@@ -440,7 +440,7 @@ fet_beginchar ("kievan sharp", "kievan1");
 fet_endchar;
 
 
-fet_beginchar ("kievan flat", "kievanM1");
+fet_beginchar ("Kievan flat", "kievanM1");
        % This draws the flat sign.
        % In Synodal music, the flat only occurs on the high B
        % but it may be used elsewhere in early manuscripts.
@@ -469,21 +469,16 @@ fet_beginchar ("kievan flat", "kievanM1");
             .. z3
             .. z4{down}
             .. z5
-            & z5 -- cycle;
-       fill z5 -- z6
-            & z6 -- z7
-            & z7 -- z11
-            & z11 -- z12
-            & z12 -- z13
-            & z13 -- cycle;
-       fill z7{up}
+            -- z6
+            -- z7{up}
             .. z8
             .. {dir 23}z9
             & z9
             .. z10{dir -135}
             .. {down}z11
-            & z11
-            -- cycle;
+            -- z12
+            -- z13
+            & cycle;
 
        set_char_box (0, 1.0 staff_space#,
                      1.0 staff_space#, 1.8 staff_space#);

diff --git a/mf/parmesan-clefs.mf b/mf/parmesan-clefs.mf
index 1da30906bb4a457f8ab7cc6188bbaac7f4eb589f..34a09cf20bc40d7b0def688c2af66fc54731362f 100644 (file)
--- a/mf/parmesan-clefs.mf
+++ b/mf/parmesan-clefs.mf
@@ -1727,28 +1727,33 @@ def draw_kievan_do_clef =
        fill z1
             .. z2{down}
             .. z3
-            & z3 -- z4
-            & z4 -- z5
-            & z5 .. {up}z6
-            & z6{left} .. z7
-            & z7 .. z8{up} .. z9
-            & z9 .. {right}z10
-            & z10 .. z11
-            & z11 -- cycle;
+            -- z4
+            -- z5
+            .. {up}z6
+            & z6{left}
+            .. z7
+            & z7
+            .. z8{up}
+            .. z9
+            & z9
+            .. {right}z10
+            & z10
+            .. z11
+            -- cycle;
 
        set_char_box (0, 1.5 staff_space#,
                      2.25 staff_space#, 0.55 staff_space#);
 enddef;
 
 
-fet_beginchar ("kievan tsefaut clef", "kievan.do");
+fet_beginchar ("Kievan tsefaut clef", "kievan.do");
        % This draws the Tse-Fa-Ut clef; it is a variant alto clef that
        % always occurs on the third line of the staff.
        draw_kievan_do_clef;
 fet_endchar;
 
 
-fet_beginchar ("mensural c clef", "kievan.do_change");
+fet_beginchar ("Kievan tsefaut clef", "kievan.do_change");
        % This is the same thing as a do clef?
        draw_kievan_do_clef;
 fet_endchar;

diff --git a/mf/parmesan-dots.mf b/mf/parmesan-dots.mf
index 4323623ffb02afe7a630edc7fee81ed3bfa3eddb..4e77d9c465c64d3b67e123ca41b738fc71b4e716 100644 (file)
--- a/mf/parmesan-dots.mf
+++ b/mf/parmesan-dots.mf
@@ -48,7 +48,7 @@ kievan_dot_diam# := staff_space# - stafflinethickness#;
 define_whole_pixels (kievan_dot_diam);
 
 
-fet_beginchar ("kievan augmentation dot", "dotkievan");
+fet_beginchar ("Kievan augmentation dot", "dotkievan");
        % parameters for superellipse are right, top, left, bottom
        fill superellipse ((kievan_dot_diam, 0),
                           (kievan_dot_diam / 2, kievan_dot_diam / 2),

diff --git a/mf/parmesan-noteheads.mf b/mf/parmesan-noteheads.mf
index cadcbceb2d41175eaab1c50ec5901daf8a53ca53..afc713f3523e89e60c4c66f1233e013fe1e9a941 100644 (file)
--- a/mf/parmesan-noteheads.mf
+++ b/mf/parmesan-noteheads.mf
@@ -1790,7 +1790,7 @@ fet_endchar;
 %%%%%%%%%%%%
 
 
-fet_beginchar ("kievan final note", "sM2kievan");
+fet_beginchar ("Kievan final note", "sM2kievan");
        % This draws the Final Note.
        % It is the last note of a piece of music
        % equivalent to having a whole note and fermata in CMN.
@@ -1807,8 +1807,9 @@ fet_beginchar ("kievan final note", "sM2kievan");
        path p;
        p := (0, blank_space)
             -- (0, staff_space - blank_space)
-            -- (note_width, staff_space - blank_space)
-            -- (note_width, blank_space)
+            -- (note_width + 0.5 vert_bar_thickness,
+                staff_space - blank_space)
+            -- (note_width + 0.5 vert_bar_thickness, blank_space)
             -- cycle;
        fill p;
        fill p reflectedabout ((0, 0), (1, 0));
@@ -1823,7 +1824,7 @@ fet_beginchar ("kievan final note", "sM2kievan");
 fet_endchar;
 
 
-fet_beginchar ("kievan recitative mark", "sM1kievan");
+fet_beginchar ("Kievan recitative mark", "sM1kievan");
        inner_width# := 4 * staff_space#;
        vert_bar_thickness# := 2 * stafflinethickness#;
        vert_bar_height# := staff_space# - stafflinethickness#;
@@ -1833,11 +1834,11 @@ fet_beginchar ("kievan recitative mark", "sM1kievan");
        define_blacker_pixels (vert_bar_thickness);
 
        path p;
-       p := (3 * vert_bar_thickness, blank_space)
-            -- (3 * vert_bar_thickness, vert_bar_height - blank_space)
-            -- (3 * vert_bar_thickness + inner_width,
+       p := (2.5 * vert_bar_thickness, blank_space)
+            -- (2.5 * vert_bar_thickness, vert_bar_height - blank_space)
+            -- (3.5 * vert_bar_thickness + inner_width,
                 vert_bar_height - blank_space)
-            -- (3 * vert_bar_thickness + inner_width, blank_space)
+            -- (3.5 * vert_bar_thickness + inner_width, blank_space)
             -- cycle;
        fill p;
        fill p reflectedabout ((0, 0), (1, 0));
@@ -1896,11 +1897,17 @@ fet_beginchar ("Kievan quarter note down", "d2kievan");
        fill z1{dir 8.6}
             .. z2
             .. z3
-            & z3 .. z4 .. z5
-            & z5 -- z6
-            & z6 .. z7 .. z8
-            & z8{left} .. z9
-            & z9 .. z10 ... {dir 75}cycle;
+            & z3
+            .. z4
+            .. z5
+            -- z6
+            .. z7
+            .. z8
+            & z8{left}
+            .. z9
+            & z9
+            .. z10
+            ... {dir 75}cycle;
 
        set_char_box (0, 1.02 staff_space#,
                      2.50 staff_space#, 0.40 staff_space#);
@@ -1922,11 +1929,17 @@ fet_beginchar ("Kievan quarter note up", "u2kievan");
        fill z1{dir -6.9}
             .. z2
             .. z3
-            & z3 .. z4 .. z5
-            & z5 -- z6
-            & z6 .. z7 .. z8
-            & z8{left} .. z9
-            & z9 .. z10 ... {dir -76.9}cycle;
+            & z3
+            .. z4
+            .. z5
+            -- z6
+            .. z7
+            .. z8
+            & z8{left}
+            .. z9
+            & z9
+            .. z10
+            ... {dir -76.9}cycle;
 
        set_char_box (0, 1.02 staff_space#,
                      0.40 staff_space#, 2.6 staff_space#);
@@ -1952,13 +1965,17 @@ fet_beginchar ("Kievan half note (line position)", "s1kievan");
        fill z1
             .. z2{down}
             .. z3
-            & z3 -- z4
-            & z4 .. z5{up} .. z6
-            & z6 .. z7{left} .. z8
-            & z8 -- z9
-            & z9 .. {right}z10
-            & z10{up} .. z11
-            & z11 -- cycle;
+            -- z4
+            .. z5{up}
+            .. z6
+            & z6
+            .. z7{left}
+            .. z8
+            -- z9
+            .. {right}z10
+            & z10{up}
+            .. z11
+            -- cycle;
 
        set_char_box (0, 1.06 staff_space#,
                      1.6 staff_space#, 1.0 staff_space#);
@@ -1985,13 +2002,18 @@ fet_beginchar ("Kievan half note (space position)", "sr1kievan");
        fill z1
             .. z2{down}
             .. z3
-            & z3 -- z4
-            & z4 .. z5{up} .. z6
-            & z6 .. z7{left} .. z8
-            & z8 -- z9
-            & z9 .. z10{right}
-            & z10 .. z11 .. z12
-            & z12 -- cycle;
+            -- z4
+            .. z5{up}
+            .. z6
+            & z6
+            .. z7{left}
+            .. z8
+            -- z9
+            .. z10{right}
+            & z10
+            .. z11
+            .. z12
+            -- cycle;
 
        set_char_box (0, 1.1 staff_space#,
                      1.0 staff_space#, 1.4 staff_space#);
@@ -2018,15 +2040,22 @@ fet_beginchar ("Kievan eighth note (down)", "d3kievan");
 
        fill z1{right}
             .. z2
-            & z2 -- z3
-            & z3{right} .. z4
-            & z4 .. z5{down} .. z6
-            & z6 -- z7
-            & z7 .. z8{up} .. z9
-            & z9 .. {left}z10
-            & z10{dir 78.7} .. z11
-            & z11 .. {left}z12
-            & z12{dir 78.7} .. {dir 62}cycle;
+            -- z3{right}
+            .. z4
+            & z4
+            .. z5{down}
+            .. z6
+            -- z7
+            .. z8{up}
+            .. z9
+            & z9
+            .. {left}z10
+            & z10{dir 78.7}
+            .. z11
+            & z11
+            .. {left}z12
+            & z12{dir 78.7}
+            .. {dir 62}cycle;
 
        set_char_box (0, 1.25 staff_space#,
                      3.0 staff_space#, 0.5 staff_space#);
@@ -2052,11 +2081,17 @@ fet_beginchar ("Kievan eighth note (up)", "u3kievan");
        fill z1{dir -6.9}
             .. z2
             .. z3
-            & z3 .. z4 .. z5
-            & z5 -- z6
-            & z6 .. z7 .. z8
-            & z8{left} .. z9
-            & z9 .. z10 ... {dir -76.9}cycle;
+            & z3
+            .. z4
+            .. z5
+            -- z6
+            .. z7
+            .. z8
+            & z8{left}
+            .. z9
+            & z9
+            .. z10
+            ... {dir -76.9}cycle;
 
        % now, draw the stem
        z11 = (0.033 staff_space, 2.823 staff_space);
@@ -2069,9 +2104,12 @@ fet_beginchar ("Kievan eighth note (up)", "u3kievan");
 
        fill z11
             -- z12
-            & z12 .. z13{down} .. z14
-            & z14 -- z15
-            & z15 .. z16 .. z17{up} .. cycle;
+            .. z13{down}
+            .. z14
+            -- z15
+            .. z16
+            .. z17{up}
+            .. cycle;
 
        set_char_box (0, 1.0 staff_space#,
                      0.4 staff_space#, 2.9 staff_space#);

diff --git a/mf/parmesan-scripts.mf b/mf/parmesan-scripts.mf
index d5b1f6de2e3cf7e8636a800299ae919bbe40b51c..284aa45f5c163b7bebcf22ee621c2adebbf7142c 100644 (file)
--- a/mf/parmesan-scripts.mf
+++ b/mf/parmesan-scripts.mf
@@ -271,7 +271,6 @@ fet_beginchar ("Kievan end of piece (slash)", "barline.kievan");
        z7 - z6 = (.5 staff_space, -.2 staff_space);
        .4 [z6, z7] = 7/6 [z2, z1];
 
-       pickup pencircle scaled blot_diameter;
        penpos1 (hair, 0);
        penpos2 (hair, 0);
        penpos3 (hair, -90);
@@ -285,7 +284,9 @@ fet_beginchar ("Kievan end of piece (slash)", "barline.kievan");
        penstroke z1e
                  -- z2e;
 
-       fill simple_serif (z3l, z3r, 90){1.5 right}
+       fill z3l
+            -- z2l{z2 - z1}
+            .. z3r{right}
             .. z4r
             .. z5r
             .. z6r
@@ -293,7 +294,7 @@ fet_beginchar ("Kievan end of piece (slash)", "barline.kievan");
             .. {left}z6l
             .. z5l
             .. z4l
-            .. cycle;
+            .. {left}cycle;
 fet_endchar;
 
 fet_endgroup ("scripts");