%
% source file of the Feta (not the Font-En-Tja) music font
%
-% (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>,
+% (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>,
% Jan Nieuwenhuizen <janneke@gnu.org>,
% Juergen Reuter <reuter@ipd.uka.de>
% stem
draw_block ((0, -d + feta_shift),
(3/4 norm + 1/2 hair, h));
- draw_block ((3/4 norm + 1/2 hair + hround (3/2 hair), -d + feta_shift),
+ draw_block ((3/4 norm + 1/2 hair + hround (3/2 hair), -d + feta_shift),
(3/4 norm + 1/2 hair + 2 hround (3/2 hair), h));
% assure symmetry
save t;
t = 0.833;
- save p;
- path p;
-
- p = z5l{curl 1}
- .. z4l{up}
- .. z4r{down}
- .. z3r{right}
- ..tension t.. z2r{up}
- ..tension t.. flare_path (top z1l, 180, 90,
- hair, hfloor (norm - 1/2 hair), -1)
- ..tension t.. z2l{down}
- .. z3l{left}
- .. z6
- .. z5r{down};
-
- filldraw p shifted (0, feta_shift)
- -- reverse p yscaled -1 shifted (0, -feta_eps)
+ save pat;
+ path pat;
+
+ pat = z5l{curl 1}
+ .. z4l{up}
+ .. z4r{down}
+ .. z3r{right}
+ ..tension t.. z2r{up}
+ ..tension t.. flare_path (top z1l, 180, 90,
+ hair, hfloor (norm - 1/2 hair), -1)
+ ..tension t.. z2l{down}
+ .. z3l{left}
+ .. z6
+ .. z5r{down};
+
+ filldraw pat shifted (0, feta_shift)
+ -- reverse pat yscaled -1 shifted (0, -feta_eps)
-- cycle;
penlabels (1, 2, 3, 4, 5, 6);
big_radius, bulb_radius, flare,
direction, turning_dir) =
begingroup;
- save p, before, after;
+ save pat, before, after;
save center;
save u, v;
- path p, before, after;
+ path pat, before, after;
pair center;
clearxy;
center = outer_tangent_point
- + big_radius * dir (0)
- + (big_radius - bulb_radius) * dir (-turning_dir * 90);
+ + big_radius * dir (0);
+% + (big_radius - bulb_radius) * dir (-turning_dir * 90)
z1' = center + bulb_radius * dir (turning_dir * 180);
z2' = outer_tangent_point + flare * dir (0);
z3' = center + bulb_radius * dir (0);
z4' = center + bulb_radius * dir (turning_dir * 90);
+ z5' = center - 0.5 [big_radius, bulb_radius] * dir (turning_dir * 90);
- labels (1', 2', 3', 4');
+ labels (1', 2', 3', 4', 5');
before := z3'{dir (turning_dir * 90)}
- .. z4'
- ..tension 1.1.. z1';
+ .. z4'{-dir (0)}
+ ..tension 1.1.. z1'{-dir (turning_dir* 90)};
after := z2'{dir (turning_dir * 90)}
.. end_point{dir (end_angle)};
(u, v) = before intersectiontimes after;
- p := start_point{dir (start_angle)}
- .. outer_tangent_point{dir (-turning_dir * 90)}
- ..tension 0.97.. subpath (0, u) of before
- .. subpath (v, infinity) of after;
+ pat := start_point{dir (start_angle)}
+ .. outer_tangent_point{dir (-turning_dir * 90)}
+ ..tension 1.02.. z5'{dir (0)}
+ .. subpath (0, u) of before
+ .. subpath (v, infinity) of after;
if direction = 0:
- p := reverse p'
+ pat := reverse pat;
fi
-p
+pat
endgroup
enddef;
def draw_bass_clef (expr exact_center, reduction) =
save reduced_ss, swoosh_width;
- save right_thickness, right_offset, tip_protude;
+ save right_thickness, right_offset, tip_protrude;
save dot_diam, bulb_y_offset, bulb_flare;
- pair tip_protude;
+ pair tip_protrude;
reduced_ss# = staff_space# * reduction;
2.2 dot_diam# = reduction * (staff_space# - stafflinethickness#);
define_whole_blacker_pixels (dot_diam, right_thickness);
right_offset = 0.05 staff_space;
- bulb_y_offset := 0.15 staff_space;
+ bulb_y_offset := 0.075 staff_space;
bulb_flare := 2.5 linethickness;
-% tip_protude := (-linethickness, -.2 staff_space);
- tip_protude := (0, 0);
+% tip_protrude := (-linethickness, -.2 staff_space);
+ tip_protrude := (0, 0);
set_char_box (-xpart exact_center,
xpart exact_center + swoosh_width# + 7/12 reduced_ss#,
% optical correction: the top dot seems farther away if y3l = 0.
y3l = right_offset;
- z4 = -(0, 2.0 reduced_ss) + tip_protude;
+ z4 = -(0, 2.0 reduced_ss) + tip_protrude;
penpos3 (whatever, 185);
penpos4 (linethickness, 135);
save breapth_factor, inner_thick_end, thinness, thickness, thinnib;
save start_angle, inner_start_angle, thinness;
save upward_swoosh_angle, bot_angle;
- save p;
- path p;
+ save pat;
+ path pat;
pair downstroke_dir, center;
reduced_ss# = staff_space# * reduction;
define_pixels (reduced_ss);
- thinness = 0.08 staff_space + 0.7 linethickness;
+ thinness = 0.095 staff_space + 0.75 linethickness;
downstroke_dir = unitvector (14, -75);
downstroke_angle = angle downstroke_dir;
bot_angle = -180; % downstroke_angle - 87
upward_swoosh_angle = 132;
- start_angle = -95;
+ start_angle = -97;
- breapth_factor = 21.0 /14;
+ breapth_factor = 21/14;
inner_thick_end = 45;
inner_start_angle = downstroke_angle - 43;
thickness = .32 reduced_ss + 1.1 linethickness;
% z10 = center + whatever * dir (downstroke_angle - 1.5);
x10 = x6 - 2 thinnib;
y10 = ypart center + 3.5 reduced_ss;
- y10l - y10r = 1.2 thickness;
+ y10l - y10r = 1.0 thickness;
z10r - z10l = .7 thinnib * dir (downstroke_angle + 90)
+ whatever * downstroke_dir;
z10 = .5 [z10l, z10r];
- z11 = center + whatever * downstroke_dir + (0 reduced_ss, 0);
+ z11 = center + whatever * downstroke_dir + (-0.05 reduced_ss, 0);
penpos11 (thinnib, start_angle + 90);
- penpos12 (thinnib, bot_angle + 90);
+ penpos12 (thinnib, bot_angle + 90);
penpos13 (thinnib + 0.14 staff_space, 180);
% this auxiliary point ensures good contour overlapping
z8 = .5 [z9l, z9r] + .25 ((z9r - z9l) rotated -90);
+ z20 = z9l - (0, .25 blot_diameter);
+ penpos20 (blot_diameter, 0);
+
+ pat := z10{down}
+ .. z6
+ ..tension 1.1.. z11{dir (start_angle)};
+
+ penpos6 (thinnib, angle (direction 1 of pat) + 90);
+
+ % two auxiliary points to simulate `draw' with `penstroke'
+ z10' = point 0.3 of pat;
+ penpos10' (1.3 thinnib, angle (direction 0.3 of pat) + 50);
+
+ z11' = point 1.5 of pat;
+ penpos11' (thinnib, angle (direction 1.5 of pat) + 90);
+
+ z21l = z20l;
+ z21r = z9r;
+
+ pat := z21l
+ .. z10l{down}
+ .. z10'l;
+
fill z2l{right}
.. z3l
.. z4l{left}
- .. z5l{up}
+ ..tension 1.07.. z5l{up} % inside curve
.. z7l{up}
- ..tension 1.2.. z9l
+ ..tension 1.2.. z20r{curl 1}
+ .. {direction 0 of pat}z20l
-- z8
-- z9r % {dir (downstroke_angle + 0)}
..tension 0.8.. z7r{down}
-- z1l
..tension 0.85.. cycle;
- p := z10{down}
- .. z6
- .. z11{dir (start_angle)};
-
- penpos6 (thinnib, angle (direction 1 of p) + 90);
-
- % two auxiliary points to simulate `draw' with `penstroke'
- z10' = point 0.5 of p;
- penpos10' (thinnib, angle (direction 0.5 of p) + 90);
- z11' = point 1.5 of p;
- penpos11' (thinnib, angle (direction 1.5 of p) + 90);
-
- penstroke z9e
+ penstroke z21e
.. z10e{down}
.. z10'e
.. z6e
fill new_bulb (z12r, bot_angle, z13r, z12l, bot_angle + 180,
0.45 reduced_ss, 0.38 reduced_ss,
- thinnib + .15 staff_space, 1, -1)
+ thinnib + .05 staff_space, 1, -1)
-- cycle;
- penlabels (range 1 thru 16);
+ penlabels (range 1 thru 21);
penlabels (10', 11');
draw_staff (-1, 3, 0);
y5l = ypart (pos + siz);
penpos10 (penw, 170);
- z10 = pos + .55 vx + .85 vy;
+ z10 = pos + .55 vx + .9 vy;
penpos11 (.75 [penh, penw], 170);
z11 = z10 - .5 vy + .025 vx;
penpos12 (penh, 100);
..z5e)
slanted slant shifted (slant * -ypart pos, 0);
- soft_penstroke (z10e
- ..tension 1.5.. z11e
- .. z12e
- ..tension 1.1.. z13e{(z13r - z13l) rotated 90})
+ soft_end_penstroke (z10e
+ ..tension 1.5.. z11e
+ .. z12e
+ ..tension 1.1.. z13e{(z13r - z13l) rotated 90})
slanted slant shifted (slant * -ypart pos, 0);
endgroup;
enddef;
def draw_tab_A (expr pos, siz, slant) =
begingroup;
- save vx, vy, p;
+ save vx, vy, pat;
pair vx, vy;
- path p;
+ path pat;
clearxy;
penpos8 (.75 penh, -70);
z8r = (xpart (pos + siz), y7r + .075 ypart (siz));
- p := z2
- .. z3
- .. z4;
+ pat := z2
+ .. z3
+ .. z4;
- penpos10 (penh, angle (direction 1.2 of p) - 180);
- z10 = point 1.2 of p;
+ penpos10 (penh, angle (direction 1.2 of pat) - 180);
+ z10 = point 1.2 of pat;
penpos11 (.9 penh, -90);
z11 = .4 [z10, z6] - 0.05 vy;
penpos12 (.75 penh, -75);
.. z4e)
slanted slant shifted (slant * -ypart pos, 0);
- soft_penstroke (z5e
- .. z6e
- .. z7e
- .. z8e{(z8r - z8l) rotated 90})
+ soft_end_penstroke (z5e
+ .. z6e
+ .. z7e
+ .. z8e{(z8r - z8l) rotated 90})
slanted slant shifted (slant * -ypart pos, 0);
- soft_penstroke (z10e
- .. z11e
- .. z12e)
+ soft_end_penstroke (z10e
+ .. z11e
+ .. z12e)
slanted slant shifted (slant * -ypart pos, 0);
endgroup;
enddef;
z8 = .5 [z12l, z11l] + .15 vx - .05 vy;
penpos10 (.75 [penh, penw], 170);
- z10 = pos + .375 vx + .95 vy;
- penpos 11 (.8 [penh, penw], 150);
+ z10 = pos + .375 vx + vy;
+ penpos11 (.8 [penh, penw], 150);
z11 = z10 - .5 vy + .04 vx;
penpos12 (penh, 100);
z12l = (xpart .5 [z13, z11], ypart pos);
..z5e {left})
slanted slant shifted (slant * -ypart pos, 0);
- soft_penstroke (z6e{right}
- .. z7e
- .. z8e{(z8r - z8l) rotated 90})
+ soft_end_penstroke (z6e{right}
+ .. z7e
+ .. z8e{(z8r - z8l) rotated 90})
slanted slant shifted (slant * -ypart pos, 0);
- soft_penstroke (z10e
- ..tension 1.5.. z11e
- .. z12e
- ..tension 1.1.. z13e{(z13r - z13l) rotated 90})
+ soft_end_penstroke (z10e
+ ..tension 1.5.. z11e
+ .. z12e
+ ..tension 1.1.. z13e{(z13r - z13l) rotated 90})
slanted slant shifted (slant * -ypart pos, 0);
endgroup;
enddef;
projects / lilypond.git / blobdiff