patch::: 0.1.17.jcn2: biems

[lilypond.git] / mf / eindelijk.mf

diff --git a/mf/eindelijk.mf b/mf/eindelijk.mf
index ff2dc89d73c06c15c4511f40e6d634d072c0ff6e..56541e11c315cd04c6698ae68f6e2e9e448ae2c3 100644 (file)
--- a/mf/eindelijk.mf
+++ b/mf/eindelijk.mf
@@ -4,11 +4,9 @@
 define_pixels(interline);
 define_pixels(stafflinethickness);
 % MO*TeX stuff
-nhh#:=interline#;
-nhw#:=6/5*interline#;
-define_pixels(nhh,nhw);
-
-
+% nhh#:=interline#;
+% nhw#:=6/5*interline#;
+% define_pixels(interline,nhw);
 
 med#:=1/33designsize;
 thick#:=1/16designsize;
@@ -32,22 +30,25 @@ stem#:=1/5interline#;
 flare#:=2/3interline#;
 define_pixels(stem,flare);
 
-fet_beginchar(incr code,interline#,4interline#,0,"Quarter rest","4","quartrest");
+fet_beginchar(incr code,interline#,4interline#,0,0,"Quarter rest","4","quartrest");
        alpha:=-50;
        penpos1(rthin,alpha+90);
        penpos2(5/4rthick,alpha);
        penpos4(5/4rthick,alpha);
        penpos3(3/4rthick,alpha);
        penpos6(rthin,alpha-20);
-       penpos7(4/3thick,alpha);
+%      penpos6(rthick,alpha-20);
+%      penpos7(4/3thick,alpha);
+       penpos7(5/8rthick,alpha);
        penpos8(rthin,-10);
-       y1l=7/2nhh; x1l=1/3nhh;
-       z2r=z1+(nhh*right) rotated alpha;
+       y1l=7/2interline; x1l=1/3interline;
+       z2r=z1+(interline*right) rotated alpha;
        z3=1/2[z2,z4];
-       x4=3/8nhh; y4=2nhh;
-       z6=z4l+(5/4nhh*right) rotated alpha;
-       x7l=x4l; y7r=y6l;
-       x8=1/3nhw; y8= nhh-1/4nhh;
+       x4=3/8interline; y4=2interline;
+       z6=z4l+(5/4interline*right) rotated alpha;
+%      x7l=x4l; y7r=y6l;
+       x7l=x4l; y7l=y4r;
+       x8=2/5interline; y8= interline-1/4interline;
        z5=z6r shifted (sqrt(2)*rthin/4,sqrt(2)*rthin/4);
 
        pickup penrazor scaled rthin rotated 45;
@@ -92,7 +93,7 @@ def brush(expr a,w,b,v) =
        endgroup;
        enddef;
 
-fet_beginchar(incr code,4/3interline#,5/3interline#+2stafflinethickness#,0,"8th rest","-2","eighthrest");
+fet_beginchar(incr code,4/3interline#,5/3interline#+2stafflinethickness#,0,0,"8th rest","-2","eighthrest");
        save x,y;
        x1=w-stem/6; y1=h-flare/4;
        crook (z1,w-stem/6);
@@ -104,7 +105,7 @@ fet_beginchar(incr code,4/3interline#,5/3interline#+2stafflinethickness#,0,"8th
 %      currentpicture:=currentpicture shifted (0,interline+2stafflinethickness);
        endchar;
 
-fet_beginchar(incr code,4/3interline#,5/3interline#+interline#+2stafflinethickness#,0,"16th rest","-2","sixteenthrest");
+fet_beginchar(incr code,4/3interline#,5/3interline#+interline#+2stafflinethickness#,0,0,"16th rest","-2","sixteenthrest");
        save x,y;
        x1=w-stem/6; y1=h-flare/4;
        z2-z1=whatever*dir74;
@@ -117,7 +118,7 @@ fet_beginchar(incr code,4/3interline#,5/3interline#+interline#+2stafflinethickne
 %      currentpicture:=currentpicture shifted (0,2stafflinethickness);
        endchar;
 
-fet_beginchar(incr code,4/3interline#,5/3interline#+2interline#+2stafflinethickness#,0,"32th rest","-2","thirtysecondrest");
+fet_beginchar(incr code,4/3interline#,5/3interline#+2interline#+2stafflinethickness#,0,0,"32th rest","-2","thirtysecondrest");
        save x,y;
        x1=w-stem/6; y1=h-flare/4;
        z2-z1=whatever*dir76;
@@ -133,7 +134,7 @@ fet_beginchar(incr code,4/3interline#,5/3interline#+2interline#+2stafflinethickn
 %      currentpicture:=currentpicture shifted (0,2stafflinethickness);
        endchar;
 
-fet_beginchar(incr code,4/3interline#,5/3interline#+3interline#+2stafflinethickness#,0,"64th rest","-2","sixtyfourthrest");
+fet_beginchar(incr code,4/3interline#,5/3interline#+3interline#+2stafflinethickness#,0,0,"64th rest","-2","sixtyfourthrest");
        save x,y;
        x1=w-stem/6; y1=h-flare/4;
        z2-z1=whatever*dir78;
@@ -152,7 +153,7 @@ fet_beginchar(incr code,4/3interline#,5/3interline#+3interline#+2stafflinethickn
 %      currentpicture:=currentpicture shifted (0,2stafflinethickness);
        endchar;
 
-fet_beginchar(incr code,4/3interline#,5/3interline#+4interline#+2stafflinethickness#,0,"128th rest","-2","hundredtwentyeighthrest");
+fet_beginchar(incr code,4/3interline#,5/3interline#+4interline#+2stafflinethickness#,0,0,"128th rest","-2","hundredtwentyeighthrest");
        save x,y;
        x1=w-stem/6; y1=h-flare/4;
        z2-z1=whatever*dir80;