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;
ex# = 1.4 staff_space#;
kerning# = .60 ex#;
start_nib_angle = 20;
- bulb_size = 0.47;
+ bulb_size = 0.70;
define_pixels(ex, ascender_extra, ascender, kerning);
t_overshoot = 0.03 ex;
fatness = 12/40 ex;
- t_fatness = 8/10 fatness;
- r_fatness = .75 fatness;
- uitschieter = 21/40 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 = (11/10 t_fatness, - t_overshoot);
+ z3l = (x2l + 0.5 t_width, - t_overshoot);
- z4l = (13/6 t_fatness, 5/16 ex);
- penpos4(hair_thick, 180);
+ z4l = (x2l + t_width, 0.23 ex);
+ penpos4(whatever, 200);
+ x4l - x4r = hair_thick;
+
+ x3r = 0.5 [x4r, x2r];
+% 1.7 [x3l, x3r] = x4r;
+ y3r - y3l = 0.6 t_fatness;
- 1.9 [z3l, z3r] = z4r;
- z3 = .5 [z3l, z3r];
save t_p, krul_p;
path t_p, krul_p, r_p;
+ z5 = (x2l + t_fatness/2, 2/3 ex);
+% penpos5(hair_thick, );
- t_p := simple_serif (z1r, z1l, -30) -- z2l {down} .. tension (1 + .5 slant)
+ t_p := z1r{dir (angle(z1l-z1r) + 30)} .. z1l{-dir (angle(z1r-z1l) - 45)}
+ -- z2l {down}
+ .. tension (1 + .5 slant)
.. z3l{right}
.. z4l{up} -- z4r{down}
- .. z3r{left} .. z2r{up} .. z1r -- cycle;
+ .. z3r{left}
+ .. tension (1.5 + .7 slant)
+ .. z2r{up} .. z1r -- cycle;
fill t_p ;
krul_ang = 32;
pickup pencircle scaled hair_thick;
-
- z5 = (t_fatness/2, 2/3 ex);
- lft x6 = - uitschieter;
+ lft x6 = x2l - uitschieter;
y6 = y5 ; % - 1/20 ex;
z7 = z5 + whatever*dir krul_ang;
penpos7(hair_thick, up_angle + 90);
- x8l = .7 [x9r, x7r];
- y8l = y7l;
- penpos8(2 hair_thick, (up_angle +90)/2);
-
y9 = 3/4 ex;
x9 = x1 + kerning;
penpos9(r_fatness, 0);
y10 = -0.3 stafflinethickness;
penpos10(r_fatness, 0);
- krul_p := z4{up} .. tension 1.1 .. z5
- .. tension 1 and .75 .. z6
- .. tension .85 and 1.1 .. z5 --- z7;
+ krul_p := z4{up}
+ .. tension 0.98
+ .. z5
+ .. z6
+ .. z5 --- z7;
draw krul_p;
r_p := z7l{z7-z5} .. z9l{down} --- simple_serif (z10l, z10r, -30)
--- z9r{up}
- .. z8r{left} .. z7r{z5-z7} -- cycle;
+ .. z7r{z5-z7} -- cycle;
fill r_p;
- set_char_box(staff_space# , staff_space#, 0,ascender#);
+ 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 + 2 r_fatness, y11 );
- penpos13(r_fatness, 180);
- fill z11r{dir 70} .. z13r{down} -- z13l{up} .. z11l{dir 250} -- cycle;
- penlabels(range 1 thru 15);
+ 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{up} .. tension 0.94 .. z13r{down} -- z15{down}
+ .. tension 1.0 .. z13l{up}
+ .. z11l{down} -- cycle;
+
+ fill z15{up} .. tension 1.06 .. z13l{down} .. z14 .. cycle;
- draw_bulb(-1, z13r, z13l, bulb_size * r_fatness, 1.5);
+
+ penlabels(range 1 thru 15);
+
fet_endchar;
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#;
projects / lilypond.git / blobdiff