release: 1.5.40

[lilypond.git] / mf / feta-toevallig.mf

diff --git a/mf/feta-toevallig.mf b/mf/feta-toevallig.mf
index accc2310ac09de794ffc8c38c09e6d03b7660176..4d0150d02a40992ca400f223029cf37846881244 100644 (file)
--- a/mf/feta-toevallig.mf
+++ b/mf/feta-toevallig.mf
@@ -31,14 +31,15 @@ fet_beginchar("Sharp" , "1", "sharp");
                1.5 staff_space#);
 
        save interbeam, interstem, beamheight, beamwidth, 
-               stemwidth;
+               stemwidth, beamslope;
 
        interbeam := 1.05 staff_space;
        interstem := 7/16 ;
        beamheight := 4 stafflinethickness;
        beamwidth := w;
-       stemwidth := 1.3 stafflinethickness;
-       roundness := 2blot_diameter;
+       stemwidth := 1.5 stafflinethickness;
+       roundness := 2 blot_diameter;
+
        pair center;
        center := (.5 w, 0);
        
@@ -69,14 +70,23 @@ fet_beginchar("Sharp" , "1", "sharp");
 
        pickup pencircle scaled stemwidth;
        x3 = x4 = xpart center;
-       bot y3 = -1.5 staff_space + ypart center;
-       top y4 = 1.5 staff_space + ypart center;
 
        numeric xs;
        xs := interstem* beamwidth / 2;
+
+       (bot y3) + -xs * beamslope = -1.5 staff_space + ypart center;
+       top y4  + xs * beamslope = 1.5 staff_space + ypart center;
+
        draw_gridline (z3-(xs,xs* beamslope),z4-(xs,xs*beamslope),stemwidth);
        addto currentpicture also currentpicture rotated 180 shifted (w,0);
        labels(1,2,3,4);
+
+
+% to check that it doesn't overshoot staffline.
+%
+%      pickup pencircle scaled stafflinethickness;
+%      draw (0, 1.5 staff_space ) ..  (1 staff_space, 1.5 staff_space);
+
        fet_endchar;
 
 
@@ -111,7 +121,7 @@ fet_beginchar( "Natural", "0", "natural")
 
        pickup penrazor scaled beamheight rotated 90;
        top y2 = staff_space - 3/2 stafflinethickness ;
-       slope =  stafflinethickness / interstem;
+       slope = stafflinethickness / interstem;
        
        draw z1 .. z2;
        draw (xpart z1, -y2) .. (xpart z2, -y1);