release: 1.5.40

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

diff --git a/mf/feta-toevallig.mf b/mf/feta-toevallig.mf
index ed316e66f07fe1a564e0e7858482136e60aa8ebf..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,23 +70,47 @@ 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;
 
-fet_beginchar( "Natural", "0", "natural")
-       set_char_box(0, 8/12 staff_space#, 1.5 staff_space#, 1.5 staff_space#);
 
+%
+% The stems of the natural are brushed (at least, in Barenreiter SCS )
+%
+%
+
+fet_beginchar( "Natural", "0", "natural")
+       save height;    
        save interbeam, interstem, beamheight, beamwidth, 
-               stemwidth;
+       stemwidth;
+       save top_stem_thick;
+
+       beamheight# = 4.0 stafflinethickness#;
+       height# = 1.5 staff_space#;
+       set_char_box(0, 2/3 staff_space#, height#, height#);
+
+       define_pixels(height);
+       define_blacker_pixels(beamheight);
+
+       % perhaps we should have a lowres fix?
+       top_stem_thick = 1.9 stafflinethickness;
 
-       beamheight = 4.5 stafflinethickness;
        interstem + stemwidth =  w;
        stemwidth = 1.3 stafflinethickness;
 
@@ -96,22 +121,37 @@ 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);
        beamtop = top y2;
-       
+
        pickup pencircle scaled stemwidth;
-       xpart z3 = xpart z1;
-       xpart z4 = xpart z2;
-       top y3 = 1.5 staff_space;
+       x3 := round (xpart z1);
+       x4 := round (xpart z2);
+
+       penpos3(top_stem_thick, 0);
+       penpos5(top_stem_thick, 0);     
+       penpos4(stemwidth, 0);
+       penpos6(stemwidth, 0);  
+       
+       y3 = height;
        top y4 = beamtop;
 
-       draw_gridline((xpart z1, -y4),z3,stemwidth);
-       draw_gridline((xpart z2, -y3),z4,stemwidth);
+       x5 = x4;
+       x6 = x3;
+       bot y6 = -beamtop;
+       y5 = - height;
 
-       labels(1,2,3,4);
+       fill simple_serif (z3l, z3r, -30) -- simple_serif(z6r, z6l, -90) -- cycle;
+       fill simple_serif (z5l, z5r, 30) -- simple_serif(z4r, z4l, 90) -- cycle;
+
+
+
+       penlabels(3,4,5,6);
+
+       labels(1,2);
        fet_endchar;
 
 
@@ -180,12 +220,13 @@ def draw_meta_flat(expr xcenter, w, crook_fatness) =
        x8r =  xpart center - bottom_stem_thick/2;
        penlabels(range 0 thru 10);
 
-       z10 = (bottom_stem_thick/2, -1/5 staff_space) + center;
+       y10 = -1/5 staff_space;
+       z10 = whatever [z2r, z1r];
 
-       unfill z3r{up} .. z4r{right} .. tension .9 
+       unfill z3r .. z4r{right} .. tension .9 
                .. z6r ---
                z7r{left}
-               .. z10 {up} -- cycle;
+               .. z10  -- cycle;
        fill z8r{down}
                .. tension 0.8 ..z8l{(z9-z8)}
                .. z7l