%
% source file of the Feta (not the Font-En-Tja) music font
%
-% (c) 1997, 1998 Jan Nieuwenhuizen <janneke@gnu.org>
+% (c) 1997--2003 Jan Nieuwenhuizen <janneke@gnu.org>
fet_begingroup("rests");
thick#:=1/16designsize;
define_blacker_pixels(thick);
-rthin:=1/8*interline;
+rthin:=1/8*staff_space;
% rthick:=2rthin;
rthick:=2thick+rthin;
%
save stem, ball_crook_stem, ball_crook_balldiam, flare;
-% stem#:=1/8*interline#;
-stem# = 1/5interline#;
-% flare# = 2/3interline#;
-flare# = 2/3interline# - 1/8stafflinethickness#;
+% stem#:=1/8*staff_space#;
+stem# = 1/5staff_space#;
+% flare# = 2/3staff_space#;
+flare# = 2/3staff_space# - 1/8stafflinethickness#;
define_pixels(stem,flare);
save block_rest_y, block_rest_x;
-block_rest_y# = 5/8 interline#;
-block_rest_x# = 3/2 interline#;
+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);
y5 = y6 = 0;
lft x5 = - b - block_rest_y;
rt x6 = w + block_rest_y;
- draw z5 .. z6;
+ draw_gridline(z5,z6,ledgerlinethickness);
fet_endchar;
fet_beginchar("half rest (outside staff)", "1o", "outsidehalfrest");
y5 = y6 = 0;
lft x5 = - b - block_rest_y ;
rt x6 = w + block_rest_y;
- draw z5 .. z6;
+ draw_gridline (z5,z6,ledgerlinethickness);
fet_endchar;
-save breve_rest_y, breve_rest_x;
-
-breve_rest_y# = interline#;
-breve_rest_x# = 3/5 interline#;
-multi_rest_x# = 2 interline#;
-multi_rest_y# = 1/3 interline#;
-define_pixels(breve_rest_y, breve_rest_x, multi_rest_x, multi_rest_y);
+define_pixels(breve_rest_y, breve_rest_x, multi_rest_x, multi_beam_height);
-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));
+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,-breve_rest_y), (breve_rest_x, 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("multi rest", "-4", "multirest");
- set_char_box(multi_rest_x#, multi_rest_x#,
- breve_rest_y#, breve_rest_y#);
- draw_block ((-multi_rest_x, -multi_rest_y),
- (multi_rest_x, multi_rest_y));
- draw_block ((-multi_rest_x,-breve_rest_y),
- (rthin-multi_rest_x, breve_rest_y));
- draw_block ((multi_rest_x-rthin,-breve_rest_y),
- (multi_rest_x, breve_rest_y));
+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)));
fet_endchar;
+
+tracingvariables := 1;
+
fet_beginchar("Quarter rest","2","quartrest");
% draw_staff (-2, 2, 0.0);
save alpha, yshift, height;
alpha:=-50;
- yshift# = -1.25 interline#;
- height# = 2.8125 interline#;
+ yshift# = -1.25 staff_space#;
+ height# = 2.8125 staff_space#;
define_pixels (yshift, height);
-
+ save xcenter;
+ xcenter = -0.1 staff_space;
- set_char_box(0, 27/25interline#,
+ set_char_box(0, 0.95 staff_space#,
-yshift#,
yshift# + height#);
z13=z2r+1/2rthin*ne+1/2rthin*nw;
y1r = h;
- x1l=1/3interline;
- z2r=z1+interline*se;
+ x1l=xcenter + 1/3staff_space;
+ z2r=z1+staff_space*se;
z3=1/2[z2,z4];
- x4=3/8interline;
+ x4= xcenter + 3/8staff_space;
y4= 0;
- z5=z4l+1.3interline*se;
+ z5=z4l+1.3staff_space*se;
x6l=x4l;
y6l=y4r;
- x7=2/5interline;
+ x7= xcenter + 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;
penlabels(1,2,3,4,5,6,7);
penlabels(10,11,12,13);
-% 3/4 interline# + yshift#,
-% 18/5interline# + yshift#)
+% 3/4 staff_space# + yshift#,
+% 18/5staff_space# + yshift#)
fet_endchar;
balled_crook(a, w, ball_crook_balldiam, ball_crook_stem)
enddef;
-fet_beginchar("8th rest","3","eighthrest");
-% draw_staff (-2, 2, 0.0);
- save yshift, ballcorrection;
- ballcorrection = 0.005 interline;
+%
+% 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.
+%
- yshift# := -1.0 interline#;
- define_pixels(yshift);
+% 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.
+%
+%
- set_char_box(0, 4/3interline#, -yshift#, yshift# +
- 5/3interline#+7/4stafflinethickness#);
+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;
- %
- % The curve is like a valley causing less space between
- % the curve and the lower staff line. Correct for this.
- %
- save x,y;
+ z6 = whatever [z1l, z2l];
+ z6 = z3+whatever * dir(12);
- x1=w-stem/6;
+ (pt,whatever) = pat intersectiontimes ((0,ycut)--(w,ycut));
- y1 = yshift + 1.5 interline + flare/4 + ballcorrection;
- rest_crook (z1,w-stem/6);
- z2-z1=whatever*dir70;
- y2= yshift + stem/2;
- brush(z1,2/3stem,z2,stem);
+ 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, pat;
+ pair crook_dir;
+ path pat;
+
+ width# := 1.0 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#,
+ 1.0 staff_space# + 0.5 stafflinethickness#, 0.5 staff_space# + bulb_diam#/2);
+
+ penpos1 (thick, 0);
+ penpos2 (thin, 10);
+
+ 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);
+
+ enddef;
+
+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;
+
+
+%
+% TODO: the X dimensions of the rests are fucked up:
+% they can collide with augmentation dots.
+%
+
fet_beginchar("16th rest","4","sixteenthrest");
-% draw_staff (-2, 2, 0.0);
- save yshift, ballcorrection;
- ballcorrection = 0.005 interline;
-
- yshift# := - 2 interline#;
- define_pixels(yshift);
-
- save alpha,cw,h,w, height;
- alpha=74;
- cw#=7/6interline#;
- height# = 5/3interline#+interline#+7/4stafflinethickness#;
- set_char_box(0, cw#+(height#-3/2interline#)/tand(alpha),
- -yshift#, height# + yshift#);
-
- define_pixels(cw);
- save x,y;
- x1=w-stem/6;
- y1 = yshift + 2.5 interline + 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-interline;
- rest_crook (z3,cw);
- penlabels(1,2);
+ 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.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;
+
+ lower_brush := 1.5 stafflinethickness;
+
+ 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);
+
+ 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(9);
+
+ % draw_staff (-2,2,0.0);
fet_endchar;
fet_beginchar("32th rest","5","thirtysecondrest");
-% draw_staff (-2, 2, 0.0);
- save yshift, ballcorrection;
- ballcorrection = 0.005 interline;
-
- yshift# := -2 interline#;
- define_pixels(yshift);
-
- save alpha,cw,h;
- alpha=76;
- cw#=7/6interline#;
- h#=5/3interline#+2interline#+7/4stafflinethickness#;
-
- set_char_box(0, cw#+(h#-3/2interline#)/tand(alpha),
- -yshift#,yshift# +h#);
- define_pixels(cw);
- save x,y;
- x1=w-stem/6;
- y1 = yshift + 3.5 interline + 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-interline;
- rest_crook (z3,cw);
- z4-z1=whatever*dir alpha;
- y4=y1-2interline;
- rest_crook (z4,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.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;
+
+ lower_brush := 1.5 stafflinethickness;
+
+ 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);
+
+ 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;
+
+
+ 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);
+
+ % 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 interline;
-
- yshift# := -3 interline#;
- define_pixels(yshift);
-
- save alpha,cw,h,w;
- alpha=78;
- cw#=7/6interline#;
- h#=5/3interline#+3interline#+7/4stafflinethickness#;
- w#=cw#+(h#-3/2interline#)/tand(alpha);
- set_char_box(0,w#,-yshift# ,yshift# + h#);
-
- define_pixels(cw);
- save x,y;
- x1=w-stem/6;
-
- y1 = yshift + 4.5 interline + 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-interline;
- rest_crook (z3,cw);
- z4-z1=whatever*dir alpha;
- y4=y1-2interline;
- rest_crook (z4,cw);
- z5-z1=whatever*dir alpha;
- y5=y1-3interline;
- 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 interline;
-
- yshift# := -3 interline#;
- define_pixels(yshift);
- save alpha,cw,h,w;
- alpha=78;
- cw#=7/6interline#;
- h#=5/3interline#+4interline#+7/4stafflinethickness#;
- w#=cw#+(h#-3/2interline#)/tand(alpha);
- set_char_box(0,w#, -yshift#,yshift# + h#);
- define_pixels(cw);
- save x,y;
- x1=w-stem/6;
- y1 = yshift + 5.5 interline + 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-interline;
- rest_crook (z3,cw);
- z4-z1=whatever*dir alpha;
- y4=y1-2interline;
- rest_crook (z4,cw);
- z5-z1=whatever*dir alpha;
- y5=y1-3interline;
- rest_crook (z5,cw);
- z6-z1=whatever*dir alpha;
- y6=y1-4interline;
- 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;
-endgroup;
-% Rest symbols for mensural notation:
-
-mensrestsize# = .8interline#;
-
-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,interline#);
- 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
+endgroup;
fet_endgroup("rests")
projects / lilypond.git / blobdiff