release: 1.5.29

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

diff --git a/mf/feta-timesig.mf b/mf/feta-timesig.mf
index bf233f56803c30d079ec0292e0075ef00caa1879..190bbe4d8f800647a9b66ef0246dd3c189aea30d 100644 (file)
--- a/mf/feta-timesig.mf
+++ b/mf/feta-timesig.mf
@@ -1,104 +1,72 @@
 % 
 % feta-timesig.mf --  implement Time Signatures
 % 
-% source file of the Feta (Font-En-Tja) music font
+% source file of the Feta (not an abbreviation of Font-En-Tja) music font
 % 
-% (c) 1998 Mats Bengtsson <matsb@s3.kth.se>
+% (c) 1998--2002 Mats Bengtsson <matsb@s3.kth.se>,
+%               Christian Mondrup <scancm@biobase.dk>
 
 fet_begingroup("timesig");
 
+def set_C_width =
+       save left_width, right_width;
+       left_width# := 1.0 staff_space#;
+       right_width# := 0.8 staff_space#;
+       define_pixels(left_width,right_width);
+enddef;
+
 def draw_C =
-       save hair, bulb_rad;
+       save hair, bulb_rad, left_fatness;
+
+  
        hair# := stafflinethickness#;
-       bulb_rad# := interline# / 3;
+       bulb_rad# := 0.4 staff_space#;
        define_pixels(hair, bulb_rad);
-
-       x1r = x5;
-       y1r = .4 interline;
-       z2 = (0, interline);
-       z3r = (-b, 0);
-       z4 = (0, -interline);
-       z5r = (w, -2 stafflinethickness);
+       left_fatness = 0.55;
+       
+       x1r = x5r;
+       y1r = .45 staff_space;
+       z2 = (0, staff_space);
+       z3r = (-left_width, 0);
+       z4 = (0, -staff_space);
+       z5r = (right_width - stafflinethickness, -0.4 staff_space);
        
-       penpos1(hair, 0);
+       penpos1(hair, 10);
        penpos2(stafflinethickness, 90);
-       penpos3(4 stafflinethickness, 180);
+       penpos3(left_fatness * staff_space, 180);
        penpos4(stafflinethickness, -90);
        penpos5(hair, -5);
+       z6l = z1l;
+       penpos6(hair, 0);
        
-       draw_bulb(-1, z1l,  z1r, bulb_rad, .8);
+       draw_bulb(-1, z6l,  z6r, bulb_rad, .8);
 
-       fill z1l{up} .. z2l{left} .. z3l{down} .. z4l{right} ..
+       fill z1l{dir (100)} .. z2l{left} .. z3l{down} .. z4l{right} ..
        simple_serif(z5l, z5r, -90) .. 
-       z4r{left} .. z3r{up} .. z2r{right} .. z1r -- cycle;
+       z4r{left} .. z3r{up} .. z2r{right} .. {dir (-80)}z1r -- cycle;
        
-%      labels(1,2,3,4,5);
-       penlabels(1,2,3,4,5);
+       penlabels(1,2,3,4,5,6);
 enddef;
 
-fet_beginchar ("4/4 meter", "C", "fourfourmeter")
-       set_char_box(.8 interline#, .7 interline#, interline#, interline#);
-       
-       draw_C;
-fet_endchar;
+fet_beginchar ("4/4 meter", "C4/4", "fourfourmeter")
+       set_C_width;
+       set_char_box(left_width# + staff_space#, right_width# + staff_space#, 
+               staff_space#, staff_space#);
 
-fet_beginchar ("2/2 meter", "C2", "allabreve")
-       set_char_box(.8 interline#, .7 interline#, 1.4 interline#, 1.4 interline#);
-       
        draw_C;
-       draw_block((-1.5stafflinethickness, -d), (0, h));
-fet_endchar;
-
-path threequartercircle;
-threequartercircle = halfcircle & quartercircle rotated 180;
-
-save Cdiameter,Cthickness;
-Cdiameter# := 3/2 interline#;
-Cthickness# := 2 stafflinethickness#;
-define_pixels(Cdiameter,Cthickness);
-
-fet_beginchar ("Mensural 4/4 meter", "oldC", "oldfourfourmeter")
-       set_char_box(.5 Cdiameter#, .5 Cdiameter#, .5 Cdiameter#, .5 Cdiameter#);
-       
-       pickup pencircle scaled Cthickness;
-       draw threequartercircle rotated 45 scaled Cdiameter;
-fet_endchar;
-
-fet_beginchar ("Mensural 2/2 meter", "oldC2", "oldallabreve")
-       set_char_box(.5 Cdiameter#, .5 Cdiameter#, interline#, interline#);
-       
-       pickup pencircle scaled Cthickness;
-       draw threequartercircle rotated 45 scaled Cdiameter;
-       draw_block((-Cthickness, -d), (0, h));
-fet_endchar;
-
-fet_beginchar ("Mensural 3/2 meter", "old3_2", "oldthreetwometer")
-       set_char_box(.5 Cdiameter#, .5 Cdiameter#, .5 Cdiameter#, .5 Cdiameter#);
-       
-       pickup pencircle scaled Cthickness;
-       draw fullcircle scaled Cdiameter;
 fet_endchar;
 
-fet_beginchar ("Mensural 6/4 meter", "old6_4", "oldsixfourmeter")
-       set_char_box(.5 Cdiameter#, .5 Cdiameter#, 
-               .5 Cdiameter# + .5 interline#, Cdiameter#+ .5 interline#);
+fet_beginchar ("2/2 meter", "C2/2", "allabreve")
+       set_C_width;
+       set_char_box(left_width# + staff_space#, right_width# + staff_space#, 
+               1.4 staff_space#, 1.4 staff_space#);
        
-       pickup pencircle scaled Cthickness;
-       draw threequartercircle rotated 45 scaled Cdiameter 
-               shifted (0,.5 interline);
-       pickup pencircle scaled 3 stafflinethickness;
-       draw (0,.5 interline);
-fet_endchar;
+       draw_C;
+       save excentricity;
+       pair excentricity;
+       excentricity = (-1.25 stafflinethickness, 0);
 
-fet_beginchar ("Mensural 9/4 meter", "old9_4", "oldninefourmeter")
-       set_char_box(.5 Cdiameter#, .5 Cdiameter#, 
-               .5 Cdiameter# + .5 interline#, Cdiameter#+ .5 interline#);
-       
-       pickup pencircle scaled Cthickness;
-       draw fullcircle scaled Cdiameter shifted (0,.5 interline);
-       pickup pencircle scaled 3 stafflinethickness;
-       draw (0,.5 interline);
+       draw_block((- .75 stafflinethickness, -d) + excentricity, (.75 stafflinethickness , h) + excentricity);
 fet_endchar;
 
-
 fet_endgroup("timesig");