* The grand 2005-2006 replace.

[lilypond.git] / mf / feta-nummer-code.mf

diff --git a/mf/feta-nummer-code.mf b/mf/feta-nummer-code.mf
index 6c1cf1a2fe0f0de0deaf5390e0da581b1ef1f718..1574669256a2da86d5138c0b27491bf490f1c685 100644 (file)
--- a/mf/feta-nummer-code.mf
+++ b/mf/feta-nummer-code.mf
@@ -1,10 +1,10 @@
-% feta-nummer.mf -- implement bold Orator numerals
+% feta-nummer-code.mf -- implement bold Orator numerals
 %
 % 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>
+% (c) 1997--2006 Jan Nieuwenhuizen <janneke@gnu.org>
 
 
 height# := number_design_size;
@@ -21,13 +21,13 @@ font_normal_space space#;
 %
 
 save b, h;
-4h + b = 1.15;
-10h + b = 1;
+4 h + b = 1.15;
+10 h + b = 1;
 fatten := number_design_size * h + b;
 
 save b, h;
-4h + b = 1.05;
-10h + b = 1;
+4 h + b = 1.05;
+10 h + b = 1;
 widen := number_design_size * h + b;
 
 tense = 0.85;
@@ -75,7 +75,7 @@ define_pixels (kuulleke);
 %
 %
 % move_away_to = amount left (for 2)
-% turn_to  = amount down (for  2 )
+% turn_to = amount down (for 2)
 %
 
 def number_flare_path (expr pos, alpha, beta, line, flare,
@@ -98,8 +98,8 @@ begingroup;
        z3r = 0.5 [z2l, z2r] + 0.5 * flare * dir (alpha + beta);
 
        penpos1 (line, 180 + beta + alpha);
-       penpos2 (flare, alpha );
-       penpos3 (flare, alpha +  beta);
+       penpos2 (flare, alpha);
+       penpos3 (flare, alpha + beta);
 
        penlabels (1, 2, 3, 4, 5);
 
@@ -146,7 +146,7 @@ enddef;
 
 % should make generic macro?
 %
-def draw_foot(expr xpos) =
+def draw_foot (expr xpos) =
 begingroup;
        clearxy;
 
@@ -249,9 +249,10 @@ fet_beginchar ("Space", "space");
 fet_endchar;
 
 
-code := 42; 
+code := 42;    % , 43
+
 fet_beginchar ("Plus", "plus");
-       set_char_box (0, .5 height#,  -0.25 height#, 0.75 height#);
+       set_char_box (0, .5 height#, -0.25 height#, 0.75 height#);
 
        save hthick, vthick, size, outer_hsize, outer_vsize;
 
@@ -263,18 +264,21 @@ 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);
 
-       z1 = (centerx - hthick/2, -d); 
-       z2 = (centerx + hthick/2, h); 
-       labels(1,2);
        draw_rounded_block (z1, z2, hthick);
-       draw_rounded_block ((0, centery - vthick/2),  (w, (centery + vthick/2)), vthick);
+       draw_rounded_block ((0, centery - vthick / 2),
+                           (w, (centery + vthick / 2)),
+                           vthick);
 fet_endchar;
 
 
-
 code := 43;    % , = 44
 
 fet_beginchar ("Numeral comma", "comma");
@@ -305,7 +309,7 @@ fet_beginchar ("Numeral comma", "comma");
        fill subpath (0,3) of pat
             .. z0
             .. cycle;
-       filldraw z1l{dir(alpha)}
+       filldraw z1l{dir (alpha)}
                 .. {up}z2
                 -- z0{direction pos of pat}
                 ..tension 0.95.. {dir (180 + alpha)}z1r
@@ -337,7 +341,7 @@ fet_endchar;
 
 code := 47;    % 0 = 48
 
-fet_beginchar("Numeral 0", "zero");
+fet_beginchar ("Numeral 0", "zero");
        set_char_box (0, 11/15 height# * widen, 0, height#);
 
        message "w:" & decimal w;