release: 1.1.42

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

diff --git a/mf/feta-banier.mf b/mf/feta-banier.mf
index 46cb11b300268bc0db143c5770b169dca2e56055..8a3c2823f26decdd5bcc73556d4c64603bb4c68b 100644 (file)
--- a/mf/feta-banier.mf
+++ b/mf/feta-banier.mf
@@ -10,14 +10,18 @@ path outer_path;
 upflag_width# = .750 black_notehead_width# + stemthickness#/2;
 downflag_width# = .833 black_notehead_width# + stemthickness#/2;
 
+right_upflag_space# = .2 upflag_width#;
+right_downflag_space# = .2 downflag_width#;
+
 %
 % Flags pointing down cannot overlap with the notehead in y-direction,
 % so they have less slant.
 
 %
-% Because of optical illusion, the utmost flag 
-% (bottom for down-pointing, top  
-% for up-pointing) should be smaller than the other flags 
+% Because of optical illusion, the utmost flag (bottom for
+% down-pointing, top for up-pointing) should be smaller than the other
+% flags.  Adobe Sonata doesn't do this correctly.  (Instead they have an 
+% extension flag. Yuck)
 %
 
 save hip_thickness, foot_thickness;
@@ -29,7 +33,6 @@ foot_thickness# =  hip_thickness#;
 % for example, see POSTSCRIPT Language -- program design, 
 % page 119, and [Wanske], p 41,42
 %
-
 def draw_flag(expr center, flare, 
        dims, hip_depth, foot_wid, hip_thickness, foot_thickness)=
        clearxy;
@@ -104,7 +107,7 @@ fet_beginchar("8th Flag (up)", "u3", "eighthflag")
        foot_depth# =  3 interline#;
 
        set_char_box(stemthickness# /2, hip_width# 
-               + stemthickness#/2, 
+               + stemthickness#/2 + right_upflag_space#, 
                 foot_depth# + foot_thickness#/2, stemthickness#/2)
 
        define_pixels(flare, hip_width, hip_thickness,
@@ -133,7 +136,7 @@ fet_beginchar("16th Flag (up)", "u4", "sixteenthflag")
        foot_width_ratio = .8;
 
        set_char_box(stemthickness# /2, hip_width#
-               + stemthickness#/2, 
+               + stemthickness#/2 + right_upflag_space#, 
                total_depth# + foot_thickness#/2, stemthickness#/2)
 
        define_pixels(flare, hip_width, hip_thickness,
@@ -168,7 +171,7 @@ fet_beginchar("32nd Flag (up)", "u5", "thirtysecondflag")
        foot_width_ratio = .8;
 
        set_char_box(stemthickness# /2, hip_width#
-               + stemthickness#/2, 
+               + stemthickness#/2 + right_upflag_space#, 
                total_depth# + foot_thickness#/2, stemthickness#/2)
 
        define_pixels(flare, hip_width, hip_thickness,
@@ -206,7 +209,7 @@ fet_beginchar("64th Flag (up)", "u6", "sixtyfourthflag")
        foot_width_ratio = .8;
 
        set_char_box(stemthickness# /2, hip_width#
-               + stemthickness#/2, 
+               + stemthickness#/2 + right_upflag_space#, 
                total_depth# + foot_thickness#/2, stemthickness#/2)
 
        define_pixels(flare, hip_width, hip_thickness,
@@ -245,7 +248,7 @@ fet_beginchar("8th (down)", "d3", "deighthflag")
        foot_width_ratio = .8;
 
        set_char_box(stemthickness# /2, hip_width#
-               + stemthickness#/2, 
+               + stemthickness#/2 + right_downflag_space#,
                total_depth# + foot_thickness#/2, stemthickness#/2)
 
        define_pixels(flare, hip_width, hip_thickness,
@@ -279,7 +282,7 @@ fet_beginchar("16th (down)", "d4", "dsixteenthflag")
        foot_width_ratio = .95;
 
        set_char_box(stemthickness# /2, hip_width#
-               + stemthickness#/2, 
+               + stemthickness#/2 + right_downflag_space#, 
                total_depth# + foot_thickness#/2, stemthickness#/2)
 
        define_pixels(flare, hip_width, hip_thickness,
@@ -316,7 +319,7 @@ fet_beginchar("32nd (down)", "d5", "dthirtysecondflag")
        foot_width_ratio = .95;
 
        set_char_box(stemthickness# /2, hip_width#
-               + stemthickness#/2, 
+               + stemthickness#/2 + right_downflag_space#, 
                total_depth# + foot_thickness#/2, stemthickness#/2)
 
        define_pixels(flare, hip_width, hip_thickness,
@@ -355,7 +358,7 @@ fet_beginchar("64th (down)", "d6", "dsixtyfourthflag")
        foot_width_ratio = .98;
 
        set_char_box(stemthickness# /2, hip_width#
-               + stemthickness#/2, 
+               + stemthickness#/2 + right_downflag_space#, 
                total_depth# + foot_thickness#/2, stemthickness#/2)
 
        define_pixels(flare, hip_width, hip_thickness,