Merge http://git.sv.gnu.org/r/lilypond

[lilypond.git] / mf / parmesan-timesig.mf

diff --git a/mf/parmesan-timesig.mf b/mf/parmesan-timesig.mf
index 264a487a10ac569769df89ceae76e9969fc9e6b2..68036229a943f9e80c61eca8eb80978e0c1ca9c4 100644 (file)
--- a/mf/parmesan-timesig.mf
+++ b/mf/parmesan-timesig.mf
@@ -53,8 +53,6 @@ def draw_nail (expr bottom_left, top_right) =
        x6 = x4;
        y5 = y6 = y2 - 2 mensural_Cthickness;
 
-       pickup pencircle scaled round;
-
        fill bot z1{right}
             .. rt z1{up}
             -- rt z5{up}
@@ -251,21 +249,20 @@ def neomensural_timesig (expr verbose_name, internal_name,
                  .5 (neomensural_Cdiameter# + neomensural_Cthickness#));
 
                if slashed:
+                       pickup penrazor scaled neomensural_Cthickness;
+
+                       save t;
+                       t := neomensural_Cthickness / 2;
+
                        if (full_circle or dotted):
-                               draw_block ((-neomensural_Cthickness / 2,
-                                            -d + neomensural_Cthickness / 2),
-                                           (neomensural_Cthickness / 2,
-                                            h - neomensural_Cthickness / 2));
+                               draw (0, -d + t)
+                                    -- (0, h - t);
                        elseif reverse_circle:
-                               draw_block ((0,
-                                            -d + neomensural_Cthickness / 2),
-                                           (neomensural_Cthickness,
-                                            h - neomensural_Cthickness / 2));
+                               draw (t, -d + t)
+                                    -- (t, h - t);
                        else:
-                               draw_block ((-neomensural_Cthickness,
-                                            -d + neomensural_Cthickness / 2),
-                                           (0,
-                                            h - neomensural_Cthickness / 2));
+                               draw (-t, -d + t)
+                                    -- (-t, h - t);
                        fi;
                fi;