release: 1.3.19

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

diff --git a/mf/feta-banier.mf b/mf/feta-banier.mf
index 8a3c2823f26decdd5bcc73556d4c64603bb4c68b..246f599bfe3e29c6be75e60e1354b28aea5dafe5 100644 (file)
--- a/mf/feta-banier.mf
+++ b/mf/feta-banier.mf
@@ -99,12 +99,12 @@ fet_beginchar("8th Flag (up)", "u3", "eighthflag")
                hip_depth_ratio, hip_width,
                foot_depth, foot_width_ratio;
 
-       flare# = 1.0 interline#;
+       flare# = 1.0 staff_space#;
        hip_depth_ratio = .72; 
        foot_width_ratio = .8;
        hip_width# = upflag_width# - hip_thickness#/2;
 
-       foot_depth# =  3 interline#;
+       foot_depth# =  3 staff_space#;
 
        set_char_box(stemthickness# /2, hip_width# 
                + stemthickness#/2 + right_upflag_space#, 
@@ -117,7 +117,7 @@ fet_beginchar("8th Flag (up)", "u3", "eighthflag")
                hip_depth_ratio, foot_width_ratio, hip_thickness, foot_thickness);
 
        pickup pencircle scaled stemthickness;
-       draw (0, 0) .. (0,-2 interline);
+       draw (0, 0) .. (0,-2 staff_space);
 fet_endchar;
 
 fet_beginchar("16th Flag (up)", "u4", "sixteenthflag")
@@ -125,10 +125,10 @@ fet_beginchar("16th Flag (up)", "u4", "sixteenthflag")
                hip_depth_ratio, hip_width,
                foot_depth, foot_width_ratio;
        save flagspace, total_depth, flag_count;
-       total_depth# = 3.5 interline#;
+       total_depth# = 3.5 staff_space#;
        flag_count = 2;
-       flare# = .85 interline#;
-       flagspace# = .85 interline#;    
+       flare# = .85 staff_space#;
+       flagspace# = .85 staff_space#;  
        hip_depth_ratio = .72 ;
        hip_width# = upflag_width# - hip_thickness#/2;
        flagspace# + foot_depth# = total_depth#;
@@ -142,7 +142,6 @@ fet_beginchar("16th Flag (up)", "u4", "sixteenthflag")
        define_pixels(flare, hip_width, hip_thickness,
                flagspace,
                foot_depth,  foot_thickness);
-
        draw_flag((stemthickness/2,- flagspace), flare, 
                (hip_width, foot_depth), 
                hip_depth_ratio,foot_width_ratio, hip_thickness, foot_thickness);
@@ -151,7 +150,7 @@ fet_beginchar("16th Flag (up)", "u4", "sixteenthflag")
                .97, 1.00, 1.25, hip_thickness, foot_thickness);  
 
        pickup pencircle scaled stemthickness;
-       draw (0, 0) .. (0,-2 interline);
+       draw (0, 0) .. (0,-2 staff_space);
 fet_endchar;
 
 
@@ -161,9 +160,9 @@ fet_beginchar("32nd Flag (up)", "u5", "thirtysecondflag")
                foot_depth, foot_width_ratio;
        save flagspace, total_depth, flag_count;
        flag_count = 3;
-       total_depth#=4.25 interline#;
-       flare# = .85 interline#;
-       flagspace# = .87 interline#;    
+       total_depth#=4.25 staff_space#;
+       flare# = .85 staff_space#;
+       flagspace# = .87 staff_space#;  
        hip_depth_ratio = .72 ;
        hip_width# = upflag_width# - hip_thickness#/2;
        (flag_count-1) * flagspace# + foot_depth# = total_depth#;
@@ -189,7 +188,7 @@ fet_beginchar("32nd Flag (up)", "u5", "thirtysecondflag")
                .95, 1.05, 1.25, hip_thickness, foot_thickness);  
 
        pickup pencircle scaled stemthickness;
-       draw (0, 0) .. (0,-2 interline);
+       draw (0, 0) .. (0,-2 staff_space);
 fet_endchar;
 
 fet_beginchar("64th Flag (up)", "u6", "sixtyfourthflag")
@@ -199,11 +198,11 @@ fet_beginchar("64th Flag (up)", "u6", "sixtyfourthflag")
        save flagspace, total_depth, flag_count;
        
        flag_count = 4;
-       flare# = .85 interline#;
-       flagspace# = .9 interline#;     
+       flare# = .85 staff_space#;
+       flagspace# = .9 staff_space#;   
        hip_depth_ratio = .72 ;
        hip_width# = upflag_width# - hip_thickness#/2;
-       total_depth# = 5.25 interline#;
+       total_depth# = 5.25 staff_space#;
        (flag_count-1) * flagspace# + foot_depth# = total_depth#;
 
        foot_width_ratio = .8;
@@ -228,7 +227,30 @@ fet_beginchar("64th Flag (up)", "u6", "sixtyfourthflag")
        add_flag(flagspace, flare,
                .95, 1.05, 1.25, hip_thickness, foot_thickness);  
        pickup pencircle scaled stemthickness;
