* lily/parser.yy (pre_events): remove prefix articulations.

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

diff --git a/mf/feta-nummer-code.mf b/mf/feta-nummer-code.mf
index be09b5d1ba9b0dae3b4e8d6d3ff99fd46110af88..df6a72df144ce353c6d72f8f5d030f72e292f272 100644 (file)
--- a/mf/feta-nummer-code.mf
+++ b/mf/feta-nummer-code.mf
@@ -4,7 +4,7 @@
 %
 % source file of the Feta (not the Font-En-Tja) music font
 % 
-% (c) 1997--2002 Jan Nieuwenhuizen <janneke@gnu.org>
+% (c)  1997--2003 Jan Nieuwenhuizen <janneke@gnu.org>
 
 %
 % These numbers were taken from a part that that the EJE violas played
@@ -23,8 +23,6 @@ define_pixels(height,thick,thick,thin,hair,flare);
 define_pixels(foot_top,foot_width);
 define_pixels(kuulleke);
 
-
-
 %
 % Yet Another Bulb Routine with smooth inside curve.
 %
@@ -131,10 +129,10 @@ def draw_six =
        
        z2=(w/2,y1);
 
-       penpos3( 15/16 thick,0);
+       penpos3 (15/16 thick,0);
        % yup, should use the path fract [] "everywhere"
        x3r=w;
-       y3r = .48 [y4r, y2r];
+       y3r = .5 [y4r, y2r];
        penpos4(hair,-90);
        z4r=(x2,0);
        penpos6(hair,90);
@@ -177,7 +175,7 @@ save dot_diam;
 dot_diam# = 7/8flare#;
 define_pixels(dot_diam);
 
-code := 32;
+code := 31; % , 32
 fet_beginchar("Space", "space", "space")
        set_char_box(0, space#,  0,height#);
 fet_endchar;
@@ -319,6 +317,11 @@ fet_beginchar("Numeral 2", "2", "two")
 
 fet_endchar;
 
+
+%%
+% TODO: should widen a bit. The right edge of the 3 bumps into next glyph in
+% combinations 
+%
 fet_beginchar("Numeral 3", "3", "three")
        set_char_box(0, 2/3height#*widen, 0, height#);
        message "w:"&decimal w;
@@ -326,12 +329,13 @@ fet_beginchar("Numeral 3", "3", "three")
        penpos1(hair,-90);
 
 %      flare_start = 0.25 ;
-       x1l = 35/80 w;
+       x1l = 36/80 w;
        y1l = h;
        
 %      z1l=(17/16thick,h);
        penpos2(7/8thick,180);
-       z2l=(w-thick/8,3/4h+thick/16);
+       x2l= w-thick/8;
+       y2l = 3/4h + thick*  3/32; 
        penpos3(thin,90);
        z3=(w/2,h/2+1/8thick);
        penpos4(thin,90);
@@ -345,7 +349,8 @@ fet_beginchar("Numeral 3", "3", "three")
        x6r= 37/80 w;
        y6r = 0;
        penpos7(3/2thin,90);
-       z7=(x5,y3);
+       x7 = .83 w ;
+       y7 = y3;
        penlabels(1,2,3,4,5,6,7);
        save alpha; alpha=25;
        save t; t=tense;
@@ -425,10 +430,11 @@ fet_beginchar("Numeral 4", "4", "four")
 fet_endchar;
 
 fet_beginchar("Numeral 5", "5", "five")
-       set_char_box(0, 7/10height#*widen, 0, height#);
+       set_char_box(0, 27/40 height#*widen, 0, height#);
        message "w:"&decimal w;
        message "h:"&decimal h;
        calc_kuulleke(w-thin,0);
+
        z1=(w/2+1/8thick,h);
        save alpha; alpha=0;
        penpos5(thin,0);
@@ -445,18 +451,33 @@ fet_beginchar("Numeral 5", "5", "five")
        penpos8(thin,90);
        z8l=(x7r,y7r-1/16thick);
        penpos9(thin,90);
-       z9=(x11+3/16thick,10/16[y5,y7]);
+
+       
+       y9=10/16[y5,y7];
+       x9 = .36 [x8r, x10r] ;
+
        penpos10(thick,0);
-       z10r=(w,1/2[y9r,y11r]);
+       x10r = w+ hair/2;
+       y10r = 1/2[y9r,y11r];
        penpos11(hair,-90);
-        z11r=(9/8thick,0);
-       penlabels(8,9,10,11);
+       y11r = 0;
+       x11r = .7 [0, x10l]; 
+
+       penlabels(8,9,10,11, 12);
        save beta; beta=45;
-       save t; t=tense;
-       fill z8r{dir(beta)}..z9r{right}..tension t..z10r{down}
-               .. super_curvelet(z10r, z11r, 0.76, 1)
-               .. flare_path(z11r,180,-90,hair,flare, 1)
-               ..z11l{right}..tension t..z10l{up}..tension t
+
+       save inner_t, outer_t;
+       inner_t= 1.0;
+       outer_t= .85;
+       fill z8r{dir(beta)}..z9r{right}
+               ..tension outer_t
+               ..z10r{down}
+               .. number_flare_path (z11r, 180, -90, hair,  flare, x11l,
+                       .18 h, 0.06, 1.5,  1)
+               ..z11l{right}
+               ..tension inner_t
+               ..z10l{up}
+               ..tension inner_t
                ..z9l{left}..z8l{dir(180+beta+10)}..cycle;
 
 fet_endchar;
@@ -527,21 +548,22 @@ fet_beginchar("Numeral 8", "8", "eight")
        save alpha; alpha=60;
        save beta; beta=alpha-15;
        z1=(w/2,h/2+thick/8);
-       penpos2(hair,90+180+beta);
+       penpos2(14/8 thin,0);
        z2=(w/3,h/2+thin);
        penpos3(3/2thin,0);
        z3l=(0,h/4+thin/2);
        penpos4(hair,90);
-       z4l=(x1,0);
+
+       z4l=(x1 ,0);
        penpos5(thick,90+90+alpha);
        z5=z1+w/4*dir(alpha-90);
        penpos6(thick,90+90+alpha);
        z6=z1+(w/4-thin/2)*dir(90+alpha);
        penpos7(hair,90);
-       z7r=(x1,h);
+       z7r= (x1 + .02 w ,h);
        penpos8(3/2thin,0);
        z8r=(w-thin/2,3/4h+thin/2);
-       penpos9(hair,90+180+beta);
+       penpos9( 13/8 thin,0);
        z9=(2/3w,h/2);
        penlabels(1,2,3,4,5,6,7,8,9);
        save t; t=tense;
@@ -562,3 +584,6 @@ fet_endchar;
 
 fet_endgroup("number")
 
+ligtable "3" : "3" kern 0.1 space#,  "0" kern 0.1 space#; 
+ligtable "2" : "7" kern 0.15 space#;
+