* mf/feta-macros.mf (draw_bulb): Improved.

diff --git a/ChangeLog b/ChangeLog
index c2d2e589aed036e9f8a808face7f58a231d6e303..65f026242dddb0648b01bb8b93310303852e6428 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,7 @@
 
        * mf/feta-macros.mf (soft_start_penstroke, soft_end_penstroke): New
        macros.
+       (draw_bulb): Improved.
 
        * mf/feta-pendaal.mf ("Pedal asterisk"): Remove workaround for
        metapost bug.

diff --git a/mf/feta-macros.mf b/mf/feta-macros.mf
index 83ffe0fec3f24d59dafda6289d76c1c5eef8e333..fa236fd01ae965920242a4ee09e49232cd65f916 100644 (file)
--- a/mf/feta-macros.mf
+++ b/mf/feta-macros.mf
@@ -438,7 +438,8 @@ enddef;
 
 def draw_bulb (expr turndir, zl, zr, bulb_rad, radius_factor)=
 begingroup;
-       save rad, ang;
+       save rad, ang, pat;
+       path pat;
 
        clearxy;
 
@@ -455,9 +456,13 @@ begingroup;
 
        labels (0', 1', 2');
 
-       fill zr{dir (ang + turndir * 90)}
-            .. z1'
-            .. z2'
+       pat = zr{dir (ang + turndir * 90)}
+              .. z1'
+              .. z2'
+              .. cycle;
+
+       % avoid grazing outlines
+       fill subpath (0, 2.5) of pat
             -- cycle;
 endgroup
 enddef;