fet_beginchar("portato/single tenuto", "tenuto", "tenuto")
save thick;
- thick# = 1.4 stafflinethickness#;
+ thick# = 1.6 stafflinethickness#;
define_whole_pixels(thick);
set_char_box(.6 staff_space#, .6 staff_space#, thick#/2,thick#/2);
addto currentpicture also currentpicture rotated 90;
fet_endchar;
+
%
-% FIXME: blotting
+% A vee with tapered insides to prevent visual blotting
%
-fet_beginchar("Upbow", "upbow", "upbow")
- save ht, wd, thick;
- thick = 1.4 stafflinethickness;
- wd# = 1.3 staff_space#;
- ht# = 1.6 wd#;
+def draw_vee (expr width, height, thickness) =
+begingroup
+ save diminish;
-
- set_char_box(wd#/2, wd#/2, 0, ht#);
- pickup pencircle scaled thick;
+ diminish = 0.75;
+ pickup pencircle scaled thickness;
+
x1 = 0;
bot y1 = 0;
rt x2 = w;
top y2 = h;
+ z3 = 0.6 [z2, z1];
+ penpos3(thickness, 0);
+ penpos4(thickness * diminish, 0);
+ x4r = thickness/2;
+ y4 = thickness/2;
labels(1,2);
- draw z2 -- z1 -- (z2 xscaled -1);
+ penlabels(3,4);
+
+ draw z1;
+ draw z3 -- z2;
+ penstroke z3e .. z4e;
+ addto currentpicture also currentpicture xscaled -1;
+endgroup;
+enddef;
+
+fet_beginchar("Upbow", "upbow", "upbow")
+ save ht, wd, thick, diminish;
+
+ thick = 1.4 stafflinethickness;
+ wd# = 1.3 staff_space#;
+ ht# = 1.6 wd#;
+ set_char_box(wd#/2, wd#/2, 0, ht#);
+ draw_vee (wd, ht, thick);
fet_endchar;
ascender_extra# = 1/2 ex#;
ascender# = ascender_extra# + ex#;
ex# = 1.4 staff_space#;
- kerning# = .550 ex#;
+ kerning# = .60 ex#;
start_nib_angle = 20;
- bulb_size = 0.55;
+ bulb_size = 0.70;
define_pixels(ex, ascender_extra, ascender, kerning);
t_overshoot = 0.03 ex;
fatness = 12/40 ex;
- t_fatness = 0.780 fatness;
- t_width = 1.8 t_fatness;
- r_fatness = 0.75 fatness;
- uitschieter = 0.43 ex;
+ t_fatness = 0.78 fatness;
+ t_width = 1.9 t_fatness;
+ r_fatness = 0.78 fatness;
+ uitschieter = 0.48 ex;
hair_thick = blot_diameter;
-
+ r_flare = 0.45 r_fatness;
+ r_width = 2 r_fatness + 0.25 kerning;
slant = .2;
+
% slant = .0;
local_copy(transform)(currenttransform);
currenttransform := currenttransform slanted slant shifted (- staff_space, 0) ;
y1 = ascender;
- x1l = 0;
- x1r = t_fatness;
+
+ % try to position in such a way that the center is the visual
+ % center
+
+ x1l = 0.2 staff_space;
+ x1r - x1l = t_fatness;
penpos1(start_nib_wid, start_nib_angle);
z2 = (x1, 7/18 ex);
penpos2(start_nib_wid, start_nib_angle);
- z3l = (0.5 t_width, - t_overshoot);
+ z3l = (x2l + 0.5 t_width, - t_overshoot);
- z4l = (t_width, 0.23 ex);
+ z4l = (x2l + t_width, 0.23 ex);
penpos4(whatever, 200);
x4l - x4r = hair_thick;
save t_p, krul_p;
path t_p, krul_p, r_p;
- z5 = (t_fatness/2, 2/3 ex);
+ z5 = (x2l + t_fatness/2, 2/3 ex);
% penpos5(hair_thick, );
- t_p := simple_serif (z1r, z1l, -40) -- z2l {down}
+ t_p := z1r{dir (angle(z1l-z1r) + 30)} .. z1l{-dir (angle(z1r-z1l) - 45)}
+ -- z2l {down}
.. tension (1 + .5 slant)
.. z3l{right}
pickup pencircle scaled hair_thick;
- lft x6 = - uitschieter;
+ lft x6 = x2l - uitschieter;
y6 = y5 ; % - 1/20 ex;
z7 = z5 + whatever*dir krul_ang;
set_char_box(.85 staff_space# , .85 staff_space#, 0,ascender#);
- penpos11(1/4 r_fatness, -20);
+ penpos11(1/4 r_fatness, -4);
z11r = z9r;
- z13 = (x9 + 1.9 r_fatness, y11 - stafflinethickness );
- penpos13(0.45 r_fatness, 170);
+ z13l = (x9l + r_width, y11 - stafflinethickness );
+ penpos13(r_flare, 180);
z15 = z13r - (bulb_size * r_fatness,0);
z14 = 0.5 [z13l, z15] - (0,bulb_size* r_fatness);
z16 = 0.5 [z13l, z15] + (0,bulb_size* r_fatness);
- fill z11r{dir 70} .. tension 0.94 .. z13r{down} -- z15{down}
- .. tension 0.97 .. z13l{up}
- .. z11l{dir 250} -- cycle;
+ fill z11r{up} .. tension 0.94 .. z13r{down} -- z15{down}
+ .. tension 1.0 .. z13l{up}
+ .. z11l{down} -- cycle;
- fill z15{up} .. tension 1.1 .. z13l{down} .. z14 .. cycle;
+ fill z15{up} .. tension 1.06 .. z13l{down} .. z14 .. cycle;
set_char_box(wd#, wd#, 0, ht#);
-
- pickup pencircle scaled thickness;
- lft x1 = -b;
- bot y1 = 0;
- x2 =0;
- top y2 = h;
- z3 = z1 xscaled -1;
-
-
- draw z1 -- z2 -- z3;
-
+ draw_vee (wd, ht, thickness);
enddef;
fet_beginchar("left toe", "upedaltoe", "upedaltoe")
% Extendable Trill symbol.
% Not yet used
% Rename me to Trill, rename Trill to Tr?
-fet_beginchar("Trill-element","trill-element","trill-element");
+fet_beginchar("Trill-element","trill-element","trillelement");
save height, overshoot;
height# = staff_space#;
width# = 0.8height#;