patch::: 0.1.34: vroeg

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

diff --git a/mf/feta-eindelijk.mf b/mf/feta-eindelijk.mf
index 51d35462aa0f01096c8618266ed9c90409371abe..d39637198bc01bcf1b655c3c2e9d2551e965901a 100644 (file)
--- a/mf/feta-eindelijk.mf
+++ b/mf/feta-eindelijk.mf
@@ -23,12 +23,16 @@ enddef;
 %
 save stem, ball_crook_stem, ball_crook_balldiam, flare;
 
-define_pixels(stem,flare);
 % stem#:=1/8*interline#;
 stem# = 1/5interline#;
+% flare# = 2/3interline#;
+flare# = 2/3interline# - 1/8stafflinethickness#;
+
+define_pixels(stem,flare);
+
 ball_crook_stem = stem;
 ball_crook_balldiam =flare;
-flare# = 2/3interline#;
+
 
 save block_rest_y, block_rest_x;
 
@@ -122,7 +126,7 @@ def rest_crook(expr a, w) =
 enddef;
 
 fet_beginchar("8th rest","3","eighthrest");
-       set_char_box(0, 4/3interline#,-interline#, 8/3interline#+2stafflinethickness#);
+       set_char_box(0, 4/3interline#,-interline#, 8/3interline#+3/2stafflinethickness#);
        save x,y, ht;
        ht = h + d;
        x1=w-stem/6; y1=ht-flare/4;
@@ -138,7 +142,8 @@ fet_beginchar("16th rest","4","sixteenthrest");
        save alpha,cw,h,w;
        alpha=74;
        cw#=7/6interline#;
-       h#=5/3interline#+interline#+2stafflinethickness#;
+%      h#=5/3interline#+interline#+2stafflinethickness#;
+       h#=5/3interline#+interline#+3/2stafflinethickness#;
        w#=cw#+(h#-3/2interline#)/tand(alpha);
        set_char_box(0,w#,0,h#);
        define_pixels(cw);
@@ -158,7 +163,7 @@ fet_beginchar("32th rest","5","thirtysecondrest");
        save alpha,cw,h,w;
        alpha=76;
        cw#=7/6interline#;
-       h#=5/3interline#+2interline#+2stafflinethickness#;
+       h#=5/3interline#+2interline#+3/2stafflinethickness#;
        w#=cw#+(h#-3/2interline#)/tand(alpha);
        set_char_box(0,w#,0,h#);
        define_pixels(cw);
@@ -180,7 +185,7 @@ fet_beginchar("64th rest","6","sixtyfourthrest");
        save alpha,cw,h,w;
        alpha=78;
        cw#=7/6interline#;
-       h#=5/3interline#+3interline#+2stafflinethickness#;
+       h#=5/3interline#+3interline#+3/2stafflinethickness#;
        w#=cw#+(h#-3/2interline#)/tand(alpha);
        set_char_box(0,w#,0,h#);
        define_pixels(cw);
@@ -199,13 +204,15 @@ fet_beginchar("64th rest","6","sixtyfourthrest");
        z5-z1=whatever*dir alpha;
        y5=y1-3interline;
        rest_crook (z5,cw);
+       % ugh
+       currentpicture:=currentpicture shifted (0,-interline);
        fet_endchar;
 
 fet_beginchar("128th rest","7","hundredtwentyeighthrest"); 
        save alpha,cw,h,w;
        alpha=78;
        cw#=7/6interline#;
-       h#=5/3interline#+4interline#+2stafflinethickness#;
+       h#=5/3interline#+4interline#+3/2stafflinethickness#;
        w#=cw#+(h#-3/2interline#)/tand(alpha);
        set_char_box(0,w#,0,h#);
        define_pixels(cw);
@@ -227,6 +234,8 @@ fet_beginchar("128th rest","7","hundredtwentyeighthrest");
        z6-z1=whatever*dir alpha;
        y6=y1-4interline;
        rest_crook (z6,cw);
+       % ugh
+       currentpicture:=currentpicture shifted (0,-interline);
        fet_endchar;
 
 endgroup;