release: 1.0.15

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

diff --git a/mf/feta-timesig.mf b/mf/feta-timesig.mf
index bf233f56803c30d079ec0292e0075ef00caa1879..7cddd3215d33bdcce5330da3469f96e92342d125 100644 (file)
--- a/mf/feta-timesig.mf
+++ b/mf/feta-timesig.mf
@@ -1,12 +1,19 @@
 % 
 % 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>
 
 fet_begingroup("timesig");
 
+def set_C_width =
+       save left_width, right_width;
+       left_width# := .8 interline#;
+       right_width# := .7 interline#;
+       define_pixels(left_width,right_width);
+enddef;
+
 def draw_C =
        save hair, bulb_rad;
        hair# := stafflinethickness#;
@@ -16,9 +23,9 @@ def draw_C =
        x1r = x5;
        y1r = .4 interline;
        z2 = (0, interline);
-       z3r = (-b, 0);
+       z3r = (-left_width, 0);
        z4 = (0, -interline);
-       z5r = (w, -2 stafflinethickness);
+       z5r = (right_width, -2 stafflinethickness);
        
        penpos1(hair, 0);
        penpos2(stafflinethickness, 90);
@@ -36,14 +43,18 @@ def draw_C =
        penlabels(1,2,3,4,5);
 enddef;
 
-fet_beginchar ("4/4 meter", "C", "fourfourmeter")
-       set_char_box(.8 interline#, .7 interline#, interline#, interline#);
+fet_beginchar ("4/4 meter", "C4/4", "fourfourmeter")
+       set_C_width;
+       set_char_box(left_width# + interline#, right_width# + interline#, 
+               interline#, interline#);
        
        draw_C;
 fet_endchar;
 
-fet_beginchar ("2/2 meter", "C2", "allabreve")
-       set_char_box(.8 interline#, .7 interline#, 1.4 interline#, 1.4 interline#);
+fet_beginchar ("2/2 meter", "C2/2", "allabreve")
+       set_C_width;
+       set_char_box(left_width# + interline#, right_width# + interline#, 
+               1.4 interline#, 1.4 interline#);
        
        draw_C;
        draw_block((-1.5stafflinethickness, -d), (0, h));
@@ -57,31 +68,37 @@ 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#);
+%% tempus imperfectum cum prolatione imperfecta
+fet_beginchar ("Mensural 4/4 meter", "old4/4", "oldfourfourmeter")
+       set_char_box(.5 Cdiameter# + interline#, .5 Cdiameter# + interline#, 
+               .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#);
+fet_beginchar ("Mensural 2/2 meter", "old2/2", "oldallabreve")
+       set_char_box(.5 Cdiameter# + interline#, .5 Cdiameter# + interline#, 
+               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#);
+%% tempus perfectum cum prolatione imperfecta
+fet_beginchar ("Mensural 3/2 meter", "old3/2", "oldthreetwometer")
+       set_char_box(.5 Cdiameter# + interline#, .5 Cdiameter# + interline#, 
+               .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#);
+%% tempus imperfectum cum prolatione perfecta
+fet_beginchar ("Mensural 6/4 meter", "old6/4", "oldsixfourmeter")
+       set_char_box(.5 Cdiameter# + interline#, .5 Cdiameter# + interline#, 
+               .5 Cdiameter# + .5 interline#, .5 Cdiameter#+ .5 interline#);
        
        pickup pencircle scaled Cthickness;
        draw threequartercircle rotated 45 scaled Cdiameter 
@@ -90,9 +107,10 @@ fet_beginchar ("Mensural 6/4 meter", "old6_4", "oldsixfourmeter")
        draw (0,.5 interline);
 fet_endchar;
 
-fet_beginchar ("Mensural 9/4 meter", "old9_4", "oldninefourmeter")
-       set_char_box(.5 Cdiameter#, .5 Cdiameter#, 
-               .5 Cdiameter# + .5 interline#, Cdiameter#+ .5 interline#);
+%% tempus perfectum cum prolatione perfecta
+fet_beginchar ("Mensural 9/4 meter", "old9/4", "oldninefourmeter")
+       set_char_box(.5 Cdiameter# + interline#, .5 Cdiameter# + interline#, 
+               .5 Cdiameter# + .5 interline#, .5 Cdiameter#+ .5 interline#);
        
        pickup pencircle scaled Cthickness;
        draw fullcircle scaled Cdiameter shifted (0,.5 interline);