X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=mf%2Ffeta-bolletjes.mf;h=93d8818e9a1caa6477994ef4ab3f7aa5042b83e0;hb=e229b2f3917fef9f19d33e1b4129b70efd802923;hp=d558cf751a409b1f3af49375e560ec4ed08a7d80;hpb=460999e232e2126654185e5f5675f72cea495b13;p=lilypond.git

diff --git a/mf/feta-bolletjes.mf b/mf/feta-bolletjes.mf
index d558cf751a..93d8818e9a 100644
--- a/mf/feta-bolletjes.mf
+++ b/mf/feta-bolletjes.mf
@@ -1,201 +1,1142 @@
-% bolletjes.mf
-% part of LilyPond's pretty-but-neat music font
+%  -*-Fundamental-*-
+% feta-bolletjes.mf --  implement noteheads
+%
+% source file of LilyPond's pretty-but-neat music font
+%
+% (c) 1997--2004 Jan Nieuwenhuizen <janneke@gnu.org>
+% & Han-Wen Nienhuys <hanwen@cs.uu.nl>
+% & Juergen Reuter <reuter@ipd.uka.de>
+%
 
-% most beautiful noteheads are pronounced, not circular, 
+test_outlines := 0;
+
+
+% Most beautiful noteheads are pronounced, not circular,
 % and not even symmetric.
