% part of LilyPond's pretty-but-neat music font
%
% source file of the Feta (not the Font-En-Tja) music font
-%
-% (c) 1997--2000 Jan Nieuwenhuizen <janneke@gnu.org>
-
-fet_begingroup("rests");
-
-begingroup
-
-thick#:=1/16designsize;
-define_blacker_pixels(thick);
-
-rthin:=1/8*staff_space;
-% rthick:=2rthin;
-rthick:=2thick+rthin;
-
-def shift_pic (expr pone, ptwo) =
- currentpicture:=currentpicture shifted (round(pone),round(ptwo))
-enddef;
-
-% stuff for 8th,16th etc rests
%
-save stem, ball_crook_stem, ball_crook_balldiam, flare;
-
-% stem#:=1/8*staff_space#;
-stem# = 1/5staff_space#;
-% flare# = 2/3staff_space#;
-flare# = 2/3staff_space# - 1/8stafflinethickness#;
-
-define_pixels(stem,flare);
-
-ball_crook_stem = stem;
-ball_crook_balldiam =flare;
+% (c) 1997--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+fet_begingroup ("rests");
save block_rest_y, block_rest_x;
+save breve_rest_y, breve_rest_x;
+breve_rest_y# = staff_space#;
+breve_rest_x# = 3/5 staff_space#;
block_rest_y# = 5/8 staff_space#;
block_rest_x# = 3/2 staff_space#;
-define_pixels(block_rest_y, block_rest_x);
+define_whole_pixels (block_rest_y, block_rest_x);
+define_whole_pixels (breve_rest_y, breve_rest_x);
+
def block_rest =
- draw_block ((0,0), (block_rest_x, block_rest_y));
- enddef;
+ draw_block ((0, 0), (block_rest_x, block_rest_y));
+enddef;
+
+
+fet_beginchar ("whole rest", "0");
+ set_char_box (0, block_rest_x#,
+ block_rest_y#, 0);
-fet_beginchar( "whole rest", "0", "wholerest");
- set_char_box(0, block_rest_x#,
- block_rest_y#, 0);
block_rest;
- currentpicture := currentpicture shifted (0,- block_rest_y);
+ currentpicture := currentpicture
+ shifted (0, -block_rest_y + feta_space_shift);
+
+ draw_staff (-2, 2, 0);
fet_endchar;
-fet_beginchar("half rest", "1", "halfrest");
- set_char_box(0, block_rest_x#, 0, block_rest_y#);
+
+fet_beginchar ("half rest", "1");
+ set_char_box (0, block_rest_x#, 0, block_rest_y#);
+
block_rest;
+
+ draw_staff (-2, 2, 0);
fet_endchar;
%
% should use ledgerline thickness?
%
-fet_beginchar( "whole rest (outside staff)", "0o", "outsidewholerest");
- set_char_box(0, block_rest_x#,
- block_rest_y#, ledgerlinethickness#/2);
+fet_beginchar ("whole rest (outside staff)", "0o");
+ set_char_box (0, block_rest_x#,
+ block_rest_y#, ledgerlinethickness# / 2);
+
block_rest;
- currentpicture := currentpicture shifted (0, - block_rest_y);
+ currentpicture := currentpicture shifted (0, -block_rest_y);
+
pickup pencircle scaled ledgerlinethickness;
y5 = y6 = 0;
- lft x5 = - b - block_rest_y;
+ lft x5 = -b - block_rest_y;
rt x6 = w + block_rest_y;
- draw z5 .. z6;
+ draw_gridline (z5, z6, ledgerlinethickness_rounded);
+
+ draw_staff (-2, 2, -3);
fet_endchar;
-fet_beginchar("half rest (outside staff)", "1o", "outsidehalfrest");
- set_char_box(0, block_rest_x#,
- ledgerlinethickness#/2, block_rest_y#);
+
+fet_beginchar ("half rest (outside staff)", "1o");
+ set_char_box (0, block_rest_x#,
+ ledgerlinethickness# / 2, block_rest_y#);
+
block_rest;
+
pickup pencircle scaled ledgerlinethickness;
+
y5 = y6 = 0;
- lft x5 = - b - block_rest_y ;
+ lft x5 = -b - block_rest_y;
rt x6 = w + block_rest_y;
- draw z5 .. z6;
+
+ draw_gridline (z5, z6, ledgerlinethickness_rounded);
+
+ draw_staff (-2, 2, 3);
fet_endchar;
-save breve_rest_y, breve_rest_x;
+fet_beginchar ("maxima rest", "M3");
+ set_char_box (0, 3 breve_rest_x#, breve_rest_y#, breve_rest_y#);
-breve_rest_y# = staff_space#;
-breve_rest_x# = 3/5 staff_space#;
-multi_rest_x# = 4 staff_space#;
-multi_beam_height# = 1/3 staff_space#;
+ draw_block ((0, -breve_rest_y + feta_shift),
+ (breve_rest_x, breve_rest_y));
-define_pixels(breve_rest_y, breve_rest_x, multi_rest_x, multi_beam_height);
+ addto currentpicture also currentpicture shifted (2 breve_rest_x, 0);
-fet_beginchar("breve rest", "-1", "breverest");
- set_char_box(0, breve_rest_x#, 0, breve_rest_y#);
- draw_block ((0,0), (breve_rest_x, breve_rest_y));
+ draw_staff (-2, 2, 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,-breve_rest_y), (breve_rest_x, breve_rest_y));
+
+fet_beginchar ("longa rest", "M2");
+ set_char_box (0, breve_rest_x#, breve_rest_y#, breve_rest_y#);
+
+ draw_block ((0, -breve_rest_y + feta_shift),
+ (breve_rest_x, breve_rest_y));
+
+ draw_staff (-2, 2, 0);
fet_endchar;
-tracingvariables := 1;
-
-fet_beginchar("multi rest", "-4", "multirest");
- set_char_box(multi_rest_x#, multi_rest_x#,
- breve_rest_y#, breve_rest_y#);
- draw_block ((- b, - multi_beam_height),
- (w, multi_beam_height));
- draw_block ((- b,-breve_rest_y),
- (rthin - b, breve_rest_y));
- draw_block ((w - rthin,-breve_rest_y),
- (w, breve_rest_y));
+
+fet_beginchar ("breve rest", "M1");
+ set_char_box (0, breve_rest_x#, 0, breve_rest_y#);
+
+ draw_block ((0, 0), (breve_rest_x, breve_rest_y));
+
+ draw_staff (-2, 2, 0);
fet_endchar;
-fet_beginchar("Quarter rest","2","quartrest");
-% draw_staff (-2, 2, 0.0);
+
+fet_beginchar ("Quarter rest", "2");
save alpha, yshift, height;
- alpha:=-50;
- yshift# = -1.25 staff_space#;
- height# = 2.8125 staff_space#;
+ save xcenter;
+
+ yshift# := -1.25 staff_space#;
+ height# := 2.8125 staff_space#;
define_pixels (yshift, height);
-
- set_char_box(0, 27/25staff_space#,
- -yshift#,
- yshift# + height#);
-
- 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(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;
+ alpha := -50;
+ thick := 1/4 staff_space;
+ rthin := 1.25 linethickness;
+ xcenter := -0.1 staff_space;
+ rthick := 2 thick + rthin;
+
+ set_char_box (0, 0.95 staff_space#, -yshift#, yshift# + height#);
+
+ save ne, nw, se, sw;
+ pair ne, nw, se, sw;
+
+ se = dir alpha;
+ ne = dir (alpha + 90);
+ nw = dir (alpha + 180);
+ sw = dir (alpha + 270);
+
+ penpos1 (rthin, alpha + 90);
+ penpos2 (5/4 rthick, alpha);
+ penpos4 (5/4 rthick, alpha);
+ penpos5 (rthin, alpha + 90);
+ penpos3 (3/4 rthick, alpha);
+% penpos6 (5/8 rthick, alpha);
+ penpos6 (2/3 rthick, alpha);
+ penpos7 (1/2 rthin, alpha + 90);
+
+ z10 = z2l + 1/2 rthin * sw;
+% z11 = z4l + 1/2 rthin * sw;
+ z11 = z4l + 1/2 rthin * sw + 1/2 rthin * se;
+ z12 = z4r + 1/2 rthin * ne;
+% z13 = z2r + 1/2 rthin * ne;
+ z13 = z2r + 1/2 rthin * ne + 1/2 rthin * nw;
y1r = h;
- x1l=1/3staff_space;
- z2r=z1+staff_space*se;
- z3=1/2[z2,z4];
- x4=3/8staff_space;
- y4= 0;
- z5=z4l+1.3staff_space*se;
- x6l=x4l;
- y6l=y4r;
- x7=2/5staff_space;
- y7= -d;
-
- 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);
-
-% 3/4 staff_space# + yshift#,
-% 18/5staff_space# + yshift#)
-
- fet_endchar;
-
-def rest_crook(expr a, w) =
- balled_crook(a, w, ball_crook_balldiam, ball_crook_stem)
-enddef;
+ x1l = xcenter + 1/3 staff_space;
+ z2r = z1 + staff_space * se;
+ z3 = 1/2 [z2, z4];
+ x4 = xcenter + 3/8 staff_space;
+ y4 = 0;
+ y4l := vround y4l;
+ z5 = round (z4l + 1.3 staff_space * se) + feta_offset;
+ x6l = x4l;
+ y6l = vround y4r;
+ x6r := hround x6r + xpart feta_offset;
+ y6r := vround y6r + ypart feta_offset;
+ x7 = hround (xcenter + 2/5 staff_space) + xpart feta_offset;
+ y7 = -d;
+
+ save before, after;
+ path before, after;
+ before = z11{se}
+ .. {se}z5l;
+ after = z5r{nw}
+ ..tension1.4.. z6l;
+ (u, v) = before intersectiontimes after;
+
+ fill z1l{se}
+ .. {se}z10
+ .. z3l
+ .. subpath (0, u) of before
+ .. subpath (v, infinity) of after
+ ..tension1.4.. {se}z7l
+ .. z7r{nw}
+ ..tension1.4.. z6r
+ ..tension1.4.. {se}z5l
+ .. z5r{nw}
+ .. {nw}z12
+ .. z3r
+ .. z13{nw}
+ .. {nw}z1r
+ .. cycle;
+
+ penlabels (1, 2, 3, 4, 5, 6, 7);
+ penlabels (10, 11, 12, 13);
+
+ draw_staff (-2, 2, 0);
+fet_endchar;
-fet_beginchar("8th rest","3","eighthrest");
-% draw_staff (-2, 2, 0.0);
- save yshift, ballcorrection;
- ballcorrection = 0.005 staff_space;
-
- yshift# := -1.0 staff_space#;
- define_pixels(yshift);
-
-
- set_char_box(0, 4/3staff_space#, -yshift#, yshift# +
- 5/3staff_space#+7/4stafflinethickness#);
-
- %
- % The curve is like a valley causing less space between
- % the curve and the lower staff line. Correct for this.
- %
- save x,y;
-
- x1=w-stem/6;
-
- y1 = yshift + 1.5 staff_space + flare/4 + ballcorrection;
- rest_crook (z1,w-stem/6);
- z2-z1=whatever*dir70;
- y2= yshift + stem/2;
- brush(z1,2/3stem,z2,stem);
-
- fet_endchar;
-
-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;
-
-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);
- 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);
-
- 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_endchar;
+%
+% Notes about 8th rest:
+%
+% * 8th rest should be no wider than the black note head
+%
+% * The inside corner of the horizontal portion is usually a little blotted.
+%
+% * The top of the crook chops off the vertical brush
+%
+% * The crook widens a little
+%
+% * The bottom of the brush is slightly flat, as it has to align with
+% stafflines if it is inside the staff.
+%
+% * The top of the brush usually is a little lower than the top of bulb.
+%
+% * The bulb can vary. Sometimes it is open (like in the clefs). Sometimes
+% it is closed, or even a flare.
+%
+
+% 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.
+%
+
+save bulb_diam, thin, thick;
+
+bulb_diam# := 0.64 staff_space#;
+thin# := 1.4 linethickness# - 0.02 staff_space#;
+thick# := 2.2 linethickness#;
+
+crook_thin := 0.5 linethickness + 0.08 staff_space;
+lower_brush := 1.5 linethickness;
+
+define_pixels (bulb_diam);
+define_whole_blacker_pixels (thin, thick);
+
+
+%
+% PAT is a compact way to pass the brush shape to the routine.
+%
+
+def draw_rest_bulb (expr ycenter, ycut, pat, stretch, show_labels) =
+begingroup;
+ save x, y, pt, res;
+
+ 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;
+
+ % this enforces similar bulb shapes for lower resolutions
+ x10 := hround x10;
+
+ z3 = z10 + bulb_diam / 2.15 * dir (-72);
+ y3 := hround y3;
+ z5 = z10 + up * bulb_diam / 2 + right * linethickness / 3;
+ y5 := hround y5;
+
+ z7 = 0.5 [z4, z5] + crook_thin * (0.45, 0.4) / 1.3;
+ x8 = hround (x10 - 0.4 bulb_diam);
+ y8 = y10 + 0.25 linethickness;
+
+ z6 = whatever [z1l, z2l];
+ z6 = z3 + whatever * dir (12);
+
+ z4 = z3 + whatever * (z6 - z3)
+ + 1.1 crook_thin * (unitvector (z6 - z3) rotated 90);
+ x4 = x10 + bulb_diam * .62;
+ y4 := vround y4;
+
+ (pt, whatever) = pat intersectiontimes ((0, ycut) -- (w, ycut));
+
+ path res;
+ res = 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;
+
+ if show_labels = 1:
+ labels (3, 4, 5, 6, 7, 8, 10);
+ fi;
+
+res
endgroup;
+enddef;
+
+
+def draw_eighth_rest (expr show_labels) =
+ save ycenter;
+ save pat, bulb;
+ path pat, bulb;
+
+ set_char_box (0, 1.0 staff_space#,
+ 1.0 staff_space# + 0.5 linethickness#,
+ 0.5 staff_space# + bulb_diam# / 2);
+
+ penpos1 (thick, 0);
+ penpos2 (thin, 10);
+
+ y1 = -staff_space_rounded;
+ y2 = h - vround lower_brush;
+ x2r = w;
+ z2 = z1 + whatever * dir (72);
+ z9 = z2 + 0.5 linethickness * dir (angle (z2 - z1) - 10);
+ y9 := vround y9;
+
+ x1l := hround x1l;
+ x1r := hround x1r;
+ x1 := .5 [x1l, x1r];
+
+ if show_labels = 1:
+ penlabels (1, 2);
+ labels (9);
+ fi;
+
+ pat = z1l
+ -- z2l
+ .. z9
+ .. z2r
+ -- z1r
+ .. cycle;
+ bulb = draw_rest_bulb (0.5 staff_space, y2r, pat, 1.0, show_labels);
+
+ fill simple_serif (z1l, z1r, 40)
+ -- z2r
+ .. z9
+ .. bulb
+ -- z1l
+ .. cycle;
+
+ draw_staff (-2, 2, 0);
+enddef;
+
+
+fet_beginchar ("Classical quarter rest", "2classical");
+ draw_eighth_rest (0);
+ currentpicture := currentpicture xscaled -1 shifted (w, 0);
+fet_endchar;
+
+
+fet_beginchar ("8th rest", "3");
+ draw_eighth_rest (1);
+fet_endchar;
+
+
+%
+% TODO: the X dimensions of the rests are fucked up:
+% they can collide with augmentation dots.
+%
+
+fet_beginchar ("16th rest", "4");
+ save ycenter;
+ save pat, bulb_a, bulb_b;
+ path pat, bulb_a, bulb_b;
+
+ set_char_box (0, 1.2 staff_space#,
+ 2.0 staff_space# + 0.5 linethickness#,
+ 0.5 staff_space# + bulb_diam# / 2);
+
+ penpos1 (thick, 0);
+ penpos2 (thin, 10);
+
+ y1 = -2 staff_space_rounded;
+ y2 = h - vround lower_brush;
+ x2r = w;
+ z2 = z1 + whatever * dir (74);
+ z9 = z2 + 0.5 linethickness * dir (angle (z2 - z1) - 10);
+ y9 := vround y9;
+
+ x1l := hround x1l;
+ x1r := hround x1r;
+ x1 := .5 [x1l, x1r];
+
+ pat = z1l
+ -- z2l
+ .. z9
+ .. z2r
+ -- z1r
+ .. cycle;
+ bulb_a = draw_rest_bulb (.5 staff_space,
+ y2r, pat, 0.98, 1);
+ bulb_b = draw_rest_bulb (.5 staff_space - staff_space_rounded,
+ hround ((-0.5 + 0.2) * staff_space),
+ pat, 1.02, 1);
+
+ fill simple_serif (z1l, z1r, 40)
+ -- z2r
+ .. z9
+ .. bulb_a
+ -- bulb_b
+ -- z1l
+ .. cycle;
+
+ penlabels (1, 2);
+ labels (9);
+
+ draw_staff (-2, 2, 0);
+fet_endchar;
+
+
+fet_beginchar ("32th rest", "5");
+ save ycenter;
+ save pat, bulb_a, bulb_b, bulb_c;
+ path pat, bulb_a, bulb_b, bulb_c;
+
+ set_char_box (0, 1.3 staff_space#,
+ 2.0 staff_space# + 0.5 linethickness#,
+ 1.5 staff_space# + bulb_diam# / 2);
+
+ penpos1 (thick, 0);
+ penpos2 (thin, 10);
+
+ y1 = -2 staff_space_rounded;
+ y2 = h - vround lower_brush;
+ x2r = w;
+ z2 = z1 + whatever * dir (76);
+ z9 = z2 + 0.5 linethickness * dir (angle (z2 - z1) - 10);
+ y9 := vround y9;
+
+ x1l := hround x1l;
+ x1r := hround x1r;
+ x1 := .5 [x1l, x1r];
+
+ pat = z1l
+ -- z2l
+ .. z9
+ .. z2r
+ -- z1r
+ .. cycle;
+ bulb_a = draw_rest_bulb (.5 staff_space + staff_space_rounded,
+ y2r, pat, 0.96, 1);
+ bulb_b = draw_rest_bulb (.5 staff_space,
+ hround ((0.5 + 0.2) * staff_space),
+ pat, 1.00, 1);
+ bulb_c = draw_rest_bulb (.5 staff_space - staff_space_rounded,
+ hround ((-0.5 + 0.21) * staff_space),
+ pat, 1.04, 1);
+
+ fill simple_serif (z1l, z1r, 40)
+ -- z2r
+ .. z9
+ .. bulb_a
+ -- bulb_b
+ -- bulb_c
+ -- z1l
+ .. cycle;
+
+ penlabels (1, 2);
+ labels (9);
+
+ draw_staff (-2, 2, 0);
+fet_endchar;
+
+
+fet_beginchar ("64th rest", "6");
+ save ycenter;
+ save pat, bulb_a, bulb_b, bulb_c, bulb_d;
+ path pat, bulb_a, bulb_b, bulb_c, bulb_d;
+
+ set_char_box (0, 1.4 staff_space#,
+ 3.0 staff_space# + 0.5 linethickness#,
+ 1.5 staff_space# + bulb_diam# / 2);
+
+ penpos1 (thick, 0);
+ penpos2 (thin, 10);
+
+ y1 = -3 staff_space_rounded;
+ y2 = h - vround lower_brush;
+ x2r = w;
+ z2 = z1 + whatever * dir (78);
+ z9 = z2 + 0.5 linethickness * dir (angle (z2 - z1) - 10);
+ y9 := vround y9;
+
+ x1l := hround x1l;
+ x1r := hround x1r;
+ x1 := .5 [x1l, x1r];
+
+ pat = z1l
+ -- z2l
+ .. z9
+ .. z2r
+ -- z1r
+ .. cycle;
+ bulb_a = draw_rest_bulb (.5 staff_space + staff_space_rounded,
+ y2r, pat, 0.94, 1);
+ bulb_b = draw_rest_bulb (.5 staff_space,
+ hround ((0.5 + 0.20) * staff_space),
+ pat, 0.98, 1);
+ bulb_c = draw_rest_bulb (.5 staff_space - staff_space_rounded,
+ hround ((-0.5 + 0.21) * staff_space),
+ pat, 1.02, 1);
+ bulb_d = draw_rest_bulb (.5 staff_space - 2 staff_space_rounded,
+ hround ((-1.5 + 0.22) * staff_space),
+ pat, 1.06, 1);
+
+ fill simple_serif (z1l, z1r, 40)
+ -- z2r
+ .. z9
+ .. bulb_a
+ -- bulb_b
+ -- bulb_c
+ -- bulb_d
+ -- z1l
+ .. cycle;
+
+ penlabels (1, 2);
+ labels (9);
+
+ draw_staff (-2, 2, 0);
+fet_endchar;
+
+
+fet_beginchar ("128th rest", "7");
+ save ycenter;
+ save pat, bulb_a, bulb_b, bulb_c, bulb_d, bulb_e;
+ path pat, bulb_a, bulb_b, bulb_c, bulb_d, bulb_e;
+
+ set_char_box (0, 1.5 staff_space#,
+ 3.0 staff_space# + 0.5 linethickness#,
+ 2.5 staff_space# + bulb_diam# / 2);
+
+ penpos1 (thick, 0);
+ penpos2 (thin, 10);
+
+ y1 = -3 staff_space_rounded;
+ y2 = h - vround lower_brush;
+ x2r = w;
+ z2 = z1 + whatever * dir (80);
+ z9 = z2 + 0.5 linethickness * dir (angle (z2 - z1)- 10);
+ y9 := vround y9;
+
+ x1l := hround x1l;
+ x1r := hround x1r;
+ x1 := .5 [x1l, x1r];
+
+ pat = z1l
+ -- z2l
+ .. z9
+ .. z2r
+ -- z1r
+ .. cycle;
+ bulb_a = draw_rest_bulb (.5 staff_space + 2 staff_space_rounded,
+ y2r, pat, 0.92, 1);
+ bulb_b = draw_rest_bulb (.5 staff_space + staff_space_rounded,
+ hround ((1.5 + 0.20) * staff_space),
+ pat, 0.96, 1);
+ bulb_c = draw_rest_bulb (.5 staff_space,
+ hround ((0.5 + 0.21) * staff_space),
+ pat, 1.0, 1);
+ bulb_d = draw_rest_bulb (.5 staff_space - staff_space_rounded,
+ hround ((-0.5 + 0.22) * staff_space),
+ pat, 1.04, 1);
+ bulb_e = draw_rest_bulb (.5 staff_space - 2 staff_space_rounded,
+ hround ((-1.5 + 0.23) * staff_space),
+ pat, 1.08, 1);
+
+ fill simple_serif (z1l, z1r, 40)
+ -- z2r
+ .. z9
+ .. bulb_a
+ -- bulb_b
+ -- bulb_c
+ -- bulb_d
+ -- bulb_e
+ -- z1l
+ .. cycle;
+
+ penlabels (1, 2);
+ labels (9);
+
+ draw_staff (-2, 2, 0);
+fet_endchar;
+
-% Rest symbols for mensural notation:
-
-mensrestsize# = .8staff_space#;
-
-fet_beginchar("Mensural 4th rest","2mensural","minimarest")
- set_char_box(0,mensrestsize#,0,mensrestsize#);
- pickup pencircle scaled 2 stafflinethickness;
- lft x1 = 0;
- bot y1 = 0;
- lft x2 = 0;
- top y2 = h;
- rt x3 = w;
- bot y3 = h/2;
- draw z1 .. z2;
- draw z2 .. z3;
-fet_endchar
-
-fet_beginchar("Mensural 8th rest","3mensural","fusarest")
- set_char_box(0,mensrestsize#,0,mensrestsize#);
- pickup pencircle scaled 2 stafflinethickness;
- rt x1 = w;
- bot y1 = 0;
- rt x2 = w;
- top y2 = h;
- lft x3 = 0;
- bot y3 = h/2;
- draw z1 .. z2;
- draw z2 .. z3;
-fet_endchar
-
-fet_beginchar("Mensural 16th rest","4mensural","semifusarest")
- set_char_box(0,mensrestsize#,0,staff_space#);
- pickup pencircle scaled 2 stafflinethickness;
- rt x1 = w;
- bot y1 = 0;
- rt x2 = w;
- top y2 = h;
-
- draw z1 .. z2;
-
- pickup pencircle scaled 2 stafflinethickness;
- rt x3 = w;
- top y3 = h;
- lft x4 = 0;
- bot y4 = h/2;
- rt x5 = w;
- top y5 = 5/8h;
- lft x6 = 0;
- bot y6 = h/8;
-
- draw z3 .. z4;
- draw z5 .. z6;
-fet_endchar
-
-fet_endgroup("rests")
+fet_endgroup ("rests");
projects / lilypond.git / blobdiff