define_pixels(breve_rest_y, breve_rest_x, multi_rest_x, multi_beam_height);
+fet_beginchar("maxima rest", "-3", "maximarest");
+ set_char_box(0, 3 breve_rest_x#, breve_rest_y#, breve_rest_y#);
+ draw_block ((0,-floor (breve_rest_y)), (breve_rest_x, floor (breve_rest_y)));
+ addto currentpicture also currentpicture shifted (2 breve_rest_x, 0);
+fet_endchar;
fet_beginchar("longa rest", "-2", "longarest");
- set_char_box(0, breve_rest_x#, breve_rest_y#, breve_rest_y#);
- draw_block ((0,-floor (breve_rest_y)), (breve_rest_x, floor (breve_rest_y)));
+ set_char_box(0, breve_rest_x#, breve_rest_y#, breve_rest_y#);
+ draw_block ((0,-floor (breve_rest_y)), (breve_rest_x, floor (breve_rest_y)));
fet_endchar;
fet_beginchar("breve rest", "-1", "breverest");
- set_char_box(0, breve_rest_x#, 0, breve_rest_y#);
- draw_block ((0,0), (breve_rest_x, floor (breve_rest_y)));
+ set_char_box(0, breve_rest_x#, 0, breve_rest_y#);
+ draw_block ((0,0), (breve_rest_x, floor (breve_rest_y)));
fet_endchar;
+
tracingvariables := 1;
fet_beginchar("Quarter rest","2","quartrest");
% it is closed, or even a flare.
%
-def normalize (expr p) =
- (p / length (p))
-enddef ;
+% from an email to Rune Zedeler:
+%
+%
+% For example, the 8th rest was vaguely based on a book with trumpet
+% studies by Duhem, and by Baerenreiters cello suites. I included my
+% findings in a comment in the mf file. One of the things that I tried
+% to do was make the rest a little lighter and narrower than the black
+% note head. I think this looks better in polyphonic music, when the
+% rest is below a head from a different voice.
+%
+%
+
+
+def draw_rest_bulb(expr ycenter, ycut, pat, stretch) =
+begingroup;
+ save x,y,pt;
+ z1l = point 0 of pat;
+ z2l = point 1 of pat;
+ z2r = point 3 of pat;
+ z1r = point 4 of pat;
+ z1 = 0.5[z1l,z1r];
+ z2 = 0.5[z2l,z2r];
+ y10 = ycenter;
+ z10 = whatever[z2, z1] + left*bulb_diam*stretch;
+
+
+ z3 = z10+bulb_diam/2.15*dir(-72) ;
+
+
+ x4 = x10+bulb_diam*.62 ;
+ y4 := ceiling (y10 - 2 stafflinethickness + crook_thin);
+
+ z5 = z10 + up*bulb_diam/2 + right*stafflinethickness/3;
+
+
+ z7 = 0.5 [z4, z5] + (0.45 stafflinethickness,0.4 stafflinethickness);
+ x8 = x10-0.4bulb_diam;
+ y8 = y10 + 0.25 stafflinethickness;
+
+ z6 = whatever [z1l, z2l];
+ z6 = z3+whatever * dir(12);
+
+ (pt,whatever) = pat intersectiontimes ((0,ycut)--(w,ycut));
+
+ fill point pt of pat {-direction pt of pat} .. tension 2
+ .. z4{left} .. tension 0.9 .. z7
+ .. z5{left} .. z8 .. z3{right}
+ .. {curl 0.2} z6 {right} .. tension 10 .. {left} point pt of pat -- cycle;
+
+ labels(3, 4, 5, 6, 7, 8, 9, 10);
+
+endgroup;
+enddef;
def draw_eighth_rest =
save width, bulb_diam, thin, thick;
save ycenter, crook_thick, crook_thin;
- save crook_dir, lower_brush;
+ save crook_dir, lower_brush, pat;
pair crook_dir;
-
+ path pat;
width# := 1.0 staff_space#;
bulb_diam# := 0.64 staff_space#;
- thin# := 1.1 stafflinethickness#;
+ thin# := 1.2 stafflinethickness#;
thick# := 2.2 stafflinethickness#;
crook_thick# := 1.8 stafflinethickness#;
crook_thin := 1.3 stafflinethickness;
- lower_brush = 1.5 stafflinethickness;
- ycenter := 0.5 staff_space;
+ lower_brush := 1.5 stafflinethickness;
define_pixels (width, bulb_diam, thin, thick, crook_thick);
set_char_box (0, width#,
1.0 staff_space# + 0.5 stafflinethickness#, 0.5 staff_space# + bulb_diam#/2);
penpos1 (thick, 0);
- penpos2 (thin, 0);
+ penpos2 (thin, 10);
- y1 = ycenter + - 1.5 staff_space ;
-% y9 = y5 - lower_brush;
- y2 = y5 - lower_brush;
-
+ y1 = - staff_space ;
+ y2 = h - lower_brush;
x2r = width;
+ z2 = z1 + whatever*dir(72);
+ z9 = z2 + 0.5 stafflinethickness * dir (angle(z2 - z1)- 10);
+ pat = z1l --- z2l .. z9 .. z2r --- simple_serif (z1r, z1l, -40) .. cycle;
+ fill pat;
+
+
+ draw_rest_bulb(0.5 staff_space , y2r , pat , 1.0);
+ penlabels (1, 2);
+ labels(9);
+
+ % draw_staff (-2,2,0.0);
- y3 - y2l = 0.25 staff_space;
- x2r - x1 = 0.5 staff_space;
+ enddef;
- x3 = x1l ;
+fet_beginchar("Classical quarter rest","2classical","clasquartrest");
+ draw_eighth_rest;
+ currentpicture := currentpicture xscaled -1 shifted (w,0);
+ fet_endchar;
+fet_beginchar("8th rest","3","eighthrest");
+ draw_eighth_rest;
+ fet_endchar;
- x4 = 1.02 bulb_diam ;
- y4 := ceiling (ycenter - 2 stafflinethickness + crook_thin);
+fet_beginchar("16th rest","4","sixteenthrest");
+ save width, bulb_diam, thin, thick;
+ save ycenter, crook_thick, crook_thin;
+ save crook_dir, lower_brush, pat;
+ pair crook_dir;
+ path pat;
- x5 = 0.5 bulb_diam - 0.25 stafflinethickness;
- y5 = ycenter +bulb_diam/2;
-
- z9 = z2 + 0.46 stafflinethickness * dir (angle(z2 - z1)- 10);
+ width# := 1.2 staff_space#;
+ bulb_diam# := 0.64 staff_space#;
+ thin# := 1.2 stafflinethickness#;
+ thick# := 2.2 stafflinethickness#;
+ crook_thick# := 1.8 stafflinethickness#;
+ crook_thin := 1.3 stafflinethickness;
-% z7 = %(bulb_diam/2,ycenter) + 0.23 staff_space * dir ( 35);
- z7 = 0.5 [z4, z5] + (0.45 stafflinethickness,0.4 stafflinethickness);
- z8 = (0, ycenter + 0.5 stafflinethickness);
+ lower_brush := 1.5 stafflinethickness;
- z6 = whatever [z1l, z2l];
- z6 = whatever [z2l, z4] + crook_thick * (crook_dir rotated -90);
- crook_dir = normalize(z2l - z4);
+ define_pixels (width, bulb_diam, thin, thick, crook_thick);
+ set_char_box (0, width#,
+ 2.0 staff_space# + 0.5 stafflinethickness#, 0.5 staff_space# + bulb_diam#/2);
- y3 := ycenter +floor (- bulb_diam/2);
+ penpos1 (thick, 0);
+ penpos2 (thin, 10);
+ y1 = -2 staff_space ;
+ y2 = h - lower_brush;
+ x2r = width;
+ z2 = z1 + whatever*dir(74);
+ z9 = z2 + 0.5 stafflinethickness * dir (angle(z2 - z1)- 10);
+ pat = z1l --- z2l .. z9 .. z2r --- simple_serif (z1r, z1l, -40) .. cycle;
+ fill pat;
+
+ draw_rest_bulb(0.5 staff_space , y2r , pat , 0.98);
+ draw_rest_bulb(-0.5 staff_space , (-0.5+0.2)*staff_space , pat , 1.02);
penlabels (1, 2);
- labels(3, 4, 5, 6, 7, 8, 9);
+ labels(9);
- fill z2r -- z2l -- simple_serif (z1l, z1r, 40) -- cycle;
- fill z2r{z2r-z1r} .. z9 .. z2l{dir(232)} .. tension 2
- .. z4{left} .. tension 0.9 .. z7 %{dir(90 + 25)}
- .. z5{left} .. z8 .. z3{right}
- .. {curl 0.2}z6 -- cycle;
+ % draw_staff (-2,2,0.0);
+ fet_endchar;
+
+fet_beginchar("32th rest","5","thirtysecondrest");
+ save width, bulb_diam, thin, thick;
+ save ycenter, crook_thick, crook_thin;
+ save crook_dir, lower_brush, pat;
+ pair crook_dir;
+ path pat;
+ width# := 1.3 staff_space#;
+ bulb_diam# := 0.64 staff_space#;
+ thin# := 1.2 stafflinethickness#;
+ thick# := 2.2 stafflinethickness#;
+ crook_thick# := 1.8 stafflinethickness#;
+ crook_thin := 1.3 stafflinethickness;
- enddef;
+ lower_brush := 1.5 stafflinethickness;
-fet_beginchar("8th rest","3","eighthrest");
- draw_eighth_rest;
- fet_endchar;
+ define_pixels (width, bulb_diam, thin, thick, crook_thick);
+ set_char_box (0, width#,
+ 2.0 staff_space# + 0.5 stafflinethickness#, 1.5 staff_space# + bulb_diam#/2);
-fet_beginchar("Classical quarter rest","2classical","clasquartrest");
- draw_eighth_rest;
- currentpicture := currentpicture xscaled -1 shifted (w,0);
- fet_endchar;
+ penpos1 (thick, 0);
+ penpos2 (thin, 10);
+ y1 = -2 staff_space ;
+ y2 = h - lower_brush;
+ x2r = width;
+ z2 = z1 + whatever*dir(76);
+ z9 = z2 + 0.5 stafflinethickness * dir (angle(z2 - z1)- 10);
+ pat = z1l --- z2l .. z9 .. z2r --- simple_serif (z1r, z1l, -40) .. cycle;
+ fill pat;
+
-fet_beginchar("16th rest","4","sixteenthrest");
-% draw_staff (-2, 2, 0.0);
- save yshift, ballcorrection;
- ballcorrection = 0.005 staff_space;
-
- yshift# := - 2 staff_space#;
- define_pixels(yshift);
-
- save alpha,cw,h,w, height;
- alpha=74;
- cw#=7/6staff_space#;
- height# = 5/3staff_space#+staff_space#+7/4stafflinethickness#;
- set_char_box(0, cw#+(height#-3/2staff_space#)/tand(alpha),
- -yshift#, height# + yshift#);
-
- define_pixels(cw);
- save x,y;
- x1=w-stem/6;
- y1 = yshift + 2.5 staff_space + flare/4 + ballcorrection;
-
- z2-z1=whatever*dir alpha;
- y2= yshift + stem/2;
- brush(z1,2/3stem,z2,stem);
- rest_crook (z1,cw);
- z3-z1=whatever*dir alpha;
- y3=y1-staff_space;
- rest_crook (z3,cw);
- penlabels(1,2);
- fet_endchar;
+ draw_rest_bulb(1.5 staff_space , y2r , pat , 0.96);
+ draw_rest_bulb(0.5 staff_space , (0.5+0.2)*staff_space , pat , 1.00);
+ draw_rest_bulb(-0.5 staff_space , (-0.5+0.21)*staff_space , pat , 1.04);
+ penlabels (1, 2);
+ labels(9);
-fet_beginchar("32th rest","5","thirtysecondrest");
-% draw_staff (-2, 2, 0.0);
- save yshift, ballcorrection;
- ballcorrection = 0.005 staff_space;
-
- yshift# := -2 staff_space#;
- define_pixels(yshift);
-
- save alpha,cw,h;
- alpha=76;
- cw#=7/6staff_space#;
- h#=5/3staff_space#+2staff_space#+7/4stafflinethickness#;
-
- set_char_box(0, cw#+(h#-3/2staff_space#)/tand(alpha),
- -yshift#,yshift# +h#);
- define_pixels(cw);
- save x,y;
- x1=w-stem/6;
- y1 = yshift + 3.5 staff_space + flare/4 + ballcorrection;
-
- z2-z1=whatever*dir alpha;
- y2=stem/2 + yshift;
- brush(z1,2/3stem,z2,stem);
- rest_crook (z1,cw);
- z3-z1=whatever*dir alpha;
- y3=y1-staff_space;
- rest_crook (z3,cw);
- z4-z1=whatever*dir alpha;
- y4=y1-2staff_space;
- rest_crook (z4,cw);
+ % draw_staff (-2,2,0.0);
fet_endchar;
fet_beginchar("64th rest","6","sixtyfourthrest");
-% draw_staff (-2, 2, 0.0);
- save yshift, ballcorrection;
- ballcorrection = 0.005 staff_space;
-
- yshift# := -3 staff_space#;
- define_pixels(yshift);
-
- save alpha,cw,h,w;
- alpha=78;
- cw#=7/6staff_space#;
- h#=5/3staff_space#+3staff_space#+7/4stafflinethickness#;
- w#=cw#+(h#-3/2staff_space#)/tand(alpha);
- set_char_box(0,w#,-yshift# ,yshift# + h#);
-
- define_pixels(cw);
- save x,y;
- x1=w-stem/6;
-
- y1 = yshift + 4.5 staff_space + flare/4 + ballcorrection;
-
- z2-z1=whatever*dir alpha;
- y2=stem/2 + yshift;
- brush (z1,2/3stem,z2,stem);
- rest_crook (z1,cw);
- z3-z1=whatever*dir alpha;
- y3=y1-staff_space;
- rest_crook (z3,cw);
- z4-z1=whatever*dir alpha;
- y4=y1-2staff_space;
- rest_crook (z4,cw);
- z5-z1=whatever*dir alpha;
- y5=y1-3staff_space;
- rest_crook (z5,cw);
+ save width, bulb_diam, thin, thick;
+ save ycenter, crook_thick, crook_thin;
+ save crook_dir, lower_brush, pat;
+ pair crook_dir;
+ path pat;
+
+ width# := 1.4 staff_space#;
+ bulb_diam# := 0.64 staff_space#;
+ thin# := 1.2 stafflinethickness#;
+ thick# := 2.2 stafflinethickness#;
+ crook_thick# := 1.8 stafflinethickness#;
+ crook_thin := 1.3 stafflinethickness;
+ lower_brush := 1.5 stafflinethickness;
+
+ define_pixels (width, bulb_diam, thin, thick, crook_thick);
+ set_char_box (0, width#,
+ 3.0 staff_space# + 0.5 stafflinethickness#, 1.5 staff_space# + bulb_diam#/2);
+
+ penpos1 (thick, 0);
+ penpos2 (thin, 10);
+
+ y1 = -3 staff_space ;
+ y2 = h - lower_brush;
+ x2r = width;
+ z2 = z1 + whatever*dir(78);
+ z9 = z2 + 0.5 stafflinethickness * dir (angle(z2 - z1)- 10);
+ pat = z1l --- z2l .. z9 .. z2r --- simple_serif (z1r, z1l, -40) .. cycle;
+ fill pat;
+
+
+ draw_rest_bulb(1.5 staff_space , y2r , pat , 0.94);
+ draw_rest_bulb(0.5 staff_space , (0.5+0.20)*staff_space , pat , 0.98);
+ draw_rest_bulb(-0.5 staff_space , (-0.5+0.21)*staff_space , pat , 1.02);
+ draw_rest_bulb(-1.5 staff_space , (-1.5+0.22)*staff_space , pat , 1.06);
+ penlabels (1, 2);
+ labels(9);
+
+ % draw_staff (-2,2,0.0);
fet_endchar;
-fet_beginchar("128th rest","7","hundredtwentyeighthrest");
-% draw_staff (-2, 2, 0.0);
- save yshift, ballcorrection;
- ballcorrection = 0.005 staff_space;
-
- yshift# := -3 staff_space#;
- define_pixels(yshift);
- save alpha,cw,h,w;
- alpha=78;
- cw#=7/6staff_space#;
- h#=5/3staff_space#+4staff_space#+7/4stafflinethickness#;
- w#=cw#+(h#-3/2staff_space#)/tand(alpha);
- set_char_box(0,w#, -yshift#,yshift# + h#);
- define_pixels(cw);
- save x,y;
- x1=w-stem/6;
- y1 = yshift + 5.5 staff_space + flare/4 + ballcorrection;
-
- z2-z1=whatever*dir alpha;
- y2=stem/2 + yshift;
- brush (z1,2/3stem,z2,stem);
- rest_crook (z1,cw);
- z3-z1=whatever*dir alpha;
- y3=y1-staff_space;
- rest_crook (z3,cw);
- z4-z1=whatever*dir alpha;
- y4=y1-2staff_space;
- rest_crook (z4,cw);
- z5-z1=whatever*dir alpha;
- y5=y1-3staff_space;
- rest_crook (z5,cw);
- z6-z1=whatever*dir alpha;
- y6=y1-4staff_space;
- rest_crook (z6,cw);
+fet_beginchar("128th rest","7","hundredtwentyeighthrest");
+ save width, bulb_diam, thin, thick;
+ save ycenter, crook_thick, crook_thin;
+ save crook_dir, lower_brush, pat;
+ pair crook_dir;
+ path pat;
+
+ width# = 1.5 staff_space#;
+ bulb_diam# := 0.64 staff_space#;
+ thin# := 1.2 stafflinethickness#;
+ thick# := 2.2 stafflinethickness#;
+ crook_thick# := 1.8 stafflinethickness#;
+ crook_thin := 1.3 stafflinethickness;
+
+ lower_brush := 1.5 stafflinethickness;
+
+ define_pixels (width, bulb_diam, thin, thick, crook_thick);
+ set_char_box (0, width#,
+ 3.0 staff_space# + 0.5 stafflinethickness#, 2.5 staff_space# + bulb_diam#/2);
+
+ penpos1 (thick, 0);
+ penpos2 (thin, 10);
+
+ y1 = -3 staff_space ;
+ y2 = h - lower_brush;
+ x2r = width;
+ z2 = z1 + whatever*dir(80);
+ z9 = z2 + 0.5 stafflinethickness * dir (angle(z2 - z1)- 10);
+ pat = z1l --- z2l .. z9 .. z2r --- simple_serif (z1r, z1l, -40) .. cycle;
+ fill pat;
+
+ draw_rest_bulb(2.5 staff_space , y2r , pat , 0.92);
+ draw_rest_bulb(1.5 staff_space , (1.5+0.20)*staff_space , pat , 0.96);
+ draw_rest_bulb(0.5 staff_space , (0.5+0.21)*staff_space , pat , 1.0);
+ draw_rest_bulb(-0.5 staff_space , (-0.5+0.22)*staff_space , pat , 1.04);
+ draw_rest_bulb(-1.5 staff_space , (-1.5+0.23)*staff_space , pat , 1.08);
+ penlabels (1, 2);
+ labels(9);
+
+ % draw_staff (-2,2,0.0);
fet_endchar;
neomens_half_block_rest;
fet_endchar;
-neomensrestsize# = .8staff_space#;
+neomensrestsize# = 0.8 staff_space#;
fet_beginchar("Neo-mensural 4th rest","2neo_mensural","neomenssemiminimarest")
set_char_box(0,neomensrestsize#,0,neomensrestsize#);
projects / lilypond.git / blobdiff