* mf/feta-schrift.mf ("Trill"): Fix start position of connection

between `t' and `r'.
Unify bulb with the rest of `r' to avoid grazing outlines which
confuses the overlap removal algorithm of fontforge.

diff --git a/ChangeLog b/ChangeLog
index 116b73cb4ac9d48cd8e6bb4bd7e06cc33f3f4506..02dd6ba1ae43ccdbb4476e418b65b078bb16e007 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,11 @@
        * mf/feta-toevallig.mf (draw_meta_sharp): Fix shape to avoid curves
        with inflections for the 1/2 sharp glyph.
 
+       * mf/feta-schrift.mf ("Trill"): Fix start position of connection
+       between `t' and `r'.
+       Unify bulb with the rest of `r' to avoid grazing outlines which
+       confuses the overlap removal algorithm of fontforge.
+
 2005-01-24  Werner Lemberg  <wl@gnu.org>
 
        * mf/feta-autometric.mf (fet_beginfont): Set font_coding_scheme

diff --git a/mf/feta-schrift.mf b/mf/feta-schrift.mf
index 60470d5a9689154923199616fe326a2d197e7c08..92ddf03bf7184cafa8c19acad997f037cf402492 100644 (file)
--- a/mf/feta-schrift.mf
+++ b/mf/feta-schrift.mf
@@ -840,8 +840,8 @@ fet_beginchar ("Trill (`tr')", "trill");
        z6''' = point 2.9 of krul_p;
        penpos6''' (hair_thick, angle (direction 2.9 of krul_p) + 90);
        penpos7 (hair_thick, up_angle + 90);
-       z7' = point 3.3 of krul_p;
-       penpos7' (hair_thick, angle (direction 3.3 of krul_p) + 90);
+       z7' = point 3.2 of krul_p;
+       penpos7' (hair_thick, angle (direction 3.2 of krul_p) + 90);
 
        % the left loop
        penstroke z5'e{direction 1.1 of krul_p}
@@ -878,26 +878,29 @@ fet_beginchar ("Trill (`tr')", "trill");
                 -- z7'r;
        (u, v) = before intersectiontimes after;
 
+       save before_bulb, after_bulb;
+       path before_bulb, after_bulb;
+       before_bulb := z9r{up}
+                      ..tension 0.94.. z13r{down};
+       after_bulb := z13l{up}
+                     ..tension 1.06.. z15{down};
+       (u_bulb, v_bulb) = before_bulb intersectiontimes after_bulb;
+
        % the connection between `t' and `r', the body of the `r',
-       % and part of the bulb
+       % and the bulb
        fill z7'l{z7 - z7'}
             -- z7l
             .. z9l{down}
             -- simple_serif (z10l, z10r, -30)
             -- z9r{up}
-            ..tension 0.94.. z13r{down}
-            -- z15{down}
+            .. subpath (0, u_bulb) of before_bulb
+            .. subpath (v_bulb, infinity) of after_bulb
+            .. z14
             .. z13l{up}
             .. subpath (0, u) of before
             .. subpath (v, infinity) of after
             -- cycle;
 
-       % the rest of the bulb
-       fill z15{up}
-            ..tension 1.06.. z13l{down}
-            .. z14
-            .. cycle;
-
        penlabels (range 1 thru 15);
        penlabels (4', 5', 5'', 5''', 6', 6'', 6''', 7');
 fet_endchar;