From: Werner Lemberg <wl@gnu.org>
Date: Thu, 29 Mar 2007 11:38:50 +0000 (+0200)
Subject: improve some accidental shapes
X-Git-Tag: release/2.11.22-1~17^2~1
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=8943476ee0c8992d8c67e68f380c13eff8906083;p=lilypond.git

improve some accidental shapes

(sharp.slashslashslash.stemstem, sharp.slashslashslash.stem): Make slashes
parallel.
(flat.slash, flat.slashslash, mirroredflag.backslash): Fix slash shapes for
mf2pt1.
(mirroredflat.flat): Rewritten, mainly for mf2pt1.
---

diff --git a/mf/feta-toevallig.mf b/mf/feta-toevallig.mf
index 652d920276..0008ffa04c 100644
--- a/mf/feta-toevallig.mf
+++ b/mf/feta-toevallig.mf
@@ -31,12 +31,14 @@ enddef;
 %
 % Naming for accidentals (including microtonal variants):
 %
-%   BASES.SLASHES.STEMS
+%   SHARPBASE[.SLASHES.STEMS]
+%   FLATBASE[.MODIFIER]
 %  
 % Examples:
 %
-%   mirroredflat.flat.slashslash
-%   sharp.slashslash.stemstem     (the standard sharp sign)
+%   sharp.slashslash.stem
+%   mirroredflat.flat
+%
 %
 
 
@@ -187,7 +189,6 @@ fet_beginchar ("Sharp (3 beams)", "sharp.slashslashslash.stemstem");
 
 	sharp_beamheight# := 0.22 staff_space# + stafflinethickness#;
 
-
 	stemwidth# := stafflinethickness# + .05 staff_space#;
 	define_whole_blacker_pixels (stemwidth);
 
@@ -204,8 +205,9 @@ fet_beginchar ("Sharp (3 beams)", "sharp.slashslashslash.stemstem");
 	d := d - feta_space_shift;
 
 	draw_meta_sharp (.88 w, -.5 interbeam);
-	draw_meta_sharp (w, 0);
 	draw_meta_sharp (.88 w, -.5 interbeam + vround interbeam);
+	sharp_beamheight# := 1/.88 sharp_beamheight#;
+	draw_meta_sharp (w, 0);
 
 	pickup pencircle scaled stemwidth;
 
@@ -252,8 +254,9 @@ fet_beginchar ("1/2 Sharp (3 beams)", "sharp.slashslashslash.stem");
 	d := d - feta_space_shift;
 
 	draw_meta_sharp (.8 w, -.5 interbeam);
-	draw_meta_sharp (w, 0);
 	draw_meta_sharp (.8 w, -.5 interbeam + vround interbeam);
+	sharp_beamheight# := 1/.8 sharp_beamheight#;
+	draw_meta_sharp (w, 0);
 
 	pickup pencircle scaled stemwidth;
 
@@ -449,7 +452,7 @@ def draw_meta_flat (expr xcenter, w, crook_fatness) =
 		smaller_hole = 0.35 stafflinethickness;
 	else:
 		smaller_hole = 0;
-	fi
+	fi;
 	clearing = 1.7 stafflinethickness;
 	crook_thinness = .7 stafflinethickness + .06 staff_space;
 	top_crook_thinness = 1 stafflinethickness + .065 staff_space;
@@ -563,13 +566,27 @@ fet_beginchar ("Flat (slashed)", "flat.slash");
 	slope = 0.5;
 	slash_width = w;
 
-	z1 = (0, h / 2);
-	z2 = z1 - (slash_width, slash_width * slope) / 2;
-	z3 = z1 + (slash_width, slash_width * slope) / 2;
+	z11 = (0, h / 2);
+	z12 = z11 - (slash_width, slash_width * slope) / 2;
+	z13 = z11 + (slash_width, slash_width * slope) / 2;
+	penpos12 (1.5 stafflinethickness, angle (z13 - z12) - 90);
+	penpos13 (1.5 stafflinethickness, angle (z13 - z12) - 90);
+
+	z14 = z12 - .75 stafflinethickness * unitvector (z13 - z12);
+	z15 = z13 + .75 stafflinethickness * unitvector (z13 - z12);
+
+	fill z13r
+	     .. z15
+	     .. z13l
+	     -- z12l
+	     .. z14
+	     .. z12r
+	     -- z13r
+	     .. cycle;
+
+	penlabels (12, 13);
+	labels (14, 15);
 
