% source file of the Feta (defintively not an abbreviation for Font-En-Tja)
% music font
%
-% (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+% (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
% Jan Nieuwenhuizen <janneke@gnu.org>
%
fet_endchar;
-%
-% FIXME: rounded endings
%
% `\accent' is TeX reserved.
%
def draw_accent (expr bottom_left, top_right, thickness, diminish) =
+ save thinning_start;
+ thinning_start = 0.4;
pickup pencircle scaled thickness;
lft x1 = xpart bottom_left;
bot y6 = ypart bottom_left;
rt z4 = (xpart top_right, (ypart top_right + ypart bottom_left) / 2);
- x5 = x3 = (xpart top_right + xpart bottom_left) / 2
+ x5 = x3 = thinning_start [xpart top_right, xpart bottom_left]
- linethickness + 0.1 staff_space;
z3 = whatever [z1, z4];
z5 = whatever [z6, z4];
.5 staff_space#, .5 staff_space#);
draw_accent ((-w, -d), (w, h),
- 0.05 staff_space + linethickness, 0.6);
+ 0.05 staff_space + linethickness, 0.7);
penlabels (1, 3, 4, 5, 6);
labels (7);
fet_endchar;
.. z4r{down}
.. z3r{left}
..tension (1.5 + .7 slant).. z2r{up}
- .. z1r
-- cycle;
z5' = point 1.1 of krul_p;
% the connection between `t' and `r', the body of the `r',
% and the bulb
- fill z7'l{z7 - z7'}
- -- z7l
+ fill z7'l
+ -- z7l{z7 - z7'}
.. z9l{down}
-- simple_serif (z10l, z10r, -30)
-- z9r{up}
set_char_box (codawidth# + thick#, codawidth# + thick#,
codaheight# + thick#, codaheight# + thick#);
- x1 = -codawidth;
+ x1 = -codawidth + .5 thick;
y1 = y2 - thin;
- x2 = codawidth;
+ x2 = codawidth - .5 thick;
y2 = codaheight;
draw_block (z1, z2);
- x3 = x1;
+ x3 = -codawidth;
y3 = -codaheight;
- x4 = x1 + thick;
+ x4 = x3 + thick;
y4 = y2;
draw_block (z3, z4);