X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=mf%2Ffeta-banier.mf;h=d07af068547e04cf62ee6536fe5cbb0d636163e9;hb=38dce56af7b9f90d3ef36329ec48f3e41d2ee5b6;hp=36a4dc000dee2750b592e186e6e8d82cbd2df84b;hpb=2ef0f6a17cfe1fe8b5be70a1c53212c20f6e3f30;p=lilypond.git

diff --git a/mf/feta-banier.mf b/mf/feta-banier.mf
index 36a4dc000d..d07af06854 100644
--- a/mf/feta-banier.mf
+++ b/mf/feta-banier.mf
@@ -5,13 +5,14 @@
 fet_begingroup("flags")
 save outer_path;
 path outer_path;
+
 % Flags pointing down overlap with  the notehead (in x-direction), so 
 % the down-flag can be bigger
-upflag_width# = .750 black_notehead_width# + stemthickness#/2;
+upflag_width# = .650 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#;
+right_upflag_space# = .0 upflag_width#;
+right_downflag_space# = .0 downflag_width#;
 
 %
 % Flags pointing down cannot overlap with the notehead in y-direction,
@@ -25,7 +26,7 @@ right_downflag_space# = .2 downflag_width#;
 
 save hip_thickness, foot_thickness;
 hip_thickness# = 1.3 stemthickness#;
-foot_thickness# =  hip_thickness#;
+foot_thickness# =  0.95 hip_thickness#;
 
 %
 % Inspired by Adobe Sonata and [Wanske]
@@ -35,29 +36,31 @@ foot_thickness# =  hip_thickness#;
 def draw_flag(expr center, flare, 
 	dims, hip_depth, foot_wid, hip_thickness, foot_thickness)=
 	clearxy;
-
+	save c ;
+	c = 0.7;
 	penpos1(flare, 90);
 	penpos2(whatever, 0);
 	x2r - x2l = hip_thickness;
-	penpos3(foot_thickness, 0) ;
+	penpos3 (foot_thickness, -20.0);
 
 	z1r  = center;
 	z2r = center + (xpart dims, -ypart(dims) * hip_depth);
 	z3r = center + (xpart(dims) * foot_wid, -ypart dims);
 
-	outer_path := z3r{curl 0} .. z2r{up} .. {up}z1r;
+	outer_path := z3r{curl c} .. z2r{up} .. {up}z1r;
 
 	penlabels(1, 2, 3);
 	fill z1l{curl 0}
 		..tension 1.1 .. z2l{down} .. 
-		{curl 0} simple_serif(z3l, z3r, 80) &
+		{curl c} simple_serif(z3l, z3r, 80) &
 		outer_path & z1r -- cycle;
 enddef;
 
 %
-% TODO: calc intersectpoint
+% TODO: calc intersectpoint (see TeX book, p. 137)
 % TODO: calc incision_depth
 % 
+
 def add_flag(expr yoff, flare, hip_wid_multiplier, 
 		hip_dep_multiplier,
 		intersectpoint, hip_thickness, foot_thickness) =
@@ -106,7 +109,7 @@ fet_beginchar("8th Flag (up)", "u3", "eighthflag")
 	foot_depth# =  3 staff_space#;
 
 	set_char_box(stemthickness# /2, hip_width# 
-		+ stemthickness#/2 + right_upflag_space#, 
+ 		+ stemthickness#/2 + right_upflag_space#, 
 		 foot_depth# + foot_thickness#/2, stemthickness#/2)
 
 	define_pixels(flare, hip_width, hip_thickness,
@@ -116,7 +119,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 staff_space);
+	draw (0, 0) .. (0,-1 staff_space);
 fet_endchar;
 
 fet_beginchar("16th Flag (up)", "u4", "sixteenthflag")