X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=mf%2Ffeta-banier.mf;h=04022aacb359b3c61e5de1c7911ee3d1d66bd7d7;hb=4cd95b2351e5aa29e61c75bd68ee700b1e744fb3;hp=5dad6a8216dc80f4a0dcc79476053b06657cb820;hpb=934d7fd539e587975098a6de6ee39cb25151ac48;p=lilypond.git

diff --git a/mf/feta-banier.mf b/mf/feta-banier.mf
index 5dad6a8216..04022aacb3 100644
--- a/mf/feta-banier.mf
+++ b/mf/feta-banier.mf
@@ -2,81 +2,452 @@
 %
 
 
-fet_begingroup("floogbars")
+fet_begingroup("flags")
+save outer_path;
+path outer_path;
 
-save flag_angle, flare;
-save hip_thickness, hip_depth, hip_width;
-save foot_thickness, foot_depth, foot_width;
+% Flags pointing down overlap with  the notehead (in x-direction), so 
+% the down-flag can be bigger
+upflag_width# = .650 black_notehead_width# + stemthickness#/2;
+downflag_width# = .833 black_notehead_width# + stemthickness#/2;
 
-flag_angle = 32;
-
-hip_thickness# = 1.2 stafflinethickness#;
-foot_thickness# = blot_diameter#;
-flare# = 1.0 interline#;
-
-hip_depth# = 15/7 interline#; 
-hip_width# = 7/8 interline# + hip_thickness# /2 + stemthickness#/2;
-
-foot_depth# = flare# + 15/7 interline#;
-foot_width# = .885 hip_width#;
+right_upflag_space# = .0 upflag_width#;
+right_downflag_space# = .0 downflag_width#;
 
+%
+% Flags pointing down cannot overlap with the notehead in y-direction,
+% so they have less slant.
 
-define_pixels(flare, 
-	hip_depth, hip_width, hip_thickness,
-	foot_depth, foot_width, foot_thickness
-);
+% 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, which looks less elegant)
+%
 
-%treq;
+save hip_thickness, foot_thickness;
 
+hip_thickness# = 1.0 linethickness# + 0.069 staff_space#;
+foot_thickness# =   1.2055 linethickness# + 0.06 staff_space#;
 
 %
-% Inspired by Adobe Sonata,
+% Inspired by Adobe Sonata and [Wanske]
 % for example, see POSTSCRIPT Language -- program design, 
-% page 119
+% page 119, and [Wanske], p 41,42
 %
-def draw_eight_flag =
-	penpos0(stemthickness, 0);
+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(hip_thickness, 0);
-	penpos3(foot_thickness, 0) ;
-	penpos4(stemthickness, 0);
-
-	z0r = z1r;
-	z0  = (0,0);
-	z2 = (hip_width, -hip_depth);
-	z3 = (foot_width, -foot_depth);
-	z4r = z1l;
-
-	save bot_dir, bot_path;
-	pair bot_dir;
-	path bot_path;
-	bot_path := z2{down} .. z3;
-	bot_dir := direction 1 of bot_path;
-
-	fill z1l{dir -flag_angle} .. z2l{down} .. 
-		z3l{bot_dir}  .. z3r{-bot_dir} ..
-		{up}z2r .. {up}z1r .. 
-		z0l{down} -- z4l -- cycle;
-		
-		;
+	penpos2(whatever, 0);
+	x2r - x2l = hip_thickness;
+	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 c} .. z2r{up} .. {up}z1r;
+
+	penlabels(1, 2, 3);
+	fill z1l{curl 0}
+		..tension 1.1 .. z2l{down} .. 
+		{curl c} simple_serif(z3l, z3r, 80) &
+		outer_path & z1r -- cycle;
+enddef;
+
+%
+% 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) =
+	begingroup
+	save prev_center, prev_xextreme, prev_yextreme;
+	save rel_foot, ip, center, incision_depth;
+	save prev_hipwid, prev_footdep, prev_hipdep, wid, dep, hip_dep;
+	save hip_dep_ratio, foot_wid_ratio;
+	pair prev_center, center, foot, prev_xextreme, prev_yextreme;
+	pair ip, rel_foot;
+	
+	incision_depth = 1.013;
+	prev_center = point 2 of outer_path;
+	prev_xextreme = point 1 of outer_path;
+	prev_yextreme = point 0 of outer_path;
+	prev_hipwid = xpart (prev_xextreme - prev_center);
+	prev_footdep = -ypart (prev_yextreme - prev_center);
+	prev_hipdep = -ypart(prev_xextreme - prev_center);
+	ip = point intersectpoint of outer_path;
+
+	wid = prev_hipwid * hip_wid_multiplier;
+	hip_dep = prev_hipdep * hip_dep_multiplier;
 
