X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=mf%2Ffeta-toevallig.mf;h=48061fcd0533eaae09d74208ce95addde680720e;hb=207dd9350ecbcea14ebc5d45dadf45076ffc557f;hp=1f2690dd5e1d7f55c2ba1001c6023d0c049f082c;hpb=157d98c1870868bf59c1691577444e3c3d533bc4;p=lilypond.git

diff --git a/mf/feta-toevallig.mf b/mf/feta-toevallig.mf
index 1f2690dd5e..48061fcd05 100644
--- a/mf/feta-toevallig.mf
+++ b/mf/feta-toevallig.mf
@@ -1,7 +1,7 @@
 %
 % feta-toevallig.mf -- implement Accidentals
 %
-% (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+% (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 %
 
 
@@ -44,6 +44,87 @@ enddef;
 
 fet_begingroup ("accidentals");
 
+%
+% Draw an arrow
+%
+% * `stemslant' gives the direction of the stem's left boundary
+%   (needed for brushed stems, equals "up" for straight stems)
+% * `extend' is used to make the stem longer or shorter (if negative);
+%   different kinds of accidentals need different values here
+%
+def draw_arrow (expr attach, stemwidth, stemslant, extend, pointingdown) =
+begingroup;
+	save htip;  % tip height
+	save wwing; % wing `radius'
+	save angle_wing_bot, angle_wing_top, angle_tip;
+	save upshift;
+	clearxy;
+
+	wwing := 0.26 stemwidth;
+	htip := staff_space * 0.85 + stafflinethickness - wwing;
+
+	% `flip' is used to reflect the arrow vertically
+	% if arrow points downward
+	transform flip;
+	if pointingdown:
+		flip = identity reflectedabout (origin, right);
+	else:
+		flip = identity;
+	fi;
+
+	z1 = attach shifted (-stemwidth / 2, 0);
+	upshift := max (0, wwing + 0.1 staff_space + extend);
+	z2 = z1 shifted (((unitvector stemslant)
+			  scaled upshift) transformed flip);
+
+	z7 = attach shifted ((stemwidth/2),0);
+	z6 = z7 shifted (((unitvector (-xpart stemslant, ypart stemslant))
+			  scaled upshift) transformed flip);
+	z2 - z3 = ( 0.38 staff_space, 0.05 htip) transformed flip;
+	z6 - z5 = (-0.38 staff_space, 0.05 htip) transformed flip;
+
+	z4 = attach shifted ((-0.2 stemwidth, upshift + htip)
+			     transformed flip);
+	z4'= attach shifted (( 0.2 stemwidth, upshift + htip)
+			     transformed flip);
+
+	% `angle_wing_bot' is the angle at which the arc
+	% from z2 to z3a enters z3a
+	% `angle_wing_top' is the angle at which the arc
+	% from z3b to z4 leaves z3b
+	% `angle_tip' is the angle at which the arc
+	% from z4 to z4' leaves z4
+	angle_wing_bot = 30;
+	angle_wing_top = 55;
+	angle_tip = 68;
+
+	z3a = z3 shifted ((((dir angle_wing_bot) rotated -90)
+			   scaled wwing) transformed flip);
+	z3b = z3 shifted ((((dir angle_wing_top) rotated 90)
+			   scaled wwing) transformed flip);
+
+	z5a = z5 shifted ((((dir (180 - angle_wing_bot)) rotated 90)
+			   scaled wwing) transformed flip);
+	z5b = z5 shifted ((((dir (180 - angle_wing_top)) rotated -90)
+			   scaled wwing) transformed flip);
+
+	% Draw the arrow
+	pickup pencircle scaled 1;
+	fill z1
+	     -- z2{stemslant transformed flip}
+	     .. {(-dir angle_wing_bot) transformed flip}z3a
+	     .. z3b{(dir angle_wing_top) transformed flip}
+	     .. z4{(dir angle_tip) transformed flip}
+	     .. z4'{(dir (-angle_tip)) transformed flip}
+	     .. {(dir (-angle_wing_top)) transformed flip}z5b
+	     .. z5a{(-dir (-angle_wing_bot)) transformed flip}
+	     .. z6{((-stemslant) reflectedabout (origin, up)) transformed flip}
+	     -- z7
+	     -- cycle;
+
+	labels (range 0 thru 7, 4', 3a, 3b, 5a, 5b);
+endgroup;
+enddef;
 
 save remember_pic;
 picture remember_pic;
@@ -97,17 +178,33 @@ def draw_meta_sharp (expr width, offset) =
 enddef;
 
 
-fet_beginchar ("Sharp", "sharp");
+def draw_sharp(expr arrowup, arrowdown) =
 	save stem, stemx, stemwidth;
 	save outer_space, interbeam;
+	save stemlength, extendleft, extendright, height, depth;
 
 	stemwidth# := stafflinethickness# + .05 staff_space#;
 	define_whole_blacker_pixels (stemwidth);
 
 	interbeam := 1.05 staff_space_rounded;
 
-	set_char_box (0, 1.1 staff_space#,
-		      1.5 staff_space#, 1.5 staff_space#);
+	stemlength# := 1.5 staff_space#;
+	define_pixels (stemlength);
+
+	height# = stemlength#;
+	depth# = stemlength#;
+	extendright# = 0;
+	extendleft# = 0;
+	if arrowup:
+		height# := height# + 1.2 staff_space#;
+		extendright# := extendright# + 1.5 stafflinethickness#;
+	fi;
+	if arrowdown:
+		depth# := depth# + 1.2 staff_space#;
+		extendleft# := extendleft# + 1.5 stafflinethickness#;
+	fi;
+	define_pixels (extendleft, extendright);
+	set_char_box (extendleft#, 1.1 staff_space#, depth#, height#);
 
 	stem := 7 / 16 * w;
 	stemx := hround stem;
@@ -119,23 +216,66 @@ fet_beginchar ("Sharp", "sharp");
 	draw_meta_sharp (w, -.5 interbeam);
 	draw_meta_sharp (w, -.5 interbeam + vround interbeam);
 
+	% expand the charbox so that it encloses the whole arrow;
+	% this must not happen earlier because some commands above
+	% still rely on the old width
+	w := w + extendright;
+
 	pickup pencircle scaled stemwidth;
 
 	lft x5 = lft x6 = outer_space;
 	lft x7 = lft x8 = outer_space + stemx;
-	bot y5 = -d;
+	bot y5 = -stemlength;
 	top y6 = vround (1.5 staff_space - stem * beamslope);
 	bot y7 = -top y6 + feta_space_shift;
-	top y8 = h;
+	top y8 = stemlength;
 
-	labels (5, 6, 7, 8);	
+	labels (5, 6, 7, 8);
 
 	draw_gridline (z5, z6, stemwidth);
 	draw_gridline (z7, z8, stemwidth);
 
+	if arrowup:
+		draw_arrow (z8, stemwidth, up,
+			    stafflinethickness / 2 + stemwidth / 2, false);
+	fi;
+	if arrowdown:
+		draw_arrow (z5, stemwidth, up,
+			    stafflinethickness / 2 + stemwidth / 2, true);
+	fi;
+
 	remember_pic := currentpicture;
 
 	draw_staff (-2, 2, 0);
+enddef;
+
+
+fet_beginchar ("Sharp", "sharp");
+	draw_sharp (false, false);
+fet_endchar;
+
+
+draw_shifted_too;
+
+
+fet_beginchar ("Arrowed Sharp (arrow up)", "sharp.arrowup");
+	draw_sharp (true, false);
+fet_endchar;
+
+
+draw_shifted_too;
+
+
+fet_beginchar ("Arrowed Sharp (arrow down)", "sharp.arrowdown");
+	draw_sharp (false, true);
+fet_endchar;
+
+
+draw_shifted_too;
+
+
+fet_beginchar ("Arrowed Sharp (arrows up and down)", "sharp.arrowboth");
+	draw_sharp (true, true);
 fet_endchar;
 
 
@@ -329,9 +469,11 @@ draw_shifted_too;
 % The stems of the natural are brushed (at least, in Barenreiter SCS)
 %
 
-fet_beginchar ("Natural", "natural");
+def draw_natural (expr arrowup, arrowdown) =
 	save stemwidth, top_stem_thick;
 	save ne, pat_top, pat_bottom;
+	save depth, height, extendleft, extendright, stemlength;
+	save brush_scale_up, brush_scale_down;
 	pair ne;
 	path pat_top, pat_bottom;
 
@@ -339,39 +481,68 @@ fet_beginchar ("Natural", "natural");
 	stemwidth# = 0.09 staff_space# + .5 stafflinethickness#;
 	define_whole_blacker_pixels (top_stem_thick, stemwidth);
 
-	set_char_box (0, 2/3 staff_space#,
-		      1.5 staff_space#, 1.5 staff_space#);
+	stemlength# = 1.5 staff_space#;
+	define_pixels (stemlength);
+
+	height# = stemlength#;
+	depth# = stemlength#;
+	extendleft# = 0;
+	extendright# = 0;
+	if arrowup:
+		extendleft# := 3 stafflinethickness#;
+		height# := height# + 1.2 staff_space#;
+	fi;
+	if arrowdown:
+		extendright# := 3.15 stafflinethickness#;
+		depth# := depth# + 1.2 staff_space#;
+	fi;
+	define_pixels (extendright);
+
+	set_char_box (extendleft#, 2/3 staff_space#, depth#, height#);
 
 	d := d - feta_space_shift;
 
 	pickup pencircle scaled stemwidth;
 
+	brush_scale_up := 1.0;
+	brush_scale_down := 1.0;
+	% to look nice, arrowed stems must be less brushed
+	if arrowup:
+		brush_scale_up := 0.85;
+	fi;
+	if arrowdown:
+		brush_scale_down := 0.85;
+	fi;
+
 	penpos1 (top_stem_thick, 0);
 	penpos3 (top_stem_thick, 0);
 	penpos2 (stemwidth, 0);
 	penpos4 (stemwidth, 0);
+	% z1' and z3' are needed for the arrowed accidentals
+	penpos1' (top_stem_thick * brush_scale_up, 0);
+	penpos3' (top_stem_thick * brush_scale_down, 0);
 
 	x2r = w;
 	x4l = 0;
-	x3 = x2;
-	x1 = x4;
+	x3 = x3' = x2;
+	x1 = x1' = x4;
 
-	y1 = h;
-	y3 = -d;
+	y1 = y1' = stemlength;
+	y3 = y3' = -stemlength;
 	top y2 = vround (staff_space - 3/2 stafflinethickness);
 	y4 = -y2 + feta_space_shift;
 
 	pat_bottom := z4r{z4r - z1r}
 		      .. bot z4
 		      .. z4l{z1l - z4l};
-	fill simple_serif (z1l, z1r, -30)
+	fill simple_serif (z1'l, z1'r, -30)
 	     -- pat_bottom
 	     -- cycle;
 
 	pat_top := z2r{z2r - z3r}
 		   .. top z2
 		   .. z2l{z3l - z2l};
-	fill simple_serif (z3l, z3r, 30)
+	fill simple_serif (z3'l, z3'r, 30)
 	     -- pat_top
 	     -- cycle;
 
@@ -408,12 +579,51 @@ fet_beginchar ("Natural", "natural");
 	     -- z24
 	     -- cycle;
 
-	penlabels (1, 2, 3, 4);
+	penlabels (1, 1', 2, 3, 3', 4);
 	labels (11, 11', 12, 13, 14, 21, 21', 22, 23, 24);
 
+	if arrowup:
+		draw_arrow (z1, top_stem_thick * brush_scale_up,
+			    z1'l - z4l, stafflinethickness / 2, false);
+	fi;
+	if arrowdown:
+		draw_arrow (z3, top_stem_thick * brush_scale_down,
+			    z2r - z3'r, stafflinethickness / 2, true);
+		w := w + extendright;
+	fi;
+
 	remember_pic := currentpicture;
 
 	draw_staff (-2, 2, 0);
+enddef;
+
+
+fet_beginchar ("Natural", "natural");
+	draw_natural (false, false);
+fet_endchar;
+
+
+draw_shifted_too;
+
+
+fet_beginchar ("Arrowed Natural (arrow up)", "natural.arrowup");
+	draw_natural (true, false);
+fet_endchar;
+
+
+draw_shifted_too;
+
+
+fet_beginchar ("Arrowed Natural (arrow down)", "natural.arrowdown");
+	draw_natural (false, true);
+fet_endchar;
+
+
+draw_shifted_too;
+
+
+fet_beginchar ("Arrowed Natural (arrows up and down)", "natural.arrowboth");
+	draw_natural (true, true);
 fet_endchar;
 
 
@@ -431,15 +641,16 @@ draw_shifted_too;
 % TODO: document, simplify!
 %
 
-def draw_meta_flat (expr xcenter, w, crook_fatness) =
+def draw_meta_flat (expr xcenter, w, crook_fatness, arrowup, arrowdown) =
 	save crook_thinness;
 	save bottom_overshoot, bot_crook_dir;
-	save top_stem_thick, bottom_stem_thick, hair, smaller_hole;
+	save top_stem_thick, top_stem_thick_orig;
+	save bottom_stem_thick, hair, smaller_hole;
 	save top_crook_thinness;
 	save zwiep;
 	save center;
 	pair center, bot_crook_dir;
-	save clearing;
+	save clearing, clearing_orig;
 
 	clearxy;
 
@@ -453,18 +664,31 @@ def draw_meta_flat (expr xcenter, w, crook_fatness) =
 	else:
 		smaller_hole = 0;
 	fi;
-	clearing = 1.7 stafflinethickness;
 	crook_thinness = .7 stafflinethickness + .06 staff_space;
 	top_crook_thinness = 1 stafflinethickness + .065 staff_space;
+	clearing = 1.7 stafflinethickness;
+	clearing_orig = clearing;
+	if arrowup:
+		clearing := 0.5 staff_space;
+	fi;
 	bottom_overshoot = stafflinethickness;
 
 	bottom_stem_thick# = 0.06 staff_space# + 0.6 stafflinethickness#;
 	top_stem_thick# = 0.1 staff_space# + 1.2 stafflinethickness#;
-	define_whole_blacker_pixels (bottom_stem_thick, top_stem_thick);
+	top_stem_thick_orig# = top_stem_thick#;
+	if arrowup:
+		% to look nice, arrowed stems should be less brushed
+		top_stem_thick# := top_stem_thick# * 0.8;
+	fi;
+	define_whole_blacker_pixels (bottom_stem_thick, top_stem_thick,
+				     top_stem_thick_orig);
 
 	if odd (top_stem_thick - bottom_stem_thick):
 		top_stem_thick := top_stem_thick - 1;
 	fi;
+	if odd (top_stem_thick_orig - bottom_stem_thick):
+		top_stem_thick_orig := top_stem_thick_orig - 1;
+	fi;
 
 	center = (xcenter, 0);
 
@@ -472,13 +696,22 @@ def draw_meta_flat (expr xcenter, w, crook_fatness) =
 	y1 = vround (2 staff_space - clearing);
 	x2l = hround (xcenter - .5 bottom_stem_thick);
 	y2 = -.5 staff_space - .5 stafflinethickness;
+	% z16 and the `*_orig' variables are needed for arrowed accidentals
+	% because their inner part should be unchanged from plain ones but
+	% the points z3l, z3r, and z10 depend on values that are different
+	% for arrowed accidentals
+	x16l = hround (xcenter -.5 top_stem_thick_orig);
+	y16 = vround (2 staff_space - clearing_orig);
 
 	penpos1 (top_stem_thick, 0);
+	penpos16 (top_stem_thick_orig, 0);
 	penpos2 (bottom_stem_thick, 0);
 
 	y3l = vfloor ((staff_space - stafflinethickness) / 2);
 	z3l = whatever [z2r, z1r];
-	z3r = .3 [z2r, z1r] + (smaller_hole, 0);
+	z3r = .3 [z2r,
+		  (z16r shifted (0, clearing_orig - 1.7 stafflinethickness))]
+	      + (smaller_hole, 0);
 	x3r := hceiling x3r;
 
 	% we insert z3l to get better conversion with mf2pt1
@@ -488,7 +721,7 @@ def draw_meta_flat (expr xcenter, w, crook_fatness) =
 	     -- z3l
 	     -- cycle;
 
-	z10 = whatever [z2r, z1r] + (smaller_hole, 0);
+	z10 = whatever [z2r, z16r] + (smaller_hole, 0);
 	y10 = -1/10 staff_space;
 	x10 := hceiling x10;
 
@@ -496,6 +729,9 @@ def draw_meta_flat (expr xcenter, w, crook_fatness) =
 	y11 = -vround (.5 (staff_space + stafflinethickness)
 		       + bottom_overshoot);
 
+	x2a = 0.2[x2r, x7];
+	y2a = 1.5[y2, y11];
+
 	penpos4 (whatever, 53);
 
 	y4l - y4r = top_crook_thinness;
@@ -524,25 +760,62 @@ def draw_meta_flat (expr xcenter, w, crook_fatness) =
 	       .. z10{z3r - z10}
 	       -- cycle;
 
-	fill z2l{down}
-	     .. z11{right}
-	     .. z8{bot_crook_dir}
-	     .. z5l{up}
-	     .. z4l{left}
-	     .. z3l
-	     -- cycle;
+	if arrowdown:
+		fill z2l{down}
+		     .. z2a{up}
+		     .. z8{bot_crook_dir}
+		     .. z5l{up}
+		     .. z4l{left}
+		     .. z3l
+		     -- cycle;
+	else:
+		fill z2l{down}
+		     .. z11{right}
+		     .. z8{bot_crook_dir}
+		     .. z5l{up}
+		     .. z4l{left}
+		     .. z3l
+		     -- cycle;
+	fi;
+
+	if arrowup:
+		draw_arrow (z1, top_stem_thick, z1l - z2l,
+			    0.5 stafflinethickness, false);
+	fi;
+	if arrowdown:
+		draw_arrow ((0.5 [x2l, x2a], y2), x2a - x2l, up,
+			    staff_space / 2, true);
+	fi;
 enddef;
 
 
+def draw_arrowed_meta_flat (expr xcenter, width, crook_fatness,
+				 arrowup, arrowdown) =
+	save depth, height, extendleft;
+
+	depth# = 0.6 staff_space#;
+	height# = 1.9 staff_space#;
+	extendleft# := 1.2 stafflinethickness#;
+	if arrowup:
+		extendleft# := 3.45 stafflinethickness#;
+		height# := height# + 0.8 staff_space#;
+	fi;
+	if arrowdown:
+		extendleft# := 3.45 stafflinethickness#;
+		depth# := depth# + 1.6 staff_space#;
+	fi;
+
+	set_char_box (extendleft#, width, depth#, height#);
+	draw_meta_flat(xcenter, w, crook_fatness, arrowup, arrowdown);
+enddef;
+
 %
 % unfortunately, 600dpi is not enough to show the brush of the stem.
 %
 
 fet_beginchar ("Flat", "flat");
-	set_char_box (1.2 stafflinethickness#, .8 staff_space#,
-		      0.6 staff_space#, 1.9 staff_space#);
-
-	draw_meta_flat (0, w, 0.31 staff_space);
+	draw_arrowed_meta_flat (0, 0.8 staff_space#, 0.31 staff_space,
+				false, false);
 	penlabels (range 0 thru 11);
 
 	remember_pic := currentpicture;
@@ -554,11 +827,53 @@ fet_endchar;
 draw_shifted_too;
 
 
+fet_beginchar ("Arrowed Flat (arrow up)", "flat.arrowup");
+	draw_arrowed_meta_flat (0, 0.8 staff_space#, 0.31 staff_space,
+				true, false);
+	penlabels (range 0 thru 23);
+
+	remember_pic := currentpicture;
+
+	draw_staff (-2, 2, 0);
+fet_endchar;
+
+
+draw_shifted_too;
+
+
+fet_beginchar ("Arrowed Flat (arrow down)", "flat.arrowdown");
+	draw_arrowed_meta_flat (0, 0.8 staff_space#, 0.31 staff_space,
+				false, true);
+	penlabels (range 0 thru 23);
+
+	remember_pic := currentpicture;
+
+	draw_staff (-2, 2, 0);
+fet_endchar;
+
+
+draw_shifted_too;
+
+
+fet_beginchar ("Arrowed Flat (arrow up and down)", "flat.arrowboth");
+	draw_arrowed_meta_flat (0, 0.8 staff_space#, 0.31 staff_space,
+				true, true);
+	penlabels (range 0 thru 23);
+
+	remember_pic := currentpicture;
+
+	draw_staff (-2, 2, 0);
+fet_endchar;
+
+
+draw_shifted_too;
+
+
 fet_beginchar ("Flat (slashed)", "flat.slash");
 	set_char_box (.4 staff_space#, .8 staff_space#,
 		      0.6 staff_space#, 1.9 staff_space#);
 
-	draw_meta_flat (0, w, 0.31 staff_space);
+	draw_meta_flat (0, w, 0.31 staff_space, false, false);
 
 	clearxy;
 
@@ -597,7 +912,7 @@ fet_beginchar ("Flat (slashed twice)", "flat.slashslash");
 	set_char_box (.4 staff_space#, .8 staff_space#,
 		      0.6 staff_space#, 1.9 staff_space#);
 
-	draw_meta_flat (0, w, 0.31 staff_space);
+	draw_meta_flat (0, w, 0.31 staff_space, false, false);
 
 	clearxy;
 
@@ -776,7 +1091,7 @@ fet_beginchar ("Semi flat", "mirroredflat");
 	set_char_box (1.2 stafflinethickness#, .8 staff_space#,
 		      0.6 staff_space#, 1.9 staff_space#);
 
-	draw_meta_flat (0, w, 0.31 staff_space);
+	draw_meta_flat (0, w, 0.31 staff_space, false, false);
 	currentpicture := currentpicture xscaled -1 shifted (w - b, 0);
 fet_endchar;
 
@@ -785,7 +1100,7 @@ fet_beginchar ("Semi flat", "mirroredflat.backslash");
 	set_char_box (.4 staff_space#, .8 staff_space#,
 		      0.6 staff_space#, 1.9 staff_space#);
 
-	draw_meta_flat (0, w, 0.31 staff_space);
+	draw_meta_flat (0, w, 0.31 staff_space, false, false);
 
 	clearxy;
 
@@ -827,9 +1142,11 @@ fet_beginchar ("Double Flat", "flatflat");
 	set_char_box (1.2 stafflinethickness#,
 		      (left_wid + right_wid - overlap) * staff_space#,
 		      .6 staff_space#, 1.9 staff_space#);
-	draw_meta_flat (0, left_wid * staff_space, 1/3 staff_space);
+	draw_meta_flat (0, left_wid * staff_space, 1/3 staff_space,
+			false, false);
 	draw_meta_flat (hround ((left_wid - overlap) * staff_space),
-			right_wid * staff_space, 1/3 staff_space);
+			right_wid * staff_space, 1/3 staff_space,
+			false, false);
 fet_endchar;
 
 
@@ -843,9 +1160,11 @@ fet_beginchar ("3/4 Flat", "flatflat.slash");
 	set_char_box (1.2 stafflinethickness#,
 		      (left_wid + right_wid - overlap) * staff_space#,
 		      .6 staff_space#, 1.9 staff_space#);
-	draw_meta_flat (0, left_wid * staff_space, 1/3 staff_space);
+	draw_meta_flat (0, left_wid * staff_space, 1/3 staff_space,
+			false, false);
 	draw_meta_flat (hround ((left_wid - overlap) * staff_space),
-			right_wid * staff_space, 1/3 staff_space);
+			right_wid * staff_space, 1/3 staff_space,
+			false, false);
 
 	%% maybe we should clip part of the stems?
 	%% or make the 1st flat smaller?