-       draw (0, 0) .. (0,-2 interline);
+       draw (0, 0) .. (0,-2 staff_space);
+fet_endchar;
+
+fet_beginchar("grace dash (up)", "ugrace", "gracedash")
+       save flare, 
+               hip_depth_ratio, hip_width,
+               foot_depth;
+
+       flare# = 1.0 staff_space#;
+       hip_depth_ratio = .72; 
+       hip_width# = upflag_width# - hip_thickness#/2;
+
+       foot_depth# =  3 staff_space#;
+
+       define_pixels(flare, hip_width, hip_thickness,
+               foot_depth, foot_thickness);
+
+       set_char_box(hip_width# * hip_depth_ratio,
+         hip_width# + stemthickness#/2 + right_upflag_space#, 
+         foot_depth# * hip_depth_ratio, -flare#)
+
+       pickup pencircle scaled 1.5 stemthickness;
+       draw (-b ,-d) ..
+         (w, h);
 fet_endchar;
 
 fet_beginchar("8th (down)", "d3", "deighthflag")
@@ -238,11 +260,11 @@ fet_beginchar("8th (down)", "d3", "deighthflag")
        save flagspace, total_depth, flag_count;
        
        flag_count = 1;
-       flare# = .99 interline#;
-       flagspace# = .9 interline#;     
+       flare# = .99 staff_space#;
+       flagspace# = .9 staff_space#;   
        hip_depth_ratio = .72 ;
        hip_width# = downflag_width# - hip_thickness#/2;
-       total_depth# = 2.85 interline#;
+       total_depth# = 2.85 staff_space#;
        (flag_count-1) * flagspace# + foot_depth# = total_depth#;
 
        foot_width_ratio = .8;
@@ -261,7 +283,7 @@ fet_beginchar("8th (down)", "d3", "deighthflag")
 
 
        pickup pencircle scaled stemthickness;
-       draw (0, 0) .. (0,-2 interline);
+       draw (0, 0) .. (0,-2 staff_space);
        y_mirror_char;
 fet_endchar;
 
@@ -272,11 +294,11 @@ fet_beginchar("16th (down)", "d4", "dsixteenthflag")
        save flagspace, total_depth, flag_count;
        
        flag_count = 2;
-       flare# = .8 interline#;
-       flagspace# = .9 interline#;     
+       flare# = .8 staff_space#;
+       flagspace# = .9 staff_space#;   
        hip_depth_ratio = .85 ;
        hip_width# = downflag_width# - hip_thickness#/2;
-       total_depth# = 3.0 interline#;
+       total_depth# = 3.0 staff_space#;
        (flag_count-1) * flagspace# + foot_depth# = total_depth#;
 
        foot_width_ratio = .95;
@@ -298,7 +320,7 @@ fet_beginchar("16th (down)", "d4", "dsixteenthflag")
        
 
        pickup pencircle scaled stemthickness;
-       draw (0, 0) .. (0,-2 interline);
+       draw (0, 0) .. (0,-2 staff_space);
        y_mirror_char;
 fet_endchar;
 
@@ -309,11 +331,11 @@ fet_beginchar("32nd (down)", "d5", "dthirtysecondflag")
        save flagspace, total_depth, flag_count;
        
        flag_count = 3;
-       flare# = .84 interline#;
-       flagspace# = .9 interline#;     
+       flare# = .84 staff_space#;
+       flagspace# = .9 staff_space#;   
        hip_depth_ratio = .85 ;
        hip_width# = downflag_width# - hip_thickness#/2;
-       total_depth# = 3.85 interline#;
+       total_depth# = 3.85 staff_space#;
        (flag_count-1) * flagspace# + foot_depth# = total_depth#;
 
        foot_width_ratio = .95;
@@ -338,7 +360,7 @@ fet_beginchar("32nd (down)", "d5", "dthirtysecondflag")
        
 
        pickup pencircle scaled stemthickness;
-       draw (0, 0) .. (0,-2 interline);
+       draw (0, 0) .. (0,-2 staff_space);
        y_mirror_char;
 fet_endchar;
 fet_beginchar("64th (down)", "d6", "dsixtyfourthflag")
@@ -348,11 +370,11 @@ fet_beginchar("64th (down)", "d6", "dsixtyfourthflag")
        save flagspace, total_depth, flag_count;
        
        flag_count = 4;
-       flare# = .8 interline#;
-       flagspace# = .9 interline#;     
+       flare# = .8 staff_space#;
+       flagspace# = .9 staff_space#;   
        hip_depth_ratio = .85 ;
        hip_width# = downflag_width# - hip_thickness#/2;
-       total_depth# = 4.35 interline#;
+       total_depth# = 4.35 staff_space#;
        (flag_count-1) * flagspace# + foot_depth# = total_depth#;
 
        foot_width_ratio = .98;
@@ -379,7 +401,35 @@ fet_beginchar("64th (down)", "d6", "dsixtyfourthflag")
        
 
        pickup pencircle scaled stemthickness;
-       draw (0, 0) .. (0,-2 interline);
+       draw (0, 0) .. (0,-2 staff_space);
        y_mirror_char;
 fet_endchar;
+
+
+fet_beginchar("grace dash (down)", "dgrace", "dgracedash")
+       save flare, hip_depth_ratio, hip_width, foot_depth;
+       save flagspace, total_depth, flag_count;
+       
+       flag_count = 1;
+       flare# = .99 staff_space#;
+       flagspace# = .9 staff_space#;   
+       hip_depth_ratio = .72 ;
+       hip_width# = downflag_width# - hip_thickness#/2;
+       total_depth# = 2.85 staff_space#;
+       (flag_count-1) * flagspace# + foot_depth# = total_depth#;
+
+       foot_width_ratio = .8;
+
+       define_pixels(flare, hip_width, hip_thickness,
+               flagspace, foot_depth);
+
+       set_char_box(hip_width# * hip_depth_ratio,
+         hip_width# + stemthickness#/2 + right_downflag_space#,
+         foot_depth# * hip_depth_ratio, -flare#)
+
+       pickup pencircle scaled 1.5 stemthickness;
+       draw (-b, -d) .. (w,h);
+       y_mirror_char;
+fet_endchar;
+
 fet_endgroup("flags");