X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=mf%2Ffeta-klef.mf;h=efcca040a91f2ace7f27596631538afa8e64549e;hb=b3e7bc3a6fd47b2fa6d97ceb8ffb42ad20dd9057;hp=dd0ccbfdc0b2a55256dc8f64bd068e0ce712e6a9;hpb=56f0ccce3898e76def0982dcba94d2432dff131f;p=lilypond.git diff --git a/mf/feta-klef.mf b/mf/feta-klef.mf index dd0ccbfdc0..efcca040a9 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--2007 Han-Wen Nienhuys , % Jan Nieuwenhuizen , % Juergen Reuter @@ -146,7 +146,7 @@ begingroup; labels (1', 2', 3', 4', 5'); before := z3'{dir (turning_dir * 90)} - .. z4'{-dir(0)} + .. z4'{-dir (0)} ..tension 1.1.. z1'{-dir (turning_dir* 90)}; after := z2'{dir (turning_dir * 90)} .. end_point{dir (end_angle)}; @@ -154,7 +154,7 @@ begingroup; pat := start_point{dir (start_angle)} .. outer_tangent_point{dir (-turning_dir * 90)} - ..tension 1.02.. z5'{dir(0)} + ..tension 1.02.. z5'{dir (0)} .. subpath (0, u) of before .. subpath (v, infinity) of after; @@ -195,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#); @@ -210,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#, @@ -233,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); @@ -312,7 +312,7 @@ def draw_gclef (expr reduction) = upward_swoosh_angle = 132; 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; @@ -632,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);