X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=mf%2Ffeta-slag.mf;h=101385cfec13c42082db4c51523bc6a40b847929;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=bc74235e10aec0509419843cbbc19eb3ae55cbba;hpb=9193ac6225e2beafb8ea5da2610c70dd610e03be;p=lilypond.git

diff --git a/mf/feta-slag.mf b/mf/feta-slag.mf
index bc74235e10..101385cfec 100644
--- a/mf/feta-slag.mf
+++ b/mf/feta-slag.mf
@@ -1,199 +1,315 @@
-% -*- Fundamental -*-  (emacs-20 mf mode mucks
+% -*- Fundamental -*-  (emacs-20 mf mode sucks)
 % feta-slag.mf --  implement trill symbols
-% 
-% source file of the Feta (defintively not an abbreviation for Font-En-Tja)
+%
+% source file of the Feta (definitely not an abbreviation for Font-En-Tja)
 % music font
-% 
-% (c) 1998--2004 Jan Nieuwenhuizen <janneke@gnu.org>
-% 
+%
+% (c) 1998--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+%
 
 % this file is included by feta-scripts.mf
 
 trill_thin# = 0.1 staff_space# + 0.6 stafflinethickness#;
-trill_thick# = 1/2 staff_space#;
-trill_width# = 5/12 staff_space#;
-trill_height# = 1/2staff_space#;
-trill_overlap# = 1/6 staff_space#;
+trill_stemwidth# = trill_thin#;
+define_pixels (trill_thin);
+define_whole_blacker_pixels (trill_stemwidth);
 
-pair trill_ne;
-trill_ne := unitvector ((6,9));
+trill_thick = 1/2 staff_space;
+trill_overlap = 1/6 staff_space;
+
+trill_width# = 5/6 staff_space#;
+trill_height# = 1/2 staff_space#;
+define_pixels (trill_height);
+define_whole_pixels (trill_width);
 
-define_pixels (trill_thick, trill_thin, 
-		trill_width, trill_overlap, trill_height);
+pair trill_ne;
+trill_ne := unitvector ((2, 3));
 
 
 %
-% the trill element sticks out on both the left and right side
-% out of the normal bbox, so you can glue them together easily.
+% The trill element sticks out on both the left and right side
+% of the normal bbox, so you can glue them together easily.
+%
+% `ending' is either 0 for none, 1 for left, or 2 for right.
 %
-def draw_trillelement (expr startx) =
-begingroup
+
+def draw_trillelement (expr offset, ending) =
 	clearxy;
-	save x, y, p;
+
+begingroup;
+	save nw, pat, nw_dist, ne_dist;
+	pair nw, nw_dist, ne_dist;
+	path pat;
 
 	pickup pencircle scaled trill_thin;
-	
-	x1 = - trill_width;
+
+	x1 = -.5 trill_width;
 	y1 = 0;
 	z3 = whatever * trill_ne + z1;
-	top y3 = trill_height;
-	z2 =  z3 - (trill_thick - trill_thin) * trill_ne;
+	top y3 = vround trill_height;
+	z2 = z3 - (trill_thick - trill_thin) * trill_ne;
+
+	bot z3' = (top z3) scaled -1;
+
+	nw = unitvector (z2 - z3');
+	ne_dist = (nw rotated -90) * 0.5 trill_thin;
+	nw_dist = (trill_ne rotated 90) * 0.5 trill_thin;
+
+	z5 = whatever * trill_ne + (z1 - nw_dist);
+	z5 = whatever * nw + (z3' - ne_dist);
+
+	pat := z5
+	       -- (z1 - nw_dist){-trill_ne}
+	       -- (z1 + nw_dist){trill_ne}
+	       -- (z3 + nw_dist){trill_ne}
+	       .. top z3{right}
+	       .. (z3 + ne_dist){-nw};
+	pat := pat
+	       -- pat scaled -1 shifted (-feta_eps, -feta_eps)
+	       -- cycle;
+	pat := pat shifted (offset, 0);
+	fill pat;
 
 	z4 = z1 - trill_ne * trill_overlap;
-
-	path p;
-	p = z3 -- z2 -- z4 -- z2;
-	p := p -- (p scaled -1) -- cycle;
-	%pickup pencircle scaled 2;
-	filldraw (p shifted (startx + trill_width,0)) ;
-	%draw p;
-	labels(1,2,3,4);
+	x4 := hround (x4 + 0.5 trill_thin) - 0.5 trill_thin;
+
+	pat := (z4 - nw_dist){-trill_ne}
+	       .. bot z4{left}
+	       .. lft z4{up}
+	       .. (z4 + nw_dist){trill_ne}
+	       -- (z1 + nw_dist){trill_ne}
+	       -- (z1 - nw_dist){-trill_ne}
+	       -- cycle;
+
+	if ending = 1:
+		fill pat shifted (offset, 0);
+	elseif ending = 2:
+		pat := pat scaled -1 shifted (-feta_eps, -feta_eps);
+                fill pat shifted (offset, 0);
+	fi;
 endgroup;
 enddef;
 
 
+fet_beginchar ("trilelement", "trilelement");
+	set_char_box (.5 trill_width#, .5 trill_width#,
+		      trill_height#, trill_height#);
 
-
-fet_beginchar("trilelement", "trilelement", "trilelement")
-	set_char_box(trill_width#, trill_width#,
-				trill_height#, trill_height#);
-	draw_trillelement(-trill_width);
+	draw_trillelement (0, 0);
+	labels (1, 2, 3, 3', 4, 5, 5');
 fet_endchar;
 
-fet_beginchar("prall", "prall", "prall")
-	set_char_box(2 trill_width#, 2 trill_width#,
-		     trill_height#, trill_height#);
-	draw_trillelement(-2 trill_width);
-	draw_trillelement(0);
+
+fet_beginchar ("prall", "prall");
+	set_char_box (trill_width#, trill_width#,
+		      trill_height#, trill_height#);
+
+	draw_trillelement (-hround (.5 trill_width), 1);
+	draw_trillelement (-hround (.5 trill_width) + trill_width, 2);
 fet_endchar;
 
-fet_beginchar("mordent", "mordent", "mordent")
-	set_char_box(2 trill_width#, 2 trill_width#,
-			4/3 trill_height#, 4/3 trill_height#);
-	draw_trillelement(-2 trill_width);
-	draw_trillelement(0);
 
-	pickup pencircle scaled trill_thin;
+fet_beginchar ("mordent", "mordent");
+	set_char_box (trill_width#, trill_width#,
+		      4/3 trill_height#, 4/3 trill_height#);
+
+	draw_trillelement (-hround (.5 trill_width), 1);
+	draw_trillelement (-hround (.5 trill_width) + trill_width, 2);
+
+	clearxy;
+
+	pickup pencircle scaled trill_stemwidth;
+
 	top y1 = h;
 	bot y2 = -d;
-	x1 = x2 ;
+	x1 = x2;
 	x2 = 0;
-	draw z1 -- z2;
+
+	draw_gridline (z2, z1, trill_stemwidth);
+
+	labels (1, 2);
 fet_endchar;
 
-fet_beginchar("prallprall", "prallprall", "prallprall")
-	set_char_box(3 trill_width#, 3 trill_width#,
-		     trill_height#, trill_height#);
-	draw_trillelement(-3 trill_width);
-	draw_trillelement(-1 trill_width);
-	draw_trillelement(1 trill_width);
+
+fet_beginchar ("prallprall", "prallprall");
+	set_char_box (1.5 trill_width#, 1.5 trill_width#,
+		      trill_height#, trill_height#);
+
+	draw_trillelement (-trill_width, 1);
+	draw_trillelement (0, 0);
+	draw_trillelement (trill_width, 2);
 fet_endchar;
 
-fet_beginchar("prallmordent", "prallmordent", "prallmordent")
 
-	set_char_box(3 trill_width#, 3 trill_width#,
-		     4/3 trill_height#, 4/3trill_height#);
-	draw_trillelement(-3 trill_width);
-	draw_trillelement(-1 trill_width);
-	draw_trillelement(1 trill_width);
+fet_beginchar ("prallmordent", "prallmordent");
+	set_char_box (1.5 trill_width#, 1.5 trill_width#,
+		      4/3 trill_height#, 4/3 trill_height#);
+
+	draw_trillelement (-trill_width, 1);
+	draw_trillelement (0, 0);
+	draw_trillelement (trill_width, 2);
+
+	clearxy;
+
+	pickup pencircle scaled trill_stemwidth;
 
-	pickup pencircle scaled trill_thin;
 	top y1 = h;
 	bot y2 = -d;
 	x1 = x2 ;
-	x2 = trill_width;
-	draw z1 -- z2;
+	x2 = good.x (.5 trill_width);
+
+	draw_gridline (z2, z1, trill_stemwidth);
+
+	labels (1, 2);
 fet_endchar;
 
+
 save remember_pic;
 picture remember_pic;
 
-fet_beginchar("upprall", "upprall", "upprall")
-	set_char_box(3 trill_width#, 3 trill_width#,
+
+fet_beginchar ("upprall", "upprall");
+	set_char_box (1.5 trill_width#, 1.5 trill_width#,
 		      trill_height#, trill_height#);
-	draw_trillelement(-3 trill_width);
-	draw_trillelement(-1 trill_width);
-	draw_trillelement(1 trill_width);
 
+	draw_trillelement (-trill_width, 1);
+	draw_trillelement (0, 0);
+	draw_trillelement (trill_width, 2);
+
+	z11 = z4 shifted (-trill_width, 0);
+	z12 = z11 + (0, -2 trill_height);
 
-	z1 = (- b,0) - trill_overlap * trill_ne ;
-	z4 = z1 + (0, - 2 trill_height);
-	labels (1,4);
-	draw z1{-trill_ne} .. z4{trill_ne yscaled  -1};
-	remember_pic := currentpicture ;
+	penpos11 (trill_thin, angle (trill_ne) - 90);
+	penpos12 (trill_thin, angle (trill_ne yscaled -1) + 90);
+	penlabels (11, 12);
+
+	pickup pencircle scaled trill_stemwidth;
+
+	fill z11l{-trill_ne}
+	     .. z12l{trill_ne yscaled -1}
+	     .. bot z12
+	     .. rt z12
+	     .. z12r{-trill_ne yscaled -1}
+	     .. z11r{trill_ne}
+	     -- cycle;
+
+	remember_pic := currentpicture;
 fet_endchar;
 
-fet_beginchar("upmordent", "upmordent", "upmordent")
-	set_char_box(3 trill_width#, 3 trill_width#,
+
+fet_beginchar ("upmordent", "upmordent");
+	set_char_box (1.5 trill_width#, 1.5 trill_width#,
 		      4/3 trill_height#, 4/3 trill_height#);
 
 	currentpicture := remember_pic;
 
-	pickup pencircle scaled trill_thin;
+	clearxy;
+
+	pickup pencircle scaled trill_stemwidth;
+
 	top y1 = h;
 	bot y2 = -d;
-	x1 = x2 ;
-	x2 = trill_width;
-	draw z1 -- z2;
+	x1 = x2;
+	x2 = good.x (.5 trill_width);
+
+	draw_gridline (z2, z1, trill_stemwidth);
+
+	labels (1, 2);
 fet_endchar;
 
-fet_beginchar("pralldown", "pralldown", "pralldown")
-	set_char_box(3 trill_width#, 3 trill_width#,
+
+fet_beginchar ("pralldown", "pralldown");
+	set_char_box (1.5 trill_width#, 1.5 trill_width#,
 		      trill_height#, trill_height#);
+
 	currentpicture := remember_pic xscaled -1;
 fet_endchar;
 
-fet_beginchar("downprall", "downprall", "downprall")
-	set_char_box(3 trill_width#, 3 trill_width#,
+
+fet_beginchar ("downprall", "downprall");
+	set_char_box (1.5 trill_width#, 1.5 trill_width#,
 		      trill_height#, trill_height#);
-	remember_pic := currentpicture;
-	draw_trillelement(-3 trill_width);
-	draw_trillelement(-1 trill_width);
-	draw_trillelement(1 trill_width);
 
+	draw_trillelement (-trill_width, 1);
+	draw_trillelement (0, 0);
+	draw_trillelement (trill_width, 2);
+
+	z11 = z4 shifted (-trill_width, 0);
+	z12 = z11 + (0, 2 trill_height);
+
+	penpos11 (trill_thin, angle (trill_ne xscaled -1) - 90);
+	penpos12 (trill_thin, angle (trill_ne) - 90);
+	penlabels (11, 12);
 
-	z1 = (- b,0) - trill_overlap * trill_ne ;
-	z4 = z1 + (0, 2 trill_height);
-	labels (1,4);
-	draw z1{trill_ne xscaled -1} .. z4{trill_ne};
-	remember_pic := currentpicture ;
+	pickup pencircle scaled trill_stemwidth;
 
+	fill z11l{trill_ne xscaled -1}
+	     .. z12l{trill_ne}
+	     .. top z12
+	     .. rt z12
+	     .. z12r{-trill_ne}
+	     .. z11r{-trill_ne xscaled -1}
+	     -- cycle;
+
+	remember_pic := currentpicture;
 fet_endchar;
 
-fet_beginchar("downmordent", "downmordent", "downmordent")
-	set_char_box(3 trill_width#, 3 trill_width#,
-		    4/3  trill_height#, 4/3trill_height#);
+
+fet_beginchar ("downmordent", "downmordent");
+	set_char_box (1.5 trill_width#, 1.5 trill_width#,
+		      4/3 trill_height#, 4/3 trill_height#);
 
 	currentpicture := remember_pic;
 
-	pickup pencircle scaled trill_thin;
+	clearxy;
+
+	pickup pencircle scaled trill_stemwidth;
+
 	top y1 = h;
 	bot y2 = -d;
-	x1 = x2 ;
-	x2 = trill_width;
-	draw z1 -- z2;
+	x1 = x2;
+	x2 = good.x (.5 trill_width);
+
+	draw_gridline (z2, z1, trill_stemwidth);
+
+	labels (1, 2);
 fet_endchar;
 
-fet_beginchar("prallup", "prallup", "prallup")
-	set_char_box(3 trill_width#, 3 trill_width#,
+
+fet_beginchar ("prallup", "prallup");
+	set_char_box (1.5 trill_width#, 1.5 trill_width#,
 		      trill_height#, trill_height#);
+
 	currentpicture := remember_pic xscaled -1;
 fet_endchar;
 
 
-fet_beginchar("lineprall", "lineprall", "lineprall")
-	set_char_box(3 trill_width#, 3 trill_width#,
-		      trill_height#, 4trill_height#);
-	remember_pic := currentpicture;
-	draw_trillelement(-3 trill_width);
-	draw_trillelement(-1 trill_width);
-	draw_trillelement(1 trill_width);
-
-	
-	z1 = (- b,0) - trill_overlap * trill_ne ;
-	z4 = z1 + (0, h);
-	labels (1,4);
-	draw z1 -- z4;
-fet_endchar;
+fet_beginchar ("lineprall", "lineprall");
+	set_char_box (1.5 trill_width#, 1.5 trill_width#,
+		      trill_height#, 4 trill_height#);
+
+	draw_trillelement (-trill_width, 1);
+
+	labels (1, 2, 3, 3', 4, 5, 5');
 
+	pickup pencircle scaled trill_stemwidth;
 
+	penpos10 (trill_stemwidth, 0);
+	penpos11 (trill_stemwidth, 0);
+
+	x10l = x4 - .5 trill_thin - trill_width;
+	y10 = y4;
+	z11 = z10 + (0, h);
+
+	penlabels (10, 11);
+
+	fill z11l
+	     .. top z11
+	     .. z11r
+	     -- z10r
+	     -- z10l
+	     -- cycle;
+
+	draw_trillelement (0, 0);
+	draw_trillelement (trill_width, 2);
+fet_endchar;