From: fred Date: Sun, 24 Mar 2002 20:00:27 +0000 (+0000) Subject: lilypond-0.1.23 X-Git-Tag: release/1.5.59~3725 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=1a9b2b8aef59f250e025fc6a2bb3963e5b91935e;p=lilypond.git lilypond-0.1.23 --- diff --git a/mf/feta-eindelijk.mf b/mf/feta-eindelijk.mf index 5e9c67b8c6..b3cadcab90 100644 --- a/mf/feta-eindelijk.mf +++ b/mf/feta-eindelijk.mf @@ -14,7 +14,7 @@ define_blacker_pixels(med,thick); pen med_pen; med_pen:= pencircle scaled med; -rthin:=1/8interline; +rthin:=1/8*interline; % rthick:=2rthin; rthick:=2thick+rthin; @@ -27,7 +27,7 @@ enddef; save stem, ball_crook_stem, ball_crook_balldiam, flare; define_pixels(stem,flare); -% stem#:=1/8interline#; +% stem#:=1/8*interline#; stem# = 1/5interline#; ball_crook_stem = stem; ball_crook_balldiam =flare; @@ -91,40 +91,46 @@ fet_beginchar("half rest (outside staff)", "1o", "outsidehalfrest"); draw (-block_rest_y,0) .. (block_rest_x + block_rest_y,0); fet_endchar; -def rest_crook(expr a, w) = - balled_crook(a, w, ball_crook_balldiam, ball_crook_stem) -enddef; - fet_beginchar("Quarter rest","2","quartrest"); + save alpha; alpha:=-50; + save ne,nw,se,sw; pair ne,nw,se,sw; + se=dir alpha; nw=dir (alpha+180); + ne=dir (alpha+90); sw=dir (alpha-90); penpos1(rthin,alpha+90); penpos2(5/4rthick,alpha); penpos4(5/4rthick,alpha); + penpos5(rthin,alpha+90); penpos3(3/4rthick,alpha); - penpos6(rthin,alpha-20); -% penpos6(rthick,alpha-20); -% penpos7(4/3thick,alpha); - penpos7(5/8rthick,alpha); - penpos8(rthin,-10); +% penpos6(5/8rthick,alpha); + penpos6(2/3rthick,alpha); + penpos7(1/2rthin,alpha+90); + + z10=z2l+1/2rthin*sw; +% z11=z4l+1/2rthin*sw; + z11=z4l+1/2rthin*sw+1/2rthin*se; + z12=z4r+1/2rthin*ne; +% z13=z2r+1/2rthin*ne; + z13=z2r+1/2rthin*ne+1/2rthin*nw; + y1l=7/2interline; x1l=1/3interline; - z2r=z1+(interline*right) rotated alpha; + z2r=z1+interline*se; z3=1/2[z2,z4]; x4=3/8interline; y4=2interline; - z6=z4l+(5/4interline*right) rotated alpha; -% x7l=x4l; y7r=y6l; - x7l=x4l; y7l=y4r; - x8=2/5interline; y8= 3/4 interline; - z5=z6r shifted (sqrt(2)*rthin/4,sqrt(2)*rthin/4); - - pickup penrazor scaled rthin rotated 45; - draw z1--z2r; - draw z4l--z5; - penstroke z2e..z3e..z4e; - penstroke z6e..tension1.4..z7e..tension1.4..z8e; - penlabels(1,2,3,4,5,6,7,8); - set_char_box(0, interline#, -3/4 interline#, 7/2 interline#); + z5=z4l+1.3interline*se; + x6l=x4l; y6l=y4r; + x7=2/5interline; y7=3/4interline; + fill z1l{se}..{se}z10..z3l..z11{se}..{se}z5l..z5r{nw}..{nw}z12..z3r..z13{nw}..{nw}z1r.. cycle; + fill z5r{nw}..tension1.4..z6l..tension1.4..{se}z7l..z7r{nw}..tension1.4..z6r..tension1.4..{se}z5l..cycle; + penlabels(1,2,3,4,5,6,7); + penlabels(10,11,12,13); + set_char_box(0, 27/25interline#, -3/4 interline#, 18/5interline#); fet_endchar; +def rest_crook(expr a, w) = + balled_crook(a, w, ball_crook_balldiam, ball_crook_stem) +enddef; + fet_beginchar("8th rest","3","eighthrest"); set_char_box(0, 4/3interline#,-interline#, 8/3interline#+2stafflinethickness#); save x,y, ht; @@ -133,84 +139,108 @@ fet_beginchar("8th rest","3","eighthrest"); rest_crook (z1,w-stem/6); z2-z1=whatever*dir70; y2=stem/2; - brush (z1,stem/3,z2,stem); + brush(z1,2/3stem,z2,stem); % ugh currentpicture:=currentpicture shifted (0,interline); -% currentpicture:=currentpicture shifted (0,interline+2stafflinethickness); fet_endchar; +def tand(expr alpha) = + (sind alpha/cosd alpha); + enddef; + fet_beginchar("16th rest","4","sixteenthrest"); - set_char_box(0,4/3interline#,0, 5/3interline#+interline#+2stafflinethickness#); + save alpha,cw,h,w; + alpha=74; + cw#=7/6interline#; + h#=5/3interline#+interline#+2stafflinethickness#; + w#=cw#+(h#-3/2interline#)/tand(alpha); + set_char_box(0,w#,0,h#); + define_pixels(cw); save x,y; x1=w-stem/6; y1=h-flare/4; - z2-z1=whatever*dir74; + z2-z1=whatever*dir alpha; y2=stem/2; - brush (z1,stem/2,z2,stem); - rest_crook (z1,7/8w); - z3-z1=whatever*dir74; + brush(z1,2/3stem,z2,stem); + rest_crook (z1,cw); + z3-z1=whatever*dir alpha; y3=y1-interline; - rest_crook (z3,7/8w); -% currentpicture:=currentpicture shifted (0,2stafflinethickness); + rest_crook (z3,cw); + penlabels(1,2); fet_endchar; fet_beginchar("32th rest","5","thirtysecondrest"); - set_char_box(0,4/3interline#,0, 5/3interline#+2interline#+2stafflinethickness#); + save alpha,cw,h,w; + alpha=76; + cw#=7/6interline#; + h#=5/3interline#+2interline#+2stafflinethickness#; + w#=cw#+(h#-3/2interline#)/tand(alpha); + set_char_box(0,w#,0,h#); + define_pixels(cw); save x,y; x1=w-stem/6; y1=h-flare/4; - z2-z1=whatever*dir76; + z2-z1=whatever*dir alpha; y2=stem/2; - brush (z1,stem/2,z2,stem); - rest_crook (z1,7/8w); - z3-z1=whatever*dir76; + brush(z1,2/3stem,z2,stem); + rest_crook (z1,cw); + z3-z1=whatever*dir alpha; y3=y1-interline; - rest_crook (z3,7/8w); - z4-z1=whatever*dir76; + rest_crook (z3,cw); + z4-z1=whatever*dir alpha; y4=y1-2interline; - rest_crook (z4,7/8w); -% currentpicture:=currentpicture shifted (0,2stafflinethickness); + rest_crook (z4,cw); fet_endchar; fet_beginchar("64th rest","6","sixtyfourthrest"); - set_char_box(0,4/3interline#,0, 5/3interline#+3interline#+2stafflinethickness#); + save alpha,cw,h,w; + alpha=78; + cw#=7/6interline#; + h#=5/3interline#+3interline#+2stafflinethickness#; + w#=cw#+(h#-3/2interline#)/tand(alpha); + set_char_box(0,w#,0,h#); + define_pixels(cw); save x,y; x1=w-stem/6; y1=h-flare/4; - z2-z1=whatever*dir78; + z2-z1=whatever*dir alpha; y2=stem/2; - brush (z1,stem/2,z2,stem); - rest_crook (z1,7/8w); - z3-z1=whatever*dir78; + brush (z1,2/3stem,z2,stem); + rest_crook (z1,cw); + z3-z1=whatever*dir alpha; y3=y1-interline; - rest_crook (z3,7/8w); - z4-z1=whatever*dir78; + rest_crook (z3,cw); + z4-z1=whatever*dir alpha; y4=y1-2interline; - rest_crook (z4,7/8w); - z5-z1=whatever*dir78; + rest_crook (z4,cw); + z5-z1=whatever*dir alpha; y5=y1-3interline; - rest_crook (z5,7/8w); -% currentpicture:=currentpicture shifted (0,2stafflinethickness); + rest_crook (z5,cw); fet_endchar; fet_beginchar("128th rest","7","hundredtwentyeighthrest"); - set_char_box(0, 4/3interline#, 0, 5/3interline#+4interline#+2stafflinethickness#); + save alpha,cw,h,w; + alpha=78; + cw#=7/6interline#; + h#=5/3interline#+4interline#+2stafflinethickness#; + w#=cw#+(h#-3/2interline#)/tand(alpha); + set_char_box(0,w#,0,h#); + define_pixels(cw); save x,y; x1=w-stem/6; y1=h-flare/4; - z2-z1=whatever*dir80; + z2-z1=whatever*dir alpha; y2=stem/2; - brush (z1,stem/2,z2,stem); - rest_crook (z1,7/8w); - z3-z1=whatever*dir80; + brush (z1,2/3stem,z2,stem); + rest_crook (z1,cw); + z3-z1=whatever*dir alpha; y3=y1-interline; - rest_crook (z3,7/8w); - z4-z1=whatever*dir80; + rest_crook (z3,cw); + z4-z1=whatever*dir alpha; y4=y1-2interline; - rest_crook (z4,7/8w); - z5-z1=whatever*dir80; + rest_crook (z4,cw); + z5-z1=whatever*dir alpha; y5=y1-3interline; - rest_crook (z5,7/8w); - z6-z1=whatever*dir80; + rest_crook (z5,cw); + z6-z1=whatever*dir alpha; y6=y1-4interline; - rest_crook (z6,7/8w); -% currentpicture:=currentpicture shifted (0,2stafflinethickness); + rest_crook (z6,cw); fet_endchar; endgroup;