+	center = prev_center + (0,yoff);
+	rel_foot = incision_depth [(wid, hip_dep), ip - center];
+	dep = -ypart(rel_foot);
+	foot_wid_ratio = xpart(rel_foot ) / wid;
+	hip_dep_ratio = hip_dep / dep;
+
+	draw_flag(center, flare, 
+		(wid, dep), hip_dep_ratio, foot_wid_ratio, 
+		hip_thickness, foot_thickness);
+	endgroup
 enddef;
 
+fet_beginchar("8th Flag (up)", "u3", "eighthflag")
+	save flare, 
+		hip_depth_ratio, hip_width,
+		foot_depth, foot_width_ratio;
+
+	flare# = 1.0 staff_space#;
+	hip_depth_ratio = .72; 
+	foot_width_ratio = .8;
+	hip_width# = upflag_width# - hip_thickness#/2;
+
+	foot_depth# =  3 staff_space# - blot_diameter#/2;
+
+	set_char_box(0, hip_width# 
+ 		+ stemthickness#/2 + right_upflag_space#, 
+		 foot_depth# + foot_thickness#/2, stemthickness#/2)
+
+	define_pixels(flare, hip_width, hip_thickness,
+		foot_depth, foot_thickness);
+	draw_flag((0,0), flare, 
+		(hip_width, foot_depth), 
+		hip_depth_ratio, foot_width_ratio, hip_thickness, foot_thickness);
+
+	draw_square_block ((-.5 stemthickness,-1 staff_space),
+			   (0, 0));
+fet_endchar;
+
+fet_beginchar("16th Flag (up)", "u4", "sixteenthflag")
+	save flare, 
+		hip_depth_ratio, hip_width,
+		foot_depth, foot_width_ratio;
+	save flagspace, total_depth, flag_count;
+	total_depth# = 3.5 staff_space# - blot_diameter# /2 ;
+	flag_count = 2;
+	flare# = .85 staff_space#;
+	flagspace# = .85 staff_space#;	
+	hip_depth_ratio = .72 ;
+	hip_width# = upflag_width# - hip_thickness#/2;
+	flagspace# + foot_depth# = total_depth#;
+
+	foot_width_ratio = .8;
+
+	set_char_box(0, hip_width#
+		+ stemthickness#/2 + right_upflag_space#, 
+		total_depth# + foot_thickness#/2, stemthickness#/2)
+
+	define_pixels(flare, hip_width, hip_thickness,
+		flagspace,
+		foot_depth,  foot_thickness);
+	draw_flag((0, - flagspace ), flare, 
+		(hip_width, foot_depth), 
+		hip_depth_ratio,foot_width_ratio, hip_thickness, foot_thickness);
+
+	add_flag(flagspace, flare,
+		.97, 1.00, 1.25, hip_thickness, foot_thickness);  
+
+	pickup pencircle scaled stemthickness;
+
+	draw_square_block ((-.5 stemthickness,0),
+			   (0, -2 staff_space));
+fet_endchar;
+
+
+fet_beginchar("32nd Flag (up)", "u5", "thirtysecondflag")
+	save flare, 
+		hip_depth_ratio, hip_width,
+		foot_depth, foot_width_ratio;
+	save flagspace, total_depth, flag_count;
+	flag_count = 3;
+	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#;
+
+	foot_width_ratio = .8;
+
+	set_char_box(0, hip_width#
+		+  right_upflag_space#, 
+		total_depth# + foot_thickness#/2, stemthickness#/2)
+
+	define_pixels(flare, hip_width, hip_thickness,
+		flagspace,
+		foot_depth,  foot_thickness);
+
+	draw_flag((0,- 2 flagspace), flare, 
+		(hip_width, foot_depth), 
+		hip_depth_ratio,foot_width_ratio, hip_thickness, foot_thickness);
+
+	add_flag(flagspace, flare,
+		.97, 1.00, 1.25, hip_thickness, foot_thickness);  
+
+	add_flag(flagspace, flare,
+		.95, 1.05, 1.25, hip_thickness, foot_thickness);  
+
+
+
+	draw_square_block ((-.5 stemthickness,0),
+			   (0, -3 staff_space));
+fet_endchar;
+
+fet_beginchar("64th Flag (up)", "u6", "sixtyfourthflag")
+	save flare, 
+		hip_depth_ratio, hip_width,
+		foot_depth, foot_width_ratio;
+	save flagspace, total_depth, flag_count;
+	
+	flag_count = 4;
+	flare# = .85 staff_space#;
+	flagspace# = .9 staff_space#;	
+	hip_depth_ratio = .72 ;
+	hip_width# = upflag_width# - hip_thickness#/2;
+	total_depth# = 5.25 staff_space#;
+	(flag_count-1) * flagspace# + foot_depth# = total_depth#;
+
+	foot_width_ratio = .8;
+
+	set_char_box(0, hip_width#
+		+  right_upflag_space#, 
+		total_depth# + foot_thickness#/2, stemthickness#/2)
+
+	define_pixels(flare, hip_width, hip_thickness,
+		flagspace,
+		foot_depth,  foot_thickness);
+
+	draw_flag((0,- (flag_count-1)* flagspace), flare, 
+		(hip_width, foot_depth), 
+		hip_depth_ratio,foot_width_ratio, hip_thickness, foot_thickness);
+
+	add_flag(flagspace, flare,
+		.97, 1.00, 1.3, hip_thickness, foot_thickness);  
+
+	add_flag(flagspace, flare,
+		1.00, 1.00, 1.25, hip_thickness, foot_thickness);  
+	add_flag(flagspace, flare,
+		.95, 1.05, 1.25, hip_thickness, foot_thickness);  
+
+	draw_square_block ((-.5 stemthickness,0),
+			   (0, -4 staff_space));
+fet_endchar;
+
+fet_beginchar("8th (down)", "d3", "deighthflag")
+	save flare, 
+		hip_depth_ratio, hip_width,
+		foot_depth, foot_width_ratio;
+	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;
 
-fet_beginchar("8th Flag (up)", "3u", "eighthflag")
-	set_char_box(stemthickness# /2, hip_width# + hip_thickness#/2, 
-		foot_depth# + foot_thickness#/2, stemthickness#/2)
+	set_char_box(0, hip_width#
+		+  right_downflag_space#,
+		total_depth# + foot_thickness#/2, stemthickness#/2)
+
+	define_pixels(flare, hip_width, hip_thickness,
+		flagspace,
+		foot_depth,  foot_thickness);
+
+	draw_flag((0,- (flag_count-1) *flagspace), flare, 
+		(hip_width, foot_depth), 
+		hip_depth_ratio,foot_width_ratio, hip_thickness, foot_thickness);
+	draw_square_block ((-.5 stemthickness,0),
+			   (0, - staff_space));
+
+        y_mirror_char;
+fet_endchar;
+
+%%%%%%%%
+%
+%
+%
+% Single Stroke for Short Appogiatura
+%
+%
+%
+
+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# +  right_upflag_space#, 
+	  foot_depth# * hip_depth_ratio, -flare#)
+
+ 	pickup pencircle scaled 1.5 stemthickness;
+ 	draw (-b ,-d) ..
+ 	  (w, h);
 
-	draw_eight_flag;	
-	penlabels(0, 1, 2, 3, 4);
 fet_endchar;
 
-fet_beginchar("8th Flag (down)", "3d", "deighthflag")
-	set_char_box(stemthickness# /2, hip_width# + hip_thickness#/2, 
-		foot_depth# + foot_thickness#/2, stemthickness#/2)
+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# +  right_downflag_space#,
+	  foot_depth# * hip_depth_ratio, -flare#)
 
-	draw_eight_flag;
+ 	pickup pencircle scaled 1.5 stemthickness;
+ 	draw (-b ,-d) ..
+ 	  (w, h);
 	y_mirror_char;
 fet_endchar;
 
-fet_endgroup("floogbars")
+fet_beginchar("16th (down)", "d4", "dsixteenthflag")
+	save flare, 
+		hip_depth_ratio, hip_width,
+		foot_depth, foot_width_ratio;
+	save flagspace, total_depth, flag_count;
+	
+	flag_count = 2;
+	flare# = .8 staff_space#;
+	flagspace# = .9 staff_space#;	
+	hip_depth_ratio = .85 ;
+	hip_width# = downflag_width# - hip_thickness#/2;
+	total_depth# = 3.0 staff_space# - blot_diameter# /2;
+	(flag_count-1) * flagspace# + foot_depth# = total_depth#;
+
+	foot_width_ratio = .95;
+
+	set_char_box(0, hip_width#
+		+  right_downflag_space#, 
+		total_depth# + foot_thickness#/2, stemthickness#/2)
+
+	define_pixels(flare, hip_width, hip_thickness,
+		flagspace,
+		foot_depth,  foot_thickness);
+
+	draw_flag((0,- (flag_count-1) *flagspace), flare, 
+		(hip_width, foot_depth), 
+		hip_depth_ratio,foot_width_ratio, hip_thickness, foot_thickness);
+	add_flag(flagspace, flare,
+		.95, 1.00, 1.25, hip_thickness, foot_thickness);  
+
+	
+	draw_square_block ((-.5 stemthickness,0),
+			   (0, - 2 staff_space));
+
+
+	y_mirror_char;
+fet_endchar;
+
+fet_beginchar("32nd (down)", "d5", "dthirtysecondflag")
+	save flare, 
+		hip_depth_ratio, hip_width,
+		foot_depth, foot_width_ratio;
+	save flagspace, total_depth, flag_count;
+	
+	flag_count = 3;
+	flare# = .84 staff_space#;
+	flagspace# = .9 staff_space#;	
+	hip_depth_ratio = .85 ;
+	hip_width# = downflag_width# - hip_thickness#/2;
+	total_depth# = 3.85 staff_space#;
+	(flag_count-1) * flagspace# + foot_depth# = total_depth#;
+
+	foot_width_ratio = .95;
+
+	set_char_box(0, hip_width#
+		+  right_downflag_space#, 
+		total_depth# + foot_thickness#/2, stemthickness#/2)
+
+	define_pixels(flare, hip_width, hip_thickness,
+		flagspace,
+		foot_depth,  foot_thickness);
+
+	draw_flag((0,- (flag_count-1) *flagspace), flare, 
+		(hip_width, foot_depth), 
+		hip_depth_ratio,foot_width_ratio, hip_thickness, foot_thickness);
+	add_flag(flagspace, flare,
+		.97, 1.00, 1.25, hip_thickness, foot_thickness);  
+
+	add_flag(flagspace, flare,
+		.95, 1.05, 1.25, hip_thickness, foot_thickness);  
+	draw_square_block ((-.5 stemthickness,0),
+			   (0, - 3 staff_space));
+
+
+	y_mirror_char;
+fet_endchar;
+fet_beginchar("64th (down)", "d6", "dsixtyfourthflag")
+	save flare, 
+		hip_depth_ratio, hip_width,
+		foot_depth, foot_width_ratio;
+	save flagspace, total_depth, flag_count;
+	
+	flag_count = 4;
+	flare# = .8 staff_space#;
+	flagspace# = .9 staff_space#;	
+	hip_depth_ratio = .85 ;
+	hip_width# = downflag_width# - hip_thickness#/2;
+	total_depth# = 4.35 staff_space#;
+	(flag_count-1) * flagspace# + foot_depth# = total_depth#;
+
+	foot_width_ratio = .98;
+
+	set_char_box(0, hip_width#
+		+ right_downflag_space#, 
+		total_depth# + foot_thickness#/2, stemthickness#/2)
+
+	define_pixels(flare, hip_width, hip_thickness,
+		flagspace,
+		foot_depth,  foot_thickness);
+
+	draw_flag((0,- (flag_count-1) *flagspace), flare, 
+		(hip_width, foot_depth), 
+		hip_depth_ratio,foot_width_ratio, hip_thickness, foot_thickness);
+	add_flag(flagspace, flare,
+		.97, 1.20, 1.175, hip_thickness, foot_thickness);  
+	add_flag(flagspace, flare,
+		.97, 1.10, 1.175, hip_thickness, foot_thickness);  
+
+	add_flag(.98 flagspace, flare,
+		.91, 1.05, 1.2, hip_thickness, foot_thickness);  
+
+	draw_square_block ((-.5 stemthickness,0),
+			   (0, - 4 staff_space));
+
+	y_mirror_char;
+fet_endchar;
+
+
+
+fet_endgroup("flags");