-% These examples are inspired by [Wanske], see literature list
+% These examples are inspired by [Wanske]; see literature list.
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% NOTE HEAD VARIABLES
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+save black_notehead_width, noteheight;
+save slash_thick, slash_slope, overdone_heads;
+numeric black_notehead_width, noteheight, slash_thick;
+
+
+fet_begingroup("noteheads");
+
+
+% Slope of slash.  From scm/grob-description.scm.  How to auto-copy?
+slash_slope := 1.7;
+
+% Thickness of slash lines.  Quarter notes get 1.5slt width.
+slash_thick# := 2/3 * 0.48 staff_space#;
+
+
+%
+% Hand-engraved music often has balls extending above and below
+% the lines.  If you like that, modify overdone heads (unit:
+% stafflinethickness)
+%
+overdone_heads = 0.0;
+noteheight# := staff_space# + (1 + overdone_heads) * stafflinethickness#;
+
+define_pixels (slash_thick, noteheight);
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% SLANT moves both extrema on the long axis (by SLANT * ELLIPTICITY,
+% so SLANT = -1, puts the extreme on the long axis next to the short
+% axis one).
+%
+
+def draw_outside_ellipse (expr ellipticity, tilt, superness, slant) =
+	save attachment_y;
+	save p;
+	path p;
+
+	p := superellipse ((ellipticity, 0), (-slant * ellipticity, 1.0),
+			   (- ellipticity, 0), (slant * ellipticity, -1.0),
+			   superness);
+	p := p rotated tilt;
+
+	save top_point, right_point;
+	pair top_point, right_point;
+
+	top_point := directionpoint left of p;
+	right_point := directionpoint up of p;
+
+	save scaling, width, height;
+
+	scaling# = noteheight# / (2 ypart (top_point));
+	width# := 2 xpart (right_point) * scaling#;
+
+	define_pixels (width, scaling);
+
+	set_char_box (0, width#, noteheight# / 2, noteheight# / 2);
+
+	% attachment Y
+	charwy := ypart (right_point) * scaling#;
+	charwx := width#;
+
+	p := p scaled scaling shifted (width / 2, 0);
+	if test_outlines = 1:
+		pickup pencircle scaled 1;
+		draw p;
+	else:
+		fill p;
+	fi;
+enddef;
+
+
+def undraw_inside_ellipse (expr ellipticity, tilt, superness, clearance,
+			   center) =
+begingroup
+	save p;
+	path p;
+
+	p := superellipse ((ellipticity, 0), (0, 1.0),
+			   (-ellipticity, 0), (0, -1.0),
+			   superness);
+	p := p rotated tilt;
+
+	save top_point, right_point;
+	pair top_point, right_point;
+
+	top_point := directionpoint left of p;
+	right_point := directionpoint up of p;
+
+	save height, scaling;
+
+	height# = staff_space# + stafflinethickness# - clearance;
+	scaling# = height# / (2 ypart (top_point));
+
+	define_pixels (scaling);
+	p := (p scaled scaling) shifted center;
+
+	if test_outlines = 1:
+		pickup pencircle scaled 1;
+		draw p;
+	else:
+		unfill p;
+	fi
+endgroup;
+enddef;
+
+
+%
+% dimensions aren't entirely right.
+%
+fet_beginchar ("Brevis notehead", "s-1");
+	save stemthick, fudge;
+	define_pixels (stemthick);
+	fudge = blot_diameter / 2;
+	stemthick# = 2 stafflinethickness#;
+
+	draw_outside_ellipse (1.80, 0, 0.707, 0);
+	undraw_inside_ellipse (1.30, 125, 0.68, 2 stafflinethickness#,
+			       (w / 2, 0));
+
+	pickup pencircle scaled stemthick;
+
+	bot y1 = -d;
+	top y2 = h;
+	rt x1 - fudge = 0;
+	x1 = x2;
+
+	fudge + lft x3 = w;
+	x4 = x3;
+	y4 = y2;
+	y3 = y1;
+
+	draw_gridline (z1, z2, stemthick);
+	draw_gridline (z3, z4, stemthick);
+fet_endchar;
+
+
+fet_beginchar ("Whole notehead", "s0")
+	draw_outside_ellipse (1.80 - puff_up_factor / 3.0, 0, 0.707, 0);
+	undraw_inside_ellipse (1.30, 125 - puff_up_factor * 10,
+			       0.68, 2 stafflinethickness#, (w / 2, 0));
+
+%	draw_staff_outline (-2, 2, 0.5);
+fet_endchar;
+
+
+fet_beginchar ("Half notehead", "s1")
+	draw_outside_ellipse (1.53 - puff_up_factor / 3.0, 34, 0.66, 0.17);
+	undraw_inside_ellipse (3.25, 33, 0.81, 2.5 stafflinethickness#,
+			       (w / 2, 0));
+fet_endchar;
+
+fet_beginchar ("Quart notehead", "s2")
+	% used to have 32. With 31, they are slightly bolder.
+	draw_outside_ellipse (1.49 - puff_up_factor / 3.0, 31, 0.707, 0);
+	black_notehead_width# := charwd;
+fet_endchar;
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+fet_beginchar ("Whole diamondhead", "s0diamond")
+	draw_outside_ellipse (1.80, 0, 0.495, 0);
+	undraw_inside_ellipse (1.30, 125, 0.6,
+			       .4 staff_space# +  stafflinethickness#,
+			       (w / 2, 0));
+fet_endchar;
+
+
+fet_beginchar ("Half diamondhead", "s1diamond")
+	draw_outside_ellipse (1.50, 34, 0.49, 0.17);
+	undraw_inside_ellipse (3.5, 33, 0.80,
+			       .3 staff_space# + 1.5 stafflinethickness#,
+			       (w / 2, 0));
+fet_endchar;
+
+
+fet_beginchar ("Quart diamondhead", "s2diamond")
+	draw_outside_ellipse (1.80, 35, 0.495, -0.25);
+fet_endchar;
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+vardef penposx@# (expr d) = 
+begingroup;
+	save pat;
+	path pat;
+
+	pat = top z@#
+	      .. lft z@#
+	      .. bot z@#
+	      .. rt z@#
+	      .. cycle;
+	z@#l = pat intersectionpoint (z@# -- infinity * dir (d + 180));
+	z@#r = pat intersectionpoint (z@# -- infinity * dir (d));
+endgroup
+enddef;
+
+
+def define_triangle_shape (expr stemdir) =
+	save triangle_a, triangle_b, triangle_c;
+	save triangle_out_a, triangle_out_b, triangle_out_c;
+	save triangle_in, triangle_out;
+	save width, depth, height;
+	save origin, left_up_dir;
+	save exact_left_point, exact_right_point, exact_down_point;
+
+	path triangle_a, triangle_b, triangle_c;
+	path triangle_out_a, triangle_out_b, triangle_out_c;
+	path triangle_in, triangle_out;
+	pair origin, left_up_dir;
+	pair exact_down_point, exact_left_point, exact_right_point;
+
+	save pen_thick;
+	pen_thick# = stafflinethickness# + .1 staff_space#;
+	define_pixels (pen_thick, llap);
+
+	left_up_dir = llap# * dir (90 + tilt);
+
+	xpart (left_up_dir) * xs - (pen_thick# * xs) / 2 + xpart origin = 0;
+	ypart origin = 0;
+
+	exact_left_point := origin + (left_up_dir xscaled xs);
+	exact_down_point := origin + (left_up_dir rotated 120 xscaled xs);
+	exact_right_point := origin + (left_up_dir rotated 240 xscaled xs);
 
+	height# = ypart (exact_left_point + origin) + pen_thick# / 2;
+	depth# = -ypart (exact_down_point + origin) + pen_thick# / 2;
+	width# = xpart (exact_right_point - exact_left_point)
+		 + pen_thick# * xs;
 
-fet_begingroup("balls");
+	set_char_box (0, width#, depth#, height#);
 
-noteheight#:=interline#+ (1 + overdone_heads) *stafflinethickness#;
+	% Formerly, the shape has simply been drawn with an elliptical pen
+	% (`scaled pen_thick xsaled xs'), but the envelope of such a curve
+	% is of 6th degree.  For the sake of mf2pt1, we approximate it.
 
-define_pixels(noteheight);
+	pickup pencircle scaled pen_thick xscaled xs;
 
+	z0 = (hround_pixels (xpart origin), 0);
 
+	z1 = z1' = z0 + llap * dir (90 + tilt) xscaled xs;
+	z2 = z2' = z0 + llap * dir (90 + tilt + 120) xscaled xs;
+	z3 = z3' = z0 + llap * dir (90 + tilt + 240) xscaled xs;
 
-def draw_brevis =
-	save beamheight, head_width;
-	save holeheight, stem_width;
-	save serif_size, serif_protrude;
+	z12 = caveness [.5[z1, z2], z3];
+	z23 = caveness [.5[z2, z3], z1];
+	z31 = caveness [.5[z3, z1], z2];
 
-	head_width# = 2 interline#;
-	holeheight = 3 stafflinethickness;
-	stem_width = 1.4 stafflinethickness;
+	triangle_a = z1 .. z12 .. z2;
+	triangle_b = z2 .. z23 .. z3;
+	triangle_c = z3 .. z31 .. z1;
 
+	penposx1 (angle (direction 0 of triangle_a) - 90);
+	penposx2 (angle (direction 0 of triangle_b) - 90);
+	penposx3 (angle (direction 0 of triangle_c) - 90);
 
-	define_pixels(head_width);
-	set_char_box(0, head_width#, noteheight#/2, noteheight#/2);
-	
-	2 beamheight + holeheight = noteheight;
-	serif_size = (holeheight - stafflinethickness)/2;
-	serif_protrude = 1.5 serif_size;
-	penpos1(stem_width, 0);
-	penpos2(stem_width, 0);
-	penpos3(beamheight, 90);
-	penpos4(beamheight, 90);
-	penpos5(stem_width, 180);
+	penposx1' (angle (direction infinity of triangle_c) + 90);
+	penposx2' (angle (direction infinity of triangle_a) + 90);
+	penposx3' (angle (direction infinity of triangle_b) + 90);
 
-	z1l = (0, 0);
-	z2l = (0, -stafflinethickness/2);
-	z3r = z2r + serif_size *(1,-1);
-	y4r = y3r;
-	x4r = head_width/2;
-	z5l = z3l + (-serif_size, -serif_protrude);
+	penposx12 (angle (z12 - z0));
+	penposx23 (angle (z23 - z0));
+	penposx31 (angle (z31 - z0));
 
-	penlabels(1,2,3,4, 5);
-	fill z1r -- z1l -- z5r{down} .. z5l{up} .. z3l{right}
-		-- z4l -- z4r -- z3r{left} .. z2r{up} -- cycle;
+	z10 = (z0 -- z1) intersectionpoint (z1l .. z12l .. z2'r);
+	z20 = (z0 -- z2) intersectionpoint (z2l .. z23l .. z3'r);
+	z30 = (z0 -- z3) intersectionpoint (z3l .. z31l .. z1'r);
 
-	addto currentpicture also currentpicture yscaled -1;
-	addto currentpicture also currentpicture reflectedabout(z4r, z4l);
+	triangle_in = z10
+		      .. z12l
+		      .. z20
+		      & z20
+		      .. z23l
+		      .. z30
+		      & z30
+		      .. z31l
+		      .. z10
+		      & cycle;
+
+	triangle_out_a = z1r .. z12r .. z2'l;
+	triangle_out_b = z2r .. z23r .. z3'l;
+	triangle_out_c = z3r .. z31r .. z1'l;
+
+	triangle_out = top z1
+		       .. lft z1
+		       .. z1r{direction 0 of triangle_out_a}
+		       & triangle_out_a
+		       & {direction infinity of triangle_out_a}z2'l
+		       .. lft z2
+		       .. bot z2
+		       .. z2r{direction 0 of triangle_out_b}
+		       & triangle_out_b
+		       & {direction infinity of triangle_out_b}z3'l
+		       .. rt z3
+		       .. top z3
+		       .. z3r{direction 0 of triangle_out_c}
+		       & triangle_out_c
+		       & {direction infinity of triangle_out_c}z1'l
+		       .. cycle;
+
+	labels (0, 10, 20, 30);
+	penlabels (1, 1', 2, 2', 3, 3', 12, 23, 31);
+
+	% attachment Y
+	if stemdir = 1:
+		charwy := ypart exact_right_point;
+		charwx := xpart exact_right_point;
+	else:
+		charwy := -ypart exact_down_point;
+		charwx := (width# - xpart exact_down_point);
+	fi
+enddef;
+
+
+fet_beginchar ("Whole trianglehead", "s0triangle")
+	save hei, xs;
+	save llap;
+	save tilt;
+
+	tilt = 40;
+	llap# = 3/4 noteheight#;
+
+	xs = 1.5;
+	caveness := 0.1;
+	define_triangle_shape (1);
+	fill triangle_out;
+	unfill triangle_in;
+fet_endchar;
+
+
+def draw_small_triangle_head (expr dir) =
+	save hei, xs;
+	save llap;
+	save tilt;
+
+	tilt = 40;
+	llap# = 2/3 noteheight#;
+	xs = 1.2;
+	caveness := 0.1;
+	define_triangle_shape (dir);
+	fill triangle_out;
+	unfill triangle_in;
+enddef;
+
+
+fet_beginchar ("Half trianglehead", "d1triangle")
+	draw_small_triangle_head (-1);
+fet_endchar;
+
+
+fet_beginchar ("Half trianglehead", "u1triangle")
+	draw_small_triangle_head (1);
+fet_endchar;
+
+
+def draw_closed_triangle_head (expr dir) =
+	save hei, xs;
+	save llap;
+	save tilt;
+
+	tilt = 40;
+	llap# = 2/3 noteheight#;
+	xs = 1.0;
+	caveness := 0.1;
+	define_triangle_shape (dir);
+	fill triangle_out;
+enddef;
+
+
+fet_beginchar ("Quart trianglehead", "u2triangle")
+	draw_closed_triangle_head (1);
+fet_endchar;
+
+
+fet_beginchar("Quart trianglehead", "d2triangle")
+	draw_closed_triangle_head (-1);
+fet_endchar;
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Slash heads are for indicating improvisation.  They are
+% twice as high as normal heads.
+%
+def draw_slash (expr hwid_hash) =
+	save exact_height;
+	save ne_dir;
+	pair ne_dir;
+	exact_height = staff_space# + stafflinethickness# / 2;
+
+	set_char_box (0, 2 exact_height / slash_slope + hwid_hash,
+		      exact_height, exact_height);
+
+	charwx := charwd;
+	charwy := charht;
+
+	clearxy;
+	pickup pencircle scaled blot_diameter;
+
+	bot y1 = -d;
+	top y2 = h;
+	lft x1 = 0;
+	lft x2 = 2 h / slash_slope;
+
+	rt x3 = w;
+	y3 = y2;
+	y4 = y1;
+	x3 - x2 = x4 - x1;
+
+	ne_dir := unitvector (z3  - z4);
+	fill bot z1
+	     .. lft z1
+	     --- lft z2
+	     .. top z2
+	     --- top z3
+	     .. rt z3
+	     --- rt z4
+	     .. bot z4
+	     --- cycle;
+
+	if hwid_hash > 2 slash_thick#:
+		save th;
+
+		th = slash_thick - blot_diameter;
+		y6 = y7;
+		y5 = y8;
+		y3 - y7 = th;
+		y5 - y1 = th;
+		z6 - z5 = whatever * ne_dir;
+		z8 - z7 = whatever * ne_dir;
+
+		z5  = z1 + whatever * ne_dir + th * (ne_dir rotated -90);
+		z8  = z4 + whatever * ne_dir + th * (ne_dir rotated 90);
+
+		unfill z5
+		       -- z6
+		       -- z7
+		       -- z8
+		       -- cycle;
+	fi
+	labels (range 1 thru 10);
 enddef;
 
-fet_beginchar("Brevis notehead", "-1", "brevisball")
-	draw_brevis;
-fet_endchar;
-
-
-%
-% Some sources (eg Musix/OpusTeX think that the appendage should be on
-% the right, my only other ref [Willemze], shows an appendage to the left
-%
-fet_beginchar("Longa notehead", "-2", "longaball");
-	draw_brevis;
-	save theta;
-	z7 = z5;
-	z6 - z7 = (-stem_width/2, -interline);
-	theta = angle(z6-z7)+ 90;
-	penpos7(stem_width, theta);
-	penpos6(1.2 stem_width, theta);
-	
-	fill z7r .. z6r{z6-z7} .. {z7-z6} z6l -- z7l -- cycle;
-	penlabels(6,7);
-fet_endchar;
-
-% setup user vars
-def setup_notehead_vars =
-	save a_b,err_y_a,tilt,superness;
-	save ai_a,ai_bi,err_y_ai,err_x_bi,inner_tilt,inner_superness;
-	save b_h,a_w;
-	enddef;
-
-% setup addititional vars and calc them
-def notehead_calc =
-	save a,beta,ai,bi, ht, wd;
-	ht# =noteheight#;
-	2beta#=ht#*b_h;
-	a# = beta#*a_b;
-	wd# = 2a# / a_w;
-	ai# = a# * ai_a;
-	bi# = ai#/ai_bi;
-	define_pixels(a,beta);
-	define_pixels(ai,bi);
-	set_char_box(0, wd#, .5 ht#, .5 ht#);
-	enddef;
-
-
-% draw the outer and inner ellipse.
-def notehead_draw =
-	path black,white;
-	black=distorted_ellipse(a,beta,a*err_y_a,0,superness);
-	white=distorted_ellipse(ai,bi,ai*err_y_ai,bi*err_x_bi,inner_superness);
-if test>1: %fixme
-		save x;
-		x1=-x3=a; x2=x4=0; y1=y3=0; y2=-y4=b;
-		penlabels(1,2,3,4);
-		test_grid;
-else:
-		black:=black rotated tilt;
-		black:=black shifted (w/2,0);
-		white:=white rotated inner_tilt;
-		white:=white shifted (w/2,0);
-fi
-		fill black;
-		unfill white;
-
-		
-	enddef;
-
-% whole note
-% Wanske, p.38
-fet_beginchar("Whole notehead", "0", "wholeball")
-	setup_notehead_vars;
-	
-	a_b:=1.80;
-	err_y_a:=0; % no slant
-	tilt:=0;
-	superness:=0.707;
-	ai_a:=0.508;
-	% ai_bi:=1.23;
-	ai_bi:=1.30; % jcn
-	% err_y_ai:=0.0938;
-	% err_x_bi:=0;
-	err_y_ai:=0;
-	err_x_bi:=0.115;
-	% inner_tilt:=135;
-	inner_tilt:=125; % jcn
-	% inner_superness:=0.69;
-	inner_superness:=0.68; % jcn
-	b_h:=1; %no rotate-> no height correction
-	a_w:=1; % no rotate-> no width correction
-
-	notehead_calc;
-	notehead_draw;
-fet_endchar;
-
-
-% half note
-% Wanske, p.39
-fet_beginchar("Half notehead", "1", 
-	"halfball")
-	setup_notehead_vars;
-		% a_b:=1.49; % after text
-	a_b:=1.50; % after drawing
-	err_y_a:=0.157;
-	tilt:=34;
-	% superness:=0.66;
-	superness:=0.67; % jcn
-	% ai_a:=0.863;
-	ai_a:=0.850; % jcn
-	% ai_bi:=3.14;
-	ai_bi:=3.30; % jcn
-	err_y_ai:=0;
-	err_x_bi:=-0.12;
-	inner_tilt:=tilt;
-	inner_superness:=0.80;
-	b_h:=0.935;
-	a_w:=1.12;
-
-	notehead_calc;
-	notehead_draw;
-fet_endchar;
-
-
-% quarter note
-% Wanske p.38
-fet_beginchar("Quart notehead", "2", "quartball")
-	setup_notehead_vars;
-	% a_b:=1.57; % after text
-	a_b:=1.54; % after drawing
-	err_y_a:=0.044;
-	tilt:=32;
-	superness:=0.707;
-	ai_a:=0;
-	ai_bi:=1;
-	err_y_ai:=0;
-	err_x_bi:=0;
-	inner_tilt:=0;
-	inner_superness:=0.707;
-	b_h:=0.85;
-	a_w:=1.09;
-
-	notehead_calc;
-	notehead_draw;
-fet_endchar;
-
-
-
-
-fet_endgroup("balls");
 
+fet_beginchar ("Whole slashhead", "s0slash")
+	draw_slash (4 slash_thick# + 0.5 staff_space#);
+fet_endchar;
+
+
+fet_beginchar ("Half slashhead", "s1slash")
+	draw_slash (3.0 slash_thick# + 0.15 staff_space#);
+fet_endchar;
+
+
+fet_beginchar ("Quart slashhead", "s2slash")
+	draw_slash (1.5 slash_thick#);
+fet_endchar;
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% `thick' is the distance between the NE/SW parallel lines in the cross
+% (distance between centres of lines) in multiples of stafflinethickness
+%
+def draw_cross (expr thick) =
+	save ne_dir, nw_dir;
+	save horz_dist, vert_dist;
+	save crz_in, crz_out;
+	pair ne_dir, nw_dir;
+	path crz_in, crz_out;
+
+	pen_thick# := 1.2 stafflinethickness#;
+	define_pixels (pen_thick);
+	pickup pencircle scaled pen_thick;
+
+	top y3 = h;
+	ne_dir := unitvector ((1, (2 h - pen_thick) / (w - pen_thick)));
+	rt x4 = w / 2;
+	y5 = 0;
+	z4 - z5 = whatever * ne_dir;
+	x6 = 0;
+	z6 - z3 = whatever * ne_dir;
+	z3 - z4 = whatever * (ne_dir yscaled -1);
+
+	z4 - z3 = whatever * (ne_dir)
+		  + (ne_dir rotated -90) * thick * stafflinethickness;
+
+ 	x1 = charwd / 2 - .5 pen_thick#;
+	z1 = whatever * ne_dir
+	     + thick / 2 * stafflinethickness# * (ne_dir rotated -90);
+
+	labels (1, 2, 3, 4, 5, 6);
+
+	nw_dir = unitvector (z3 - z4);
+
+	vert_dist = 0.5 pen_thick / cosd (angle (ne_dir));
+	horz_dist = 0.5 pen_thick / sind (angle (nw_dir));
+
+	crz_out = (z6 + up * vert_dist)
+		  --- (z3 + nw_dir * 0.5 pen_thick)
+		  .. (top z3)
+		  .. (z3 + ne_dir * 0.5 pen_thick)
+		  --- (z4 + ne_dir * 0.5 pen_thick)
+		  .. (rt z4)
+		  .. (z4 - nw_dir * 0.5 pen_thick)
+		  --- (z5 + right * horz_dist);
+	crz_out := crz_out
+		   & reverse crz_out yscaled -1;
+	crz_out := crz_out
+		   & reverse crz_out xscaled -1
+		   & cycle;
+	fill crz_out;
+
+	if (thick > 1):
+		crz_in = (bot z6){right}
+			 .. (z6 - nw_dir * 0.5 pen_thick)
+			 --- (z3 + down * vert_dist)
+			 --- (z4 + left * horz_dist)
+			 --- (z5 + nw_dir * 0.5 pen_thick)
+			 .. {down}(lft z5);
+		crz_in := crz_in
+			  .. reverse crz_in yscaled -1;
+		crz_in := crz_in
+			  .. reverse crz_in xscaled -1
+			  .. cycle;
+		unfill crz_in;
+	fi
+
+	% ugh
+	currentpicture := currentpicture shifted (w / 2, 0);
+
+	charwx := charwd;
+	charwy := y1;
+	z12 = (charwx * hppp, y1 * vppp);
+	labels (12);
+enddef;
+
+
+fet_beginchar ("Whole Crossed notehead", "s0cross")
+	wid# := black_notehead_width# + 4 stafflinethickness#;
+	hei# := noteheight# + stafflinethickness#;
+
+	set_char_box (0, wid#, hei# / 2, hei# / 2);
+
+	draw_cross (3.75);
+fet_endchar;
+
+
+fet_beginchar ("Half Crossed notehead", "s1cross")
+	wid# := black_notehead_width# + 2 stafflinethickness#;
+	hei# := noteheight# + stafflinethickness# / 2;
+
+	set_char_box (0, wid#, hei# / 2, hei# / 2);
+
+	draw_cross (3.0);
+fet_endchar;
+
+
+fet_beginchar ("Crossed notehead", "s2cross")
+	wid# := black_notehead_width#;
+	hei# := noteheight#;
+	set_char_box (0, wid#, hei# / 2, hei# / 2);
+
+	draw_cross (1.0);
+fet_endchar;
+
+
+fet_beginchar ("X-Circled notehead", "s2xcircle")
+	wid# := black_notehead_width# * sqrt (sqrt2);
+	hei# := noteheight# * sqrt (sqrt2);
+
+	set_char_box (0, wid#, hei# / 2, hei# / 2);
+
+	cthick := (1.2 + 1/4) * stafflinethickness;
+	cxr := w / 2 - cthick / 2;
+	cyr := h - cthick / 2;
+
+	pickup pencircle scaled cthick;
+
+	fill fullcircle xscaled (2 cxr + cthick)
+			yscaled (2 cyr + cthick)
+			shifted (w / 2, 0);
+	unfill fullcircle xscaled (2 cxr - cthick)
+			  yscaled (2 cyr - cthick)
+			  shifted (w / 2, 0);
+
+	xpos := cxr / sqrt2;
+	ypos := cyr / sqrt2;
+
+	pickup penrazor scaled cthick rotated (angle (xpos, ypos) + 90);
+	draw (-xpos + w / 2, -ypos) -- (xpos + w / 2, ypos);
+
+	pickup penrazor scaled cthick rotated (angle (xpos, -ypos) + 90);
+	draw (-xpos + w / 2, ypos) -- (xpos + w / 2, -ypos);
+
+	charwx := charwd;
+	charwy := 0;
+
+	z12 = (charwx * hppp, charwy * vppp);
+	labels (12);
+fet_endchar;
+
+
+%%%%%%%%
+%
+% SOLFA SHAPED NOTES
+%
+
+save solfa_pen_thick;
+solfa_pen_thick# = 2 stafflinethickness#;
+define_pixels (solfa_pen_thick);
+
+
+def draw_do_head (expr width_factor, dir) =
+	save p_in, p_out;
+	save left_dist, right_dist;
+	path p_in, p_out;
+	pair left_dist, right_dist;
+
+	set_char_box (0, width_factor * noteheight#,
+		      0.5 noteheight#, 0.5 noteheight#);
+
+	pickup pencircle scaled solfa_pen_thick;
+
+	bot y1 = -d;
+	y1 = y2;
+	lft x1 = 0;
+	rt x2 = w;
+	top y3 = h;
+	x3 =.5 [x1, x2];
+
+	left_dist = (unitvector (z3 - z1) rotated 90) * 0.5 solfa_pen_thick;
+	right_dist = (unitvector (z2 - z3) rotated 90) * 0.5 solfa_pen_thick;
+
+	p_in := (((z1 - left_dist) -- (z3 - left_dist)) intersectionpoint
+		  (top z1 -- top z2))
+		-- ((top z1 -- top z2) intersectionpoint
+		    ((z2 - right_dist) -- (z3 - right_dist)))
+		-- (((z2 - right_dist) -- (z3 - right_dist)) intersectionpoint
+		    ((z1 - left_dist) -- (z3 - left_dist)))
+		-- cycle;
+
+	p_out := bot z1
+		 --- bot z2
+		 .. rt z2
+		 .. (z2 + right_dist)
+		 --- (z3 + right_dist)
+		 .. top z3
+		 .. (z3 + left_dist)
+		 --- (z1 + left_dist)
+		 .. lft z1
+		 .. cycle;
+		 
+
+	labels (1, 2, 3);
+
+	charwx := charwd;
+	charwy := -chardp + 0.5 stafflinethickness#;
+	if dir = -1:
+		charwy := -charwy;
+	fi;
+enddef;
+
+
+fet_beginchar ("Whole dohead", "s0do")
+	draw_do_head (1.8, 1);
+	fill p_out;
+	unfill p_in;
+fet_endchar;
+
+
+fet_beginchar ("Half dohead", "d1do")
+	draw_do_head (1.5, -1);
+	fill p_out;
+	unfill p_in;
+fet_endchar;
+
+
+fet_beginchar ("Half dohead", "s1do")
+	draw_do_head (1.5, 1);
+	fill p_out;
+	unfill p_in;
+fet_endchar;
+
+
+fet_beginchar ("Quart dohead", "d2do")
+	draw_do_head (1.55, -1);
+	fill p_out;
+fet_endchar;
+
+
+fet_beginchar ("Quart dohead", "s2do")
+	draw_do_head (1.55, 1);
+	fill p_out;
+fet_endchar;
+
+
+%
+% re - flat top, curved bottom:
+%                (0,h/2) {dir -90} .. (w/2,-h/2) .. {dir 90} (w,h/2) -- cycle;
+% (broader along the base and with more vertical sides for half and
+% whole notes)
+% stem attachment: h/2
+%
+
+def draw_re_head (expr width_factor, dir) =
+	save p_in, p_out;
+	path p_in, p_out;
+
+	set_char_box (0, width_factor * noteheight#,
+		      0.5 noteheight#, 0.5 noteheight#);
+
+	pickup pencircle scaled solfa_pen_thick;
+
+	save curve_start;
+	curve_start = 0.7;
+	lft x1 = 0;
+	y1 = y5;
+	x1 = x2;
+	y2 = curve_start [y3, y1];
+	bot y3 = - d;
+	x3 = .5 [x2, x4];
+	rt x4 = w;
+	y4 = y2;
+	top y5 = h;
+	x5 = x4;
+
+	labels (range 1 thru 5);
+
+	p_in := (z1 + 0.5 solfa_pen_thick * (1, -1))
+		--- rt z2
+		.. top z3{right}
+		.. lft z4
+		--- (z5 + 0.5 solfa_pen_thick * (-1, -1))
+		--- cycle;
+
+	p_out := lft z1
+		 --- lft z2
+		 .. bot z3{right}
+		 .. rt z4
+		 --- rt z5
+		 .. top z5
+		 --- top z1
+		 .. cycle;
+
+	charwx := charwd;
+	charwy := curve_start [-chardp, charht];
+
+	if dir = -1:
+		charwy := - charwy;
+	fi;
+enddef;
+
+
+fet_beginchar ("Whole rehead", "s0re")
+	draw_re_head (1.8, 1);
+	fill p_out;
+	unfill p_in;
+fet_endchar;
+
+
+fet_beginchar ("Half up rehead", "u1re")
+	draw_re_head (1.5, 1);
+	fill p_out;
+	unfill p_in;
+fet_endchar;
+
+
+fet_beginchar ("Half down rehead", "d1re")
+	draw_re_head (1.5, -1);
+	fill p_out;
+	unfill p_in;
+fet_endchar;
+
+
+fet_beginchar ("Quart rehead", "u2re")
+	draw_re_head (1.55, 1);
+	fill p_out;
+fet_endchar;
+
+
+fet_beginchar ("Quart rehead", "d2re")
+	draw_re_head (1.55, -1);
+	fill p_out;
+fet_endchar;
+
+
+def draw_mi_head (expr width_factor) =
+	save path_out, path_in;
+	save ne_dist, nw_dist;
+	path path_out, path_in;
+	pair ne_dist, nw_dist;
+
+	set_char_box (0, width_factor * noteheight#,
+		      0.5 noteheight#, 0.5 noteheight#);
+
+	pickup pencircle scaled solfa_pen_thick;
+
+	lft x1 = 0;
+	y1 = 0;
+	bot y2 = -d;
+	x2 = .5 [x1, x3];
+	rt x3 = w;
+	x4 = x2;
+	y3 = y1;
+	top y4 = h;
+
+	z6 - z5 = whatever * (z2 - z1);
+	z8 - z7 = whatever * (z2 - z1);
+	z8 - z5 = whatever * (z4 - z1);
+	z6 - z7 = whatever * (z4 - z1);
+
+	ne_dist = (unitvector (z4 - z1) rotated 90) * 0.5 solfa_pen_thick;
+	nw_dist = (unitvector (z1 - z2) rotated 90) * 0.5 solfa_pen_thick;
+
+	z5 = whatever [z1, z4] - ne_dist;
+	z5 = whatever [z1, z2] - 1.5 nw_dist;
+
+	z5 - z1 = -(z7 - z3);
+
+	labels (range 1 thru 8);
+
+	path_in := z5
+		   -- z6
+		   -- z7
+		   -- z8
+		   -- cycle;
+
+	path_out := lft z1
+		    .. (z1 + nw_dist)
+		    --- (z2 + nw_dist)
+		    .. bot z2
+		    .. (z2 - ne_dist)
+		    --- (z3 - ne_dist)
+		    .. rt z3
+		    .. (z3 - nw_dist)
+		    --- (z4 - nw_dist)
+		    .. top z4
+		    .. (z4 + ne_dist)
+		    --- (z1 + ne_dist)
+		    .. cycle;
+enddef;
+
+
+fet_beginchar ("Whole mihead", "s0mi")
+	draw_mi_head (1.8);
+	fill path_out;
+	unfill path_in;
+fet_endchar;
+
+
+fet_beginchar ("Half mihead", "s1mi")
+	draw_mi_head (1.6);
+	fill path_out;
+	unfill path_in;
+fet_endchar;
+
+
+fet_beginchar ("Quart mihead", "s2mi")
+	draw_mi_head (1.65);
+	fill path_out;
+fet_endchar;
+
+
+def draw_fa_head (expr width_factor) =
+	set_char_box (0, width_factor * noteheight#,
+		      0.5 noteheight#, 0.5 noteheight#);
+
+	save p_down_in, p_down_out, p_up_in, p_up_out, nw_dist;
+	path p_down_in, p_down_out, p_up_in, p_up_out;
+	pair nw_dist;
+
+	pickup pencircle scaled solfa_pen_thick;
+
+	lft x1 = 0;
+	top y1 = h;
+
+	rt x2 = w;
+	y2 = y1;
+	bot y3 = -d;
+	x3 = x2;
+
+	y4 = y3;
+	x4 = x1;
+
+	labels (range 1 thru 4);
+
+	nw_dist = (unitvector (z1 - z3) rotated 90) * 0.5 solfa_pen_thick;
+
+	p_up_in := (((z1 - nw_dist) -- (z3 - nw_dist)) intersectionpoint
+		     (bot z1 -- bot z2))
+		   -- (((z1 - nw_dist) -- (z3 - nw_dist)) intersectionpoint
+			(lft z3 -- lft z2))
+		   -- (z2 + 0.5 solfa_pen_thick * (-1, -1))
+		   --- cycle;
+
+	p_up_out := lft z1
+		    .. (z1 + nw_dist)
+		    --- (z3 + nw_dist)
+		    .. bot z3
+		    .. rt z3
+		    --- rt z2
+		    .. top z2
+		    --- top z1
+		    .. cycle;
+
+	p_down_in := p_up_in rotated 180 shifted (w, 0);
+	p_down_out := p_up_out rotated 180 shifted (w, 0);
+
+	charwy := 0.0;
+	charwx := charwd;
+enddef;
+
+
+fet_beginchar ("Whole fa up head", "d0fa")
+	draw_fa_head (1.8);
+	fill p_up_out;
+	unfill p_up_in;
+fet_endchar;
+
+
+fet_beginchar ("Whole fa down head", "u0fa")
+	draw_fa_head (1.8);
+	fill p_down_out;
+	unfill p_down_in;
+fet_endchar;
+
+
+fet_beginchar ("half fa up head", "d1fa")
+	draw_fa_head (1.5);
+	fill p_up_out;
+	unfill p_up_in;
+fet_endchar;
+
+
+fet_beginchar ("Half fa down head", "u1fa")
+	draw_fa_head (1.5);
+	fill p_down_out;
+	unfill p_down_in;
+fet_endchar;
+
+
+fet_beginchar ("Quarter fa up head", "u2fa")
+	draw_fa_head (1.55);
+	fill p_up_out;
+fet_endchar;
+
+
+fet_beginchar ("Quarter fa down head", "d2fa")
+	draw_fa_head (1.55);
+	fill p_down_out;
+fet_endchar;
+
+
+def draw_la_head (expr width_factor) =
+	set_char_box (0, width_factor * noteheight#,
+		      0.5 noteheight#, 0.5 noteheight#);
+	save p_in, p_out;
+	path p_in, p_out;
+
+	pickup pencircle scaled solfa_pen_thick;
+
+	lft x1 = 0;
+	top y1 = h;
+
+	rt x2 = w;
+	y2 = y1;
+	bot y3 = -d;
+	x3 = x2;
+
+	y4 = y3;
+	x4 = x1;
+
+	labels (range 1 thru 4);
+
+	p_in := (z1 + 0.5 solfa_pen_thick * (1, -1))
+		-- (z2 + 0.5 solfa_pen_thick * (-1, -1))
+		-- (z3 + 0.5 solfa_pen_thick * (-1, 1))
+		-- (z4 + 0.5 solfa_pen_thick * (1, 1))
+		-- cycle;
+
+	p_out := top z1
+		 --- top z2
+		 .. rt z2
+		 --- rt z3
+		 .. bot z3
+		 --- bot z4
+		 .. lft z4
+		 --- lft z1
+		 .. cycle;
+enddef;
+
+
+fet_beginchar ("Whole lahead", "s0la")
+	draw_la_head (1.8);
+	fill p_out;
+	unfill p_in;
+fet_endchar;
+
+
+fet_beginchar ("Half lahead", "s1la")
+	draw_la_head (1.5);
+	fill p_out;
+	unfill p_in;
+fet_endchar;
+
+
+fet_beginchar ("Quart lahead", "s2la")
+	draw_la_head (1.55);
+	fill p_out;
+fet_endchar;
+
+
+def draw_ti_head (expr width_factor, dir) =
+	set_char_box (0, width_factor * noteheight#,
+		      0.5 noteheight#, 0.5 noteheight#);
+	save p_in, p_out, p_top;
+	save left_dist, right_dist;
+	path p_in, p_out, p_top;
+	pair left_dist, right_dist;
+	save cone_height;
+	cone_height = 0.64;
+
+	pickup pencircle scaled solfa_pen_thick;
+
+	x1 = .5 [x2, x4];
+	bot y1 = -d;
+	lft x2 = 0;
+	y2 = cone_height [y1, y3];
+	rt x4 = w;
+	y4 = y2;
+	x3 = x1;
+	top y3 = h;
+
+	labels (range 1 thru 4);
+
+	left_dist = (unitvector (z2 - z1) rotated 90) * 0.5 solfa_pen_thick;
+	right_dist = (unitvector (z1 - z4) rotated 90) * 0.5 solfa_pen_thick;
+
+	p_top := (z2 - right_dist) .. (top z3){right} .. (z4 - left_dist);
+
+	p_in := (((z1 - left_dist) -- (z2 - left_dist)) intersectionpoint
+		  ((z1 - right_dist) -- (z4 - right_dist)))
+		-- (((z1 - left_dist) -- (z2 - left_dist)) intersectionpoint
+		     ((z2 + right_dist) .. {right}(bot z3)))
+		.. bot z3
+		.. (((bot z3){right} .. (z4 + left_dist)) intersectionpoint
+		     ((z1 - right_dist) -- (z4 - right_dist)))
+		-- cycle;
+
+	p_out := bot z1
+		 .. (z1 + left_dist)
+		 --- (z2 + left_dist)
+		 .. lft z2
+		 .. (z2 - right_dist){direction 0 of p_top}
+		 & p_top
+		 & {direction infinity of p_top}(z4 - left_dist)
+		 .. rt z4
+		 .. (z4 + right_dist)
+		 --- (z1 + right_dist)
+		 .. cycle;
+
+	charwx := charwd;
+	charwy := cone_height [-chardp, charht];
+	if dir = -1:
+		charwy := - charwy;
+	fi;
+enddef;
+
+
+fet_beginchar ("Whole up tihead", "s0ti")
+	draw_ti_head (1.8, 1);
+	fill p_out;
+	unfill p_in;
+fet_endchar;
+
+
+fet_beginchar ("Half up tihead", "u1ti")
+	draw_ti_head (1.5, 1);
+	fill p_out;
+	unfill p_in;
+fet_endchar;
+
+
+fet_beginchar ("Half down tihead", "d1ti")
+	draw_ti_head (1.5, -1);
+	fill p_out;
+	unfill p_in;
+fet_endchar;
+
+
+fet_beginchar ("Quart up tihead", "u2ti")
+	draw_ti_head (1.55, 1);
+	fill p_out;
+fet_endchar;
+
+
+fet_beginchar ("Quart down tihead", "d2ti")
+	draw_ti_head (1.55, -1);
+	fill p_out;
+fet_endchar;
+
+
+fet_endgroup("noteheads");
+
+
+%
+% we derive black_notehead_width# from the quarter head,
+% so we have to define black_notehead_width (pixel qty)
+% after the black_notehead_width# itself.
+%
+% Let's keep it outside the group as well.
+%
+
+define_pixels (black_notehead_width);