From 375cfa82ebf137c11a76cfa3fa010edc8975d135 Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Fri, 25 Nov 2005 09:48:35 +0000 Subject: [PATCH] * mf/feta-banier.mf ("d3"): Make `flare' equal to `staff_space'. Minor formatting. --- ChangeLog | 4 ++++ mf/feta-banier.mf | 18 +++++++++--------- mf/feta-din-code.mf | 22 +++++++++++++--------- mf/feta-nummer-code.mf | 13 ++++++++----- 4 files changed, 34 insertions(+), 23 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8bf5781f50..1957228836 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2005-11-25 Werner Lemberg + + * mf/feta-banier.mf ("d3"): Make `flare' equal to `staff_space'. + 2005-11-23 Han-Wen Nienhuys * lily/staff-symbol-engraver.cc (process_music): bugfix: stop diff --git a/mf/feta-banier.mf b/mf/feta-banier.mf index 5953d9f2fb..ae65f8b47d 100644 --- a/mf/feta-banier.mf +++ b/mf/feta-banier.mf @@ -137,7 +137,7 @@ fet_beginchar ("8th Flag (up)", "u3"); hip_depth_ratio, foot_width_ratio, hip_thickness, foot_thickness, 1); - draw_square_block ((- 0.5 stemthickness_rounded, -staff_space_rounded), + draw_square_block ((-0.5 stemthickness_rounded, -staff_space_rounded), (0, 0)); fet_endchar; @@ -168,7 +168,7 @@ fet_beginchar ("16th Flag (up)", "u4"); add_flag (flagspace, flare, .97, 1.00, 1.25, hip_thickness, foot_thickness); - draw_square_block ((- 0.5 stemthickness_rounded, 0), + draw_square_block ((-0.5 stemthickness_rounded, 0), (0, -2 staff_space_rounded)); fet_endchar; @@ -202,7 +202,7 @@ fet_beginchar ("32nd Flag (up)", "u5"); add_flag (flagspace, flare, .95, 1.05, 1.25, hip_thickness, foot_thickness); - draw_square_block ((- 0.5 stemthickness_rounded, 0), + draw_square_block ((-0.5 stemthickness_rounded, 0), (0, -3 staff_space_rounded)); fet_endchar; @@ -239,7 +239,7 @@ fet_beginchar ("64th Flag (up)", "u6"); add_flag (flagspace, flare, .95, 1.05, 1.25, hip_thickness, foot_thickness); - draw_square_block ((- 0.5 stemthickness_rounded, 0), + draw_square_block ((-0.5 stemthickness_rounded, 0), (0, -4 staff_space_rounded)); fet_endchar; @@ -249,9 +249,9 @@ fet_beginchar ("8th (down)", "d3"); save flagspace, total_depth, flag_count; flag_count = 1; - flare = .99 staff_space; + flare = staff_space; flagspace# = .9 staff_space#; - hip_depth_ratio = .72 ; + hip_depth_ratio = .72; hip_width# = downflag_width# - hip_thickness# / 2; total_depth# = 2.85 staff_space#; foot_width_ratio = .8; @@ -268,7 +268,7 @@ fet_beginchar ("8th (down)", "d3"); hip_depth_ratio, foot_width_ratio, hip_thickness, foot_thickness, 0); - draw_square_block ((- 0.5 stemthickness_rounded, 0), + draw_square_block ((-0.5 stemthickness_rounded, 0), (0, -staff_space_rounded)); y_mirror_char; @@ -420,7 +420,7 @@ fet_beginchar ("32nd (down)", "d5"); add_flag (flagspace, flare, .95, 1.05, 1.25, hip_thickness, foot_thickness); - draw_square_block ((- 0.5 stemthickness_rounded, 0), + draw_square_block ((-0.5 stemthickness_rounded, 0), (0, -3 staff_space_rounded)); y_mirror_char; @@ -459,7 +459,7 @@ fet_beginchar ("64th (down)", "d6"); add_flag (.98 flagspace, flare, .91, 1.05, 1.2, hip_thickness, foot_thickness); - draw_square_block ((- 0.5 stemthickness_rounded, 0), + draw_square_block ((-0.5 stemthickness_rounded, 0), (0, -4 staff_space_rounded)); y_mirror_char; diff --git a/mf/feta-din-code.mf b/mf/feta-din-code.mf index ca1e3f900a..599396248d 100644 --- a/mf/feta-din-code.mf +++ b/mf/feta-din-code.mf @@ -1,3 +1,11 @@ +% feta-din-code.mf -- implement dynamic signs +% +% part of LilyPond's pretty-but-neat music font +% +% source file of the Feta (not the Font-En-Tja) music font +% +% (c) 1997--2005 Jan Nieuwenhuizen + ex# := (dynamic_design_size / 2.4) * pt#; descender# := 0.5 ex#; @@ -94,7 +102,7 @@ fet_beginchar ("dynamic z", "z"); .. simple_serif (z3l, z3r, 90) .. z2{left} .. z1r{left} - .. tension 1.2.. cycle; + ..tension 1.2.. cycle; % draw fill z3l @@ -119,16 +127,12 @@ fet_endchar; % % NOTES: % -% * the bulbs are open. +% * the bulbs are open % % * blotting around the serif % -% -% % TODO: insert blots around the serif % -% -% slant_angle = 20; code := 101; @@ -145,7 +149,7 @@ fet_beginchar ("dynamic f", "f"); set_char_box (0, 1.1 ex#, descender#, ex# + ascender#); bulb_diam = 7.5 / 40 ex; - bulb_thick = 8.5/40 ex; + bulb_thick = 8.5 / 40 ex; fill_up = 1.5 serif_thick; left_angle = slant_angle - 6; right_angle = slant_angle - 3; @@ -205,7 +209,7 @@ fet_beginchar ("dynamic f", "f"); .. z3r{left} ..tension 1.1.. z2r{z6 - z2r} -- z6{z6 - z2r} - ..tension 1.25 .. z7r{left} + ..tension 1.25.. z7r{left} .. z8r{up} .. z9r{right} .. z9l{down} @@ -336,7 +340,7 @@ slant := ypart (dir (slant_angle)); % % * The slant is extreme: 20 degrees. % -% * The twiddle (what'sitcalled) is a slightly darker than the serif. +% * The twiddle (what's-it-called) is a slightly darker than the serif. % % * The hole in the cheek has a straight right side. % diff --git a/mf/feta-nummer-code.mf b/mf/feta-nummer-code.mf index 3954fa1a02..4517c8cd2e 100644 --- a/mf/feta-nummer-code.mf +++ b/mf/feta-nummer-code.mf @@ -1,4 +1,4 @@ -% feta-nummer.mf -- implement bold Orator numerals +% feta-nummer-code.mf -- implement bold Orator numerals % % part of LilyPond's pretty-but-neat music font % @@ -264,15 +264,18 @@ fet_beginchar ("Plus", "plus"); outer_hsize = hround ((b + w - vthick) / 2); outer_vsize = vround ((h + d - hthick) / 2); - centerx := hround (w/2); - centery := vround ((h - d)/2); + centerx := hround (w / 2); + centery := vround ((h - d) / 2); z1 = (centerx - hthick/2, -d); z2 = (centerx + hthick/2, h); - labels(1,2); + + labels (1, 2); + draw_rounded_block (z1, z2, hthick); draw_rounded_block ((0, centery - vthick/2), - (w, (centery + vthick/2)), vthick); + (w, (centery + vthick/2)), + vthick); fet_endchar; -- 2.39.2