-	pickup pencircle scaled 1.5 stafflinethickness;
-	draw z2 .. z3;
-	labels (1, 2, 3);
 	remember_pic := currentpicture;
 
 	draw_staff (-2, 2, 0);
@@ -588,15 +605,48 @@ fet_beginchar ("Flat (slashed twice)", "flat.slashslash");
 	slope = 0.5;
 	slash_width = w;
 
-	z1 = (0, 5/12 h);
-	z2 = (0, 2/3 h);
+	z11 = (0, 5/12 h);
+	z12 = z11 - (slash_width, slash_width * slope) / 2;
+	z13 = z11 + (slash_width, slash_width * slope) / 2;
+	penpos12 (1.5 stafflinethickness, angle (z13 - z12) - 90);
+	penpos13 (1.5 stafflinethickness, angle (z13 - z12) - 90);
+
+	z14 = z12 - .75 stafflinethickness * unitvector (z13 - z12);
+	z15 = z13 + .75 stafflinethickness * unitvector (z13 - z12);
+
+	fill z13r
+	     .. z15
+	     .. z13l
+	     -- z12l
+	     .. z14
+	     .. z12r
+	     -- z13r
+	     .. cycle;
+
+	penlabels (12, 13);
+	labels (14, 15);
+
+	z21 = (0, 2/3 h);
+	z22 = z21 - (slash_width, slash_width * slope) / 2;
+	z23 = z21 + (slash_width, slash_width * slope) / 2;
+	penpos22 (1.5 stafflinethickness, angle (z23 - z22) - 90);
+	penpos23 (1.5 stafflinethickness, angle (z23 - z22) - 90);
+
+	z24 = z22 - .75 stafflinethickness * unitvector (z23 - z22);
+	z25 = z23 + .75 stafflinethickness * unitvector (z23 - z22);
+
+	fill z23r
+	     .. z25
+	     .. z23l
+	     -- z22l
+	     .. z24
+	     .. z22r
+	     -- z23r
+	     .. cycle;
+
+	penlabels (22, 23);
+	labels (24, 25);
 
-	pickup pencircle scaled 1.5 stafflinethickness;
-	draw z1 - (slash_width, slash_width * slope) / 2
-	     .. z1 + (slash_width, slash_width * slope) / 2;
-	draw z2 - (slash_width, slash_width * slope) / 2
-	     .. z2 + (slash_width, slash_width * slope) / 2;
-	labels (1, 2);
 	remember_pic := currentpicture;
 
 	draw_staff (-2, 2, 0);
@@ -607,12 +657,111 @@ fet_beginchar ("Flatflat (mirrored)", "mirroredflat.flat");
 	set_char_box (0, 1.6 staff_space#, 
 		      0.6 staff_space#, 1.9 staff_space#);
 
-	draw_meta_flat (0, w/2, 0.31 staff_space);
-	currentpicture := currentpicture xscaled -1;
-	draw_meta_flat (0, w/2, 0.31 staff_space);
+	% This is a modified version of `draw_meta_flat'.
+
+	save crook_thinness, crook_fatness;
+	save bottom_overshoot, bot_crook_dir;
+	save top_stem_thick, bottom_stem_thick, hair, smaller_hole;
+	save top_crook_thinness;
+	save zwiep;
+	save center;
+	pair center, bot_crook_dir;
+	save clearing, wid;
+	save pat;
+	path pat;
+
+	clearxy;
+
+	wid = w / 2;
+
+	% the stem shouldn't reach the top staff line.
+	%% TODO: should take from height.
+	%
+	% TODO: parameterize this
+	%
+	if wid >= 0.75 staff_space:
+		smaller_hole = 0.35 stafflinethickness;
+	else:
+		smaller_hole = 0;
+	fi;
+	clearing = 1.7 stafflinethickness;
+	crook_thinness = .7 stafflinethickness + .06 staff_space;
+	crook_fatness = 0.31 staff_space;
+	top_crook_thinness = 1 stafflinethickness + .065 staff_space;
+	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);
+
+	if odd (top_stem_thick - bottom_stem_thick):
+		top_stem_thick := top_stem_thick - 1;
+	fi;
+
+	center = (0, 0);
+
+	x1l = hround (-.5 top_stem_thick);
+	y1 = vround (2 staff_space - clearing);
+	x2l = hround (-.5 bottom_stem_thick);
+	y2 = -.5 staff_space - .5 stafflinethickness;
+
+	penpos1 (top_stem_thick, 0);
+	penpos2 (bottom_stem_thick, 0);
+
+	y3l = vfloor ((staff_space - stafflinethickness) / 2);
+	z3l = whatever [z2r, z1r];
+	z3r = .3 [z2r, z1r] + (smaller_hole, 0);
+	x3r := hceiling x3r;
+
+	z10 = whatever [z2r, z1r] + (smaller_hole, 0);
+	y10 = -1/10 staff_space;
+	x10 := hceiling x10;
+
+	x11 = bottom_overshoot / 3;
+	y11 = -vround (.5 (staff_space + stafflinethickness)
+		       + bottom_overshoot);
+
+	penpos4 (whatever, 53);
+
+	y4l - y4r = top_crook_thinness;
+	y5r = .15 staff_space;
+	x5l = hround (wid);
+	y4 = staff_space / 2;
+	x4r = .45 [x5r, x3r];
+	y4l := vround y4l;
+
+	penpos5 (crook_fatness, -175);
+
+	bot_crook_dir = unitvector ((x5l, 0) - z11);
+	z8 = z11 + whatever * bot_crook_dir;
+	y8 = -staff_space / 2;
+
+	z7 = z8
+	     + whatever * bot_crook_dir
+	     + crook_thinness * (bot_crook_dir rotated 90);
+	x7 = .1 [x3r, x8];
+
+	pat := z3r{z3r - z10}
+	       .. z4r{right}
+	       .. z5r{down}
+	       .. z7{-bot_crook_dir}
+	       & z7
+	       .. z10{z3r - z10}
+	       -- cycle;
+	unfill pat;
+	unfill pat xscaled -1;
+
+	pat := z11{right}
+	       .. z8{bot_crook_dir}
+	       .. z5l{up}
+	       .. z4l{left}
+	       .. z3l;
+	fill pat
+	     -- simple_serif (z1r, z1l, 30)
+	     -- reverse pat xscaled -1 shifted (-feta_eps, 0)
+	     -- cycle;
 
 	currentpicture := currentpicture shifted (w/2, 0);
-	penlabels (range 0 thru 11);
 
 	remember_pic := currentpicture;
 
@@ -644,12 +793,23 @@ fet_beginchar ("Semi flat", "mirroredflat.backslash");
 	slope = 0.5;
 	slash_width = w;
 
-	z1 = (0, h / 2);
-	z2 = z1 - (slash_width, slash_width * slope) / 2;
-	z3 = z1 + (slash_width, slash_width * slope) / 2;
+	z11 = (0, h / 2);
+	z12 = z11 - (slash_width, slash_width * slope) / 2;
+	z13 = z11 + (slash_width, slash_width * slope) / 2;
+	penpos12 (1.5 stafflinethickness, angle (z13 - z12) - 90);
+	penpos13 (1.5 stafflinethickness, angle (z13 - z12) - 90);
+
+	z14 = z12 - .75 stafflinethickness * unitvector (z13 - z12);
+	z15 = z13 + .75 stafflinethickness * unitvector (z13 - z12);
 
-	pickup pencircle scaled 1.5 stafflinethickness;
-	draw z2 .. z3;
+	fill z13r
+	     .. z15
+	     .. z13l
+	     -- z12l
+	     .. z14
+	     .. z12r
+	     -- z13r
+	     .. cycle;
 
 	currentpicture := currentpicture xscaled -1 shifted (w - b, 0);
 
@@ -705,7 +865,7 @@ fet_beginchar ("3/4 Flat", "flatflat.slash");
 	     .. z13l
 	     -- z12l
 	     .. z14
-	     .. z12 r
+	     .. z12r
 	     -- z13r
 	     .. cycle;