%
% source file of the Feta (Font-En-Tja) music font
%
-% (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+% (c) 1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
%
1.5 staff_space#);
save interbeam, interstem, beamheight, beamwidth,
- stemwidth;
+ stemwidth, beamslope;
interbeam := 1.05 staff_space;
interstem := 7/16 ;
beamheight := 4 stafflinethickness;
beamwidth := w;
- stemwidth := 1.3 stafflinethickness;
- roundness := 2blot_diameter;
+ stemwidth := 1.5 stafflinethickness;
+ roundness := 2 blot_diameter;
+
pair center;
center := (.5 w, 0);
pickup pencircle scaled roundness;
filldraw (beam shifted (0,-interbeam/2));
- filldraw (beam shifted (0,interbeam/2));
pickup pencircle scaled stemwidth;
x3 = x4 = xpart center;
- bot y3 = -1.5 staff_space + ypart center;
- top y4 = 1.5 staff_space + ypart center;
- path stem;
- stem := z3 .. z4;
numeric xs;
xs := interstem* beamwidth / 2;
- draw stem shifted (- xs, - xs* beamslope);
- draw stem shifted (xs , xs *beamslope);
+
+ (bot y3) + -xs * beamslope = -1.5 staff_space + ypart center;
+ top y4 + xs * beamslope = 1.5 staff_space + ypart center;
+
+ draw_gridline (z3-(xs,xs* beamslope),z4-(xs,xs*beamslope),stemwidth);
+ addto currentpicture also currentpicture rotated 180 shifted (w,0);
labels(1,2,3,4);
+
+
+% to check that it doesn't overshoot staffline.
+%
+% pickup pencircle scaled stafflinethickness;
+% draw (0, 1.5 staff_space ) .. (1 staff_space, 1.5 staff_space);
+
fet_endchar;
-fet_beginchar( "Natural", "0", "natural")
- set_char_box(0, 8/12 staff_space#, 1.5 staff_space#, 1.5 staff_space#);
+%
+% The stems of the natural are brushed (at least, in Barenreiter SCS )
+%
+%
+
+fet_beginchar( "Natural", "0", "natural")
+ save height;
save interbeam, interstem, beamheight, beamwidth,
- stemwidth;
+ stemwidth;
+ save top_stem_thick;
+
+ beamheight# = 4.0 stafflinethickness#;
+ height# = 1.5 staff_space#;
+ set_char_box(0, 2/3 staff_space#, height#, height#);
+
+ define_pixels(height);
+ define_blacker_pixels(beamheight);
+
+ % perhaps we should have a lowres fix?
+ top_stem_thick = 1.9 stafflinethickness;
- beamheight = 4.5 stafflinethickness;
interstem + stemwidth = w;
stemwidth = 1.3 stafflinethickness;
pickup penrazor scaled beamheight rotated 90;
top y2 = staff_space - 3/2 stafflinethickness ;
- slope = stafflinethickness / interstem;
+ slope = stafflinethickness / interstem;
draw z1 .. z2;
draw (xpart z1, -y2) .. (xpart z2, -y1);
beamtop = top y2;
-
+
pickup pencircle scaled stemwidth;
- xpart z3 = xpart z1;
- xpart z4 = xpart z2;
- top y3 = 1.5 staff_space;
+ x3 := round (xpart z1);
+ x4 := round (xpart z2);
+
+ penpos3(top_stem_thick, 0);
+ penpos5(top_stem_thick, 0);
+ penpos4(stemwidth, 0);
+ penpos6(stemwidth, 0);
+
+ y3 = height;
top y4 = beamtop;
- draw (xpart z1, -y4) .. z3;
- draw (xpart z2, -y3) .. z4;
+ x5 = x4;
+ x6 = x3;
+ bot y6 = -beamtop;
+ y5 = - height;
- labels(1,2,3,4);
+ fill simple_serif (z3l, z3r, -30) -- simple_serif(z6r, z6l, -90) -- cycle;
+ fill simple_serif (z5l, z5r, 30) -- simple_serif(z4r, z4l, 90) -- cycle;
+
+
+
+ penlabels(3,4,5,6);
+
+ labels(1,2);
fet_endchar;
%
% TODO: remove crook_fatness
+% TODO: document, simplify!
+%
def draw_meta_flat(expr xcenter, w, crook_fatness) =
clearxy;
save crook_thinness;
- save top_stem_thick, bottom_stem_thick, hair;
+ save top_stem_thick, bottom_stem_thick, hair, smaller_hole;
save center;
pair center;
center = (xcenter, 0);
- crook_thinness = 1.25 stafflinethickness;
+%
+% TODO: parameterize this
+%
+ if w >= 0.75 staff_space:
+ smaller_hole = 0.2 stafflinethickness;
+ else:
+ smaller_hole = 0.0 stafflinethickness;
+ fi
+ crook_thinness = 1.1 stafflinethickness;
top_stem_thick = 2 stafflinethickness;
bottom_stem_thick = 1.2 stafflinethickness;
y3l = (staff_space - stafflinethickness)/2 + ypart center;
z3l = whatever [z2r,z1r];
- z3r = .26 [z2r, z1r];
+ z3r = .26 [z2r, z1r] + (smaller_hole, 0);
+ z10 = whatever [z2r, z1r] + (smaller_hole , 0);
+
z4 = (3/8 staff_space, staff_space/2) + center;
penpos4(whatever, 53);
save ne_angle;
ne_angle = angle(z9 - z8);
- z7 = 8/33 [z8,z9];
+ z7 = 8/33 [z8,z9] + (1.0 smaller_hole, 0);
z6l = 18/33 [z8,z9] + .5 crook_thinness *dir(ne_angle -90);
penpos7(crook_thinness, ne_angle + 90);
z6r = .3 (z9-z8) + z7r;
-% penpos7(crook_thinness, angle(dir(z8-center) -180);
-
penpos8(whatever, ne_angle + 90);
x8r = xpart center - bottom_stem_thick/2;
penlabels(range 0 thru 10);
- z10 = (bottom_stem_thick/2, -1/5 staff_space) + center;
+ y10 = -1/5 staff_space;
- unfill z3r{up} .. z4r{right} .. tension .9
+ unfill z3r .. z4r{right} .. tension .9
.. z6r ---
- z7r{left}
- .. z10 {up} -- cycle;
+ z7r{left}
+ .. z10{z3r-z10} -- cycle;
fill z8r{down}
.. tension 0.8 ..z8l{(z9-z8)}
.. z7l
fet_endchar;
-fet_beginchar("Double flat", "-2", "flatflat")
+fet_beginchar("Double Flat", "-2", "flatflat")
save left_wid, overlap, right_wid;
left_wid = .7;
right_wid = .8;
right_wid *staff_space, 1/3 staff_space);
fet_endchar;
-fet_beginchar("Double sharp", "2", "sharpsharp")
+fet_beginchar("Double Sharp", "2", "sharpsharp")
set_char_box(0, staff_space#, .5 staff_space#, .5 staff_space#);
save klaverblad, klaversteel;
.. simple_serif(z1r, z1l, 90) .. z2l{down} -- cycle;
enddef;
-fet_beginchar("Right paranthesis", ")", "rightparen")
+fet_beginchar("Right Parenthesis", "rightparen", "rightparen")
draw_paren;
fet_endchar;
-fet_beginchar("Left paranthesis", "(", "leftparen")
+fet_beginchar("Left Parenthesis", "leftparen", "leftparen")
draw_paren;
currentpicture := currentpicture xscaled -1;
set_char_box(charwd, charbp, chardp, charht);
fet_endchar;
-
fet_endgroup("accidentals");
projects / lilypond.git / blobdiff