summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
34f4879)
texts as well.
* mf/feta-klef.mf: revise.
* mf/feta-schrift.mf: make thinning of accent less pronounced.
* mf/feta-klef.mf: add rounded curve at top.
make thinnib a little heavier.
+2005-03-10 Han-Wen Nienhuys <hanwen@xs4all.nl>
+
+ * lily/dynamic-text-spanner.cc (print): add bound padding for edge
+ texts as well.
+
+ * mf/feta-klef.mf: revise.
+
+ * mf/feta-schrift.mf: make thinning of accent less pronounced.
+
+ * mf/feta-klef.mf: add rounded curve at top.
+ make thinnib a little heavier.
+
2005-03-10 Jan Nieuwenhuizen <janneke@gnu.org>
* buildscripts/fixcc.py: New file.
2005-03-10 Jan Nieuwenhuizen <janneke@gnu.org>
* buildscripts/fixcc.py: New file.
do
{
Interval ext = edge[d].extent (X_AXIS);
do
{
Interval ext = edge[d].extent (X_AXIS);
+ Real pad = robust_scm2double (me->get_property ("bound-padding"), 0.0);
if (!ext.is_empty ())
{
edge[d].translate_axis (span_points[d], X_AXIS);
m.add_stencil (edge[d]);
if (!ext.is_empty ())
{
edge[d].translate_axis (span_points[d], X_AXIS);
m.add_stencil (edge[d]);
- span_points[d] += -d * ext[-d];
+ span_points[d] += -d * (ext[-d] + pad);
}
}
while (flip (&d) != LEFT);
}
}
while (flip (&d) != LEFT);
% stem
draw_block ((0, -d + feta_shift),
(3/4 norm + 1/2 hair, h));
% 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
(3/4 norm + 1/2 hair + 2 hround (3/2 hair), h));
% assure symmetry
center = outer_tangent_point
+ big_radius * dir (0)
center = outer_tangent_point
+ big_radius * dir (0)
- + (big_radius - bulb_radius) * dir (-turning_dir * 90);
+% + (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);
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)}
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)}
after := z2'{dir (turning_dir * 90)}
.. end_point{dir (end_angle)};
(u, v) = before intersectiontimes after;
pat := start_point{dir (start_angle)}
.. outer_tangent_point{dir (-turning_dir * 90)}
.. end_point{dir (end_angle)};
(u, v) = before intersectiontimes after;
pat := start_point{dir (start_angle)}
.. outer_tangent_point{dir (-turning_dir * 90)}
- ..tension 0.97.. subpath (0, u) of before
+ .. tension 1.02
+ .. z5'{dir(0)}
+ .. subpath (0, u) of before
.. subpath (v, infinity) of after;
if direction = 0:
pat := reverse pat;
fi
.. subpath (v, infinity) of after;
if direction = 0:
pat := reverse pat;
fi
define_whole_blacker_pixels (dot_diam, right_thickness);
right_offset = 0.05 staff_space;
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);
bulb_flare := 2.5 linethickness;
% tip_protude := (-linethickness, -.2 staff_space);
tip_protude := (0, 0);
reduced_ss# = staff_space# * reduction;
define_pixels (reduced_ss);
reduced_ss# = staff_space# * reduction;
define_pixels (reduced_ss);
- thinness = 0.08 staff_space + 0.7 linethickness;
+ thinness = 0.10 staff_space + 0.65 linethickness;
downstroke_dir = unitvector (14, -75);
downstroke_angle = angle downstroke_dir;
bot_angle = -180; % downstroke_angle - 87
upward_swoosh_angle = 132;
downstroke_dir = unitvector (14, -75);
downstroke_angle = angle downstroke_dir;
bot_angle = -180; % downstroke_angle - 87
upward_swoosh_angle = 132;
breapth_factor = 21.0 /14;
inner_thick_end = 45;
breapth_factor = 21.0 /14;
inner_thick_end = 45;
z10r - z10l = .7 thinnib * dir (downstroke_angle + 90)
+ whatever * downstroke_dir;
z10 = .5 [z10l, z10r];
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);
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);
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);
+
+ fill
+ z2l{right}
+ .. tension 1.07 % inside curve
+ .. tension 1.2
+ .. z20r
+ & simple_serif (z20r,z20l, 60)
-- z8
-- z9r % {dir (downstroke_angle + 0)}
..tension 0.8.. z7r{down}
-- z8
-- z9r % {dir (downstroke_angle + 0)}
..tension 0.8.. z7r{down}
.. z11{dir (start_angle)};
penpos6 (thinnib, angle (direction 1 of pat) + 90);
.. z11{dir (start_angle)};
penpos6 (thinnib, angle (direction 1 of pat) + 90);
% two auxiliary points to simulate `draw' with `penstroke'
z10' = point 0.5 of pat;
penpos10' (thinnib, angle (direction 0.5 of pat) + 90);
% two auxiliary points to simulate `draw' with `penstroke'
z10' = point 0.5 of pat;
penpos10' (thinnib, angle (direction 0.5 of pat) + 90);
z11' = point 1.5 of pat;
penpos11' (thinnib, angle (direction 1.5 of pat) + 90);
z11' = point 1.5 of pat;
penpos11' (thinnib, angle (direction 1.5 of pat) + 90);
+ z21l = z20l;
+ z21r = z9r;
+
+ penstroke z21e
.. z10e{down}
.. z10'e
.. z6e
.. z10e{down}
.. z10'e
.. z6e
fill new_bulb (z12r, bot_angle, z13r, z12l, bot_angle + 180,
0.45 reduced_ss, 0.38 reduced_ss,
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 + .075 staff_space, 1, -1)
- penlabels (range 1 thru 16);
+ penlabels (range 1 thru 20);
penlabels (10', 11');
draw_staff (-1, 3, 0);
penlabels (10', 11');
draw_staff (-1, 3, 0);
% Make a round path segment going from P to Q. 2*A is the angle that the
% path should take.
%
% Make a round path segment going from P to Q. 2*A is the angle that the
% path should take.
%
def simple_serif (expr p, q, a) =
p{dir (angle (q - p) - a)}
.. q{-dir (angle (p - q) + a)}
def simple_serif (expr p, q, a) =
p{dir (angle (q - p) - a)}
.. q{-dir (angle (p - q) + a)}
-%
-% FIXME: rounded endings
%
% `\accent' is TeX reserved.
%
def draw_accent (expr bottom_left, top_right, thickness, diminish) =
%
% `\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;
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);
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];
- 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),
.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;
penlabels (1, 3, 4, 5, 6);
labels (7);
fet_endchar;
% in a separate file to avoid tainting non-test font files for testing.
%
% in a separate file to avoid tainting non-test font files for testing.
%
-input feta-eindelijk;
-input feta-toevallig;
-input feta-puntje;
-input feta-bolletjes;
-input feta-schrift;
-input feta-banier;
+%input feta-eindelijk;
+%input feta-toevallig;
+%input feta-puntje;
+%input feta-bolletjes;
+%input feta-schrift;
+%input feta-banier;
% input feta-slag;
input feta-klef;
% input feta-haak;
% input feta-slag;
input feta-klef;
% input feta-haak;
-input feta-timesig;
-input feta-pendaal;
-input feta-accordion;
+%input feta-timesig;
+%input feta-pendaal;
+%input feta-accordion;