patch::: 1.3.57.jcn2

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

diff --git a/mf/feta-nummer.mf b/mf/feta-nummer.mf
index 673cfd6fde3df0d51be0c8040eb1cbcbbeac63c3..a7664589eff43aa50624e68165de664fdb0a8085 100644 (file)
--- a/mf/feta-nummer.mf
+++ b/mf/feta-nummer.mf
@@ -1,8 +1,12 @@
-% feta-nummer.mf
+% feta-nummer.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--2000 Jan Nieuwenhuizen <janneke@gnu.org>
 
-fet_begingroup("nummer")
-code := 47;
+fet_begingroup("number")
 
 define_pixels(height,thick,thick,thin,hair,flare);
 define_pixels(foot_top,foot_width);
@@ -51,6 +55,7 @@ def draw_six =
        penpos1(thin,90);
        z1=(thick,h/2+thin-hair/2);
        penpos2(hair,90);
+       
        z2=(w/2,y1);
        penpos3(7/8thick,0);
        % yup, should use the path fract [] "everywhere"
@@ -67,7 +72,7 @@ def draw_six =
        z10r=(0,y3);
        penlabels(1,2,3,4,5,6,7,8,9,10,11);
        save t; t=tense;
-       fill z5{right}..z2r{right}..tension t..z3r{down}
+       fill z7{right}..z2r{right}..tension t..z3r{down}
                ..tension t..z4r{left}
                ..tension t..z7r{up}..tension t..z6r{right}
                ..z6l{left}..tension t..z7l{down}..z10l{up}..cycle;
@@ -76,6 +81,49 @@ def draw_six =
                ..z4l{left}..tension t..z10l{up}..tension t..cycle;
        enddef;
 
+save dot_diam;
+dot_diam# = 7/8flare#;
+define_pixels(dot_diam);
+
+
+code := 43;  % , = 44 
+
+% urg
+fet_beginchar("Numeral comma", ",", "comma")
+       set_char_box(0, dot_diam#, 3/2dot_diam#, dot_diam#);
+       pickup pencircle scaled dot_diam;
+       draw (dot_diam/2,dot_diam/2);
+       z0=(w/3,0);
+       alpha=65;
+        penpos1(thin,alpha+90);
+        z1l=(w/2,-1.5h+hair);
+       z2=(w,h/2);
+       pickup pencircle;
+       filldraw z1l{dir(alpha)}..{up}z2..{z0-z2}z0{right}..{dir(180+alpha)}z1r..cycle;
+       labels(0,1,2);
+       penlabels(1);
+fet_endchar;
+
+fet_beginchar("Numeral dash", "-", "dash")
+       set_char_box(0, height#/3, 0, height#);
+       pickup pencircle scaled thin;
+       lft x1 = -b;
+       rt x2 = w;
+       y1 = y2 = h/3;
+       draw z1 .. z2;
+fet_endchar;
+
+fet_beginchar("Numeral dot", ".", "dot")
+       set_char_box(0, dot_diam#, 0, dot_diam#);
+       pickup pencircle scaled dot_diam;
+       draw (dot_diam/2,dot_diam/2);
+fet_endchar;
+
+
+% skip slash
+
+code := 47; % 0 = 48
+
 fet_beginchar("Numeral 0", "0", "zero")
 %      set_char_box(0, 4/5height#*widen, 0, height#);
        set_char_box(0, 11/15height#*widen, 0, height#);
@@ -143,7 +191,6 @@ fet_beginchar("Numeral 2", "2", "two")
        z3=(w,thick)+(1/2sqrt(2)*hair)*dir(-135);
        penpos2(thick,90+alpha);
        x2-x1=x3-x2; y2=11/16thick/widen;
-       penlabels(1,2,3);
        fill z1r{dir(beta)}..{dir(alpha)}z2r..{dir(gamma)}z3r
                ..z3l{dir(180+gamma)}..{dir(180+alpha)}z2l
                ..{dir(180+beta)}z1l..cycle;
@@ -152,6 +199,7 @@ fet_beginchar("Numeral 2", "2", "two")
        z4r=(w-thin/2,.72h);
        penpos5(thin,90);
        z5r=(1/2hair+flare,h);
+       penlabels(1,2,3,4);
        penlabels(5,6);
        save t; t=tense;
        fill z1l{dir(beta)}..tension t..z4r{up}
@@ -369,5 +417,5 @@ fet_beginchar("Numeral 9", "9", "nine")
        currentpicture := currentpicture shifted (w,h);
 fet_endchar;
 
-fet_endgroup("nummer")
+fet_endgroup("number")