X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=mf%2Ffeta-klef.mf;h=15008d848eda96114025e53b0e4927bd65db4fdd;hb=a8c9e8a7ca320ab0df5fd32e717fd62cd7635ce6;hp=83bc53bc9f3bf9966676e246d880049db9001f86;hpb=87a03f358a32fb5981169f396949e4071959e51e;p=lilypond.git diff --git a/mf/feta-klef.mf b/mf/feta-klef.mf index 83bc53bc9f..15008d848e 100644 --- a/mf/feta-klef.mf +++ b/mf/feta-klef.mf @@ -4,7 +4,7 @@ % % source file of the Feta (not the Font-En-Tja) music font % -% (c) 1997--2005 Han-Wen Nienhuys , +% (c) 1997--2009 Han-Wen Nienhuys , % Jan Nieuwenhuizen , % Juergen Reuter @@ -134,9 +134,8 @@ begingroup; clearxy; center = outer_tangent_point - + big_radius * dir (0) + + 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); @@ -147,25 +146,23 @@ begingroup; labels (1', 2', 3', 4', 5'); before := z3'{dir (turning_dir * 90)} - .. z4'{-dir(0)} - .. tension 1.1 - .. z1'{-dir (turning_dir* 90)}; + .. z4'{-dir (0)} + ..tension 1.1.. z1'{-dir (turning_dir* 90)}; after := z2'{dir (turning_dir * 90)} - .. tension 1.05 .. end_point{dir (end_angle)}; (u, v) = before intersectiontimes 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 + ..tension 1.02.. z5'{dir (0)} + .. subpath (0, u) of before .. subpath (v, infinity) of after; if direction = 0: pat := reverse pat; fi - pat + +pat endgroup enddef; @@ -198,9 +195,9 @@ 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#); @@ -213,8 +210,8 @@ def draw_bass_clef (expr exact_center, reduction) = right_offset = 0.05 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#, @@ -236,7 +233,7 @@ def draw_bass_clef (expr exact_center, reduction) = % 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); @@ -307,15 +304,15 @@ def draw_gclef (expr reduction) = reduced_ss# = staff_space# * reduction; define_pixels (reduced_ss); - thinness = 0.10 staff_space + 0.65 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 = -99; + 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; @@ -367,34 +364,49 @@ def draw_gclef (expr reduction) = % 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.05 reduced_ss, 0); - penpos11 (thinnib, start_angle + 90); + penpos11 (thinnib, start_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); + penpos20 (blot_diameter, 0); - fill - z2l{right} + 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} - .. tension 1.07 % inside curve - .. z5l{up} + ..tension 1.07.. z5l{up} % inside curve .. z7l{up} - .. tension 1.2 - .. z20r - & simple_serif (z20r,z20l, 60) + ..tension 1.2.. z20r{curl 1} + .. {direction 0 of pat}z20l -- z8 -- z9r % {dir (downstroke_angle + 0)} ..tension 0.8.. z7r{down} @@ -407,23 +419,6 @@ def draw_gclef (expr reduction) = -- z1l ..tension 0.85.. cycle; - pat := z10{down} - .. z6 - .. tension 1.02 - .. 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); - - 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 @@ -434,10 +429,10 @@ def draw_gclef (expr reduction) = fill new_bulb (z12r, bot_angle, z13r, z12l, bot_angle + 180, 0.45 reduced_ss, 0.38 reduced_ss, - thinnib + .075 staff_space, 1, -1) + thinnib + .05 staff_space, 1, -1) -- cycle; - penlabels (range 1 thru 20); + penlabels (range 1 thru 21); penlabels (10', 11'); draw_staff (-1, 3, 0); @@ -637,7 +632,7 @@ begingroup; penpos10 (.75 [penh, penw], 170); z10 = pos + .375 vx + vy; - penpos 11 (.8 [penh, penw], 150); + penpos11 (.8 [penh, penw], 150); z11 = z10 - .5 vy + .04 vx; penpos12 (penh, 100); z12l = (xpart .5 [z13, z11], ypart pos);