* mf/feta-banier.mf ("d3"): Make `flare' equal to `staff_space'.

Minor formatting.

diff --git a/ChangeLog b/ChangeLog
index 8bf5781f506b9711ab690f62d0d1b3dbcbce4e2b..195722883620a2de3ce7e472f4b855532f820f6f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-11-25  Werner Lemberg  <wl@gnu.org>
+
+       * mf/feta-banier.mf ("d3"): Make `flare' equal to `staff_space'.
+
 2005-11-23  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
        * lily/staff-symbol-engraver.cc (process_music): bugfix: stop

diff --git a/mf/feta-banier.mf b/mf/feta-banier.mf
index 5953d9f2fbe8d069f4c30dca431e9e17cee45c31..ae65f8b47d58be40899bc763c8fea8b658f38e59 100644 (file)
--- 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 ca1e3f900a2e549ee66b4f44b035dcd19f6dcac5..599396248d0a869e91e043e877003c24a2fa3ff9 100644 (file)
--- 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 <janneke@gnu.org>
+
 
 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 3954fa1a0295ae9f401a0548a3833ca5153fad40..4517c8cd2e139c29d91fdc0481e312cd03243244 100644 (file)
--- 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;