X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=mf%2Ffeta-bolletjes.mf;h=e65a03ff00cef7620de54f0d3904d894bd9aaf2f;hb=cc739e9e674e0b88fdff419f40df6c9f3d4ba5ea;hp=c9ffb7ca377dc0c6545f31dc35fd687d525ad6f4;hpb=fd35c1854983063501a1152c3827530e866dcde3;p=lilypond.git

diff --git a/mf/feta-bolletjes.mf b/mf/feta-bolletjes.mf
index c9ffb7ca37..e65a03ff00 100644
--- a/mf/feta-bolletjes.mf
+++ b/mf/feta-bolletjes.mf
@@ -1,203 +1,496 @@
-% 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--2003 Jan Nieuwenhuizen <janneke@gnu.org>
+% & Han-Wen Nienhuys <hanwen@cs.uu.nl>
+% & Juergen Reuter <reuter@ipd.uka.de>
+% 
+
+test_outlines := 0;
+
 
 % most beautiful noteheads are pronounced, not circular, 
 % and not even symmetric.
 % These examples are inspired by [Wanske], see literature list
 
 
-save black_notehead_width;
-numeric black_notehead_width;
 
-fet_begingroup("balls");
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% NOTE HEAD VARIABLES
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+save black_notehead_width, noteheight,
+	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.48staff_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 extremes on the long axis (by SLANT * ELLIPSIDITY,
+% so SLANT = -1, puts the extreme on the long axis next to the short axis one.)
+%
+
+def draw_outside_ellipse (expr ellipsidity, tilt, superness,
+			slant) =
+	save attachment_y;
+	save p;
+	path p;
+
+	p := superellipse ((ellipsidity, 0), (-slant * ellipsidity, 1.0),
+			(- ellipsidity, 0), (slant * ellipsidity, -1.0), superness);
+
+	p := p rotated tilt;
 
-noteheight#:=interline#+ (1 + overdone_heads) *stafflinethickness#;
-define_pixels(noteheight);
+	save top_point, right_point;
+	pair top_point, right_point;
 
-def draw_brevis =
-	save beamheight, head_width;
-	save holeheight, stem_width;
-	save serif_size, serif_protrude;
+	top_point := directionpoint left of p;
+	right_point := directionpoint up of p;
 
-	head_width# = 2 interline#;
-	holeheight = 3 stafflinethickness;
-	stem_width = 1.4 stafflinethickness;
+	save scaling, width, height;
 
+	scaling# = noteheight# /(2 ypart (top_point));
+	width# := 2 xpart (right_point) * scaling#;
 
-	define_pixels(head_width);
-	set_char_box(0, head_width#, noteheight#/2, noteheight#/2);
+	define_pixels (width, scaling);
 	
-	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);
-
-	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);
-
-	penlabels(1,2,3,4, 5);
-	fill z1r -- z1l -- z5r{down} .. z5l{up} .. z3l{right}
-		-- z4l -- z4r -- z3r{left} .. z2r{up} -- cycle;
-
-	addto currentpicture also currentpicture yscaled -1;
-	addto currentpicture also currentpicture reflectedabout(z4r, z4l);
+	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 ellipsidity, tilt, superness, clearance,
+			center) =
+begingroup
+	save p;
+	path p;
+
+	p := superellipse ((ellipsidity, 0), (0, 1.0),
+			(- ellipsidity, 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;
 
-fet_beginchar("Brevis notehead", "-1", "brevisball")
-	draw_brevis;
+
+
+
+
+%
+% dimensions aren't entirely right.
+%
+fet_beginchar ("Brevis notehead", "-1", "brevishead");
+	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", "0", "wholehead")
+	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", "1", "halfhead")
+	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", "2", "quarthead")
+	draw_outside_ellipse (1.54 - puff_up_factor / 2.0, 32, 0.707, 0);
+	black_notehead_width# := charwd;
+fet_endchar;
+
+fet_beginchar("Quart noteheadPQ", "2PQ", "quartheadPQ")
+	draw_outside_ellipse (1.0 - puff_up_factor / 2.0, 32, 0.707, 0);
+fet_endchar;
+
+fet_beginchar("Quart noteheadAA", "2AA", "quartheadAA")
+	draw_outside_ellipse (1.2 - puff_up_factor / 2.0, 32, 0.707, 0);
+fet_endchar;
+
+fet_beginchar("Quart noteheadAB", "2AB", "quartheadAB")
+	draw_outside_ellipse (1.3 - puff_up_factor / 2.0, 32, 0.707, 0);
+	
+fet_endchar;
+fet_beginchar("Quart noteheadAC", "2AC", "quartheadAC")
+	draw_outside_ellipse (1.4 - puff_up_factor / 2.0, 32, 0.707, 0);
+	
+fet_endchar;
+fet_beginchar("Quart noteheadAD", "2AD", "quartheadAD")
+	draw_outside_ellipse (1.5 - puff_up_factor / 2.0, 32, 0.707, 0);
+	
+fet_endchar;
+fet_beginchar("Quart noteheadBA", "2BA", "quartheadBA")
+	draw_outside_ellipse (1.2 - puff_up_factor / 2.0, 35, 0.707, 0);
+	
+fet_endchar;
+fet_beginchar("Quart noteheadBB", "2BB", "quartheadBB")
+	draw_outside_ellipse (1.3 - puff_up_factor / 2.0, 35, 0.707, 0);
+	
+fet_endchar;
+fet_beginchar("Quart noteheadBC", "2BC", "quartheadBC")
+	draw_outside_ellipse (1.4 - puff_up_factor / 2.0, 35, 0.707, 0);
+fet_endchar;
+fet_beginchar("Quart noteheadBD", "2BD", "quartheadBD")
+	draw_outside_ellipse (1.5 - puff_up_factor / 2.0, 35, 0.707, 0);
+	
+fet_endchar;
+fet_beginchar("Quart noteheadCA", "2CA", "quartheadCA")
+	draw_outside_ellipse (1.2 - puff_up_factor / 2.0, 38, 0.707, 0);
+	
+fet_endchar;
+fet_beginchar("Quart noteheadCB", "2CB", "quartheadCB")
+	draw_outside_ellipse (1.3 - puff_up_factor / 2.0, 38, 0.707, 0);
+	
+fet_endchar;
+fet_beginchar("Quart noteheadCC", "2CC", "quartheadCC")
+	draw_outside_ellipse (1.4 - puff_up_factor / 2.0, 38, 0.707, 0);
+	
+fet_endchar;
+fet_beginchar("Quart noteheadCD", "2CD", "quartheadCD")
+	draw_outside_ellipse (1.5 - puff_up_factor / 2.0, 38, 0.707, 0);
+fet_endchar;
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+fet_beginchar("Whole diamondhead", "0diamond", "wholediamondhead")
+	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", "1diamond", 
+	"halfdiamondhead")
+
+	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 diamondheadh", "2diamondh", "diamondheadh")
+	draw_outside_ellipse (1.80, 35, 0.495, -0.25);
+fet_endchar;
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+
+
+
+def def_triangle =
+	save triangle,kern; path triangle;
+	save left_point, height, width;
+	pair exact_left_point;
+	save pen_thick;
+	pen_thick# = stafflinethickness#  + .1 staff_space#;
+	define_pixels(pen_thick);
+
+	exact_left_point := llap# * dir (90 + tilt);
+	height# = max (ypart exact_left_point,
+			-ypart  (exact_left_point rotated 120)) + pen_thick#/2;
+
+	kern# = 1/3 xpart (exact_left_point - (exact_left_point rotated 120));
+	width# = xpart (-exact_left_point + (exact_left_point rotated 240));
+	define_pixels (kern);	
+	z1 = (hround_pixels (xpart exact_left_point), vround_pixels  (ypart exact_left_point));
+	z2 = z1 rotated 120;
+	z3 = z1 rotated 240;
+
+	z12 = caveness[.5[z1,z2],z3];
+	z23 = z12 rotated 120;
+	z31 = z12 rotated 240;
+	triangle = z1 .. z12 .. z2 ..
+		    z2 .. z23 .. z3 ..
+		    z3 .. z31 .. z1 ..
+		    cycle;
+	triangle := triangle shifted (-x1+pen_thick/2-kern,0) xscaled xs;
+	pickup pencircle scaled pen_thick xscaled xs;
+%	labels(1,2,12,23,31,3);
+	set_char_box(0, width# - kern#+ pen_thick#, height#, height#);
+enddef;
+
+fet_beginchar("Whole trianglehead", "0triangle", "wholetrianglehead")
+	save hei,xs;
+	save llap;
+	save tilt;
+
+	tilt = 40;
+	llap# = 3/4noteheight#;
+
+	xs = 1.5;
+	caveness:=0.1;
+	def_triangle;
+	draw triangle;
+fet_endchar;
+
+fet_beginchar("Half trianglehead", "1triangle", "halftrianglehead")
+	save hei,xs;
+	save llap;
+	save tilt;
+
+	tilt = 40;
+	llap# = 2/3noteheight#;
+	xs = 1.2;
+	caveness:=0.1;
+	def_triangle;
+	draw triangle;
+fet_endchar;
+
+fet_beginchar("Quart trianglehead", "2triangle", "trianglehead")
+	save hei,xs;
+	save llap;
+	save tilt;
+	tilt = 40;
+	llap# = 2/3noteheight#;
+	xs = 1.0;
+	caveness:=0.1;
+	def_triangle;
+	filldraw triangle;
+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
+% slash heads are for indicating improvisation. They are  
+% twice as high as normal heads.
 %
-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);
+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;
 	
-	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;
+	rt x3 = w;
+	y3 = y2;
+	y4 = y1;
+	x3- x2 = x4 - x1;
+
+	ne_dir := unitvector( z3  - z4);
+	filldraw z1 --- z2 --- z3 --- 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("Whole slashhead","0slash","wholeslashhead")
+	draw_slash(4 slash_thick# + 0.5 staff_space#);
+fet_endchar;
+
+fet_beginchar("Half slashhead","1slash","halfslashhead")
+	draw_slash(3.0 slash_thick# + 0.15 staff_space#);
+fet_endchar;
+
+fet_beginchar("Quart slashhead","2slash","quartslashhead")
+	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 stafflinethickness def
+%
+def draw_cross(expr thick) =
+	save pent, slant, ne_dir;
+	pair ne_dir;
+	save crz; path crz;
+
+	pen_thick# := 1.2stafflinethickness#;
+	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);
+
 	
-	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;
-	black_notehead_width# := wd#;
-	notehead_draw;
-fet_endchar;
-
-
-
-
-fet_endgroup("balls");
+	labels (1,2,3,4,5,6);
+
+	crz = (z6 -- z3 -- z4 -- z5) ;
+
+	draw crz shifted(w/2,0);
+	draw crz xscaled -1 shifted(w/2,0);
+	draw crz yscaled -1 shifted(w/2,0);
+	draw crz scaled -1 shifted(w/2,0);
+
+	charwx := charwd;
+	charwy := y1;
+		message (decimal charwx);
+		message (decimal charwy);
+	z12 = (charwx * hppp, y1 * vppp);
+	labels (12);
+enddef;
+
+fet_beginchar("Whole Crossed notehead", "0cross", "wholecrossedhead")
+	wid# := black_notehead_width#+4stafflinethickness#;
+	hei# := noteheight#+stafflinethickness#;
+	set_char_box(0, wid#,hei#/2,hei#/2);
+	
+	draw_cross (3.75);
+fet_endchar;
+
+fet_beginchar("Half Crossed notehead", "1cross", "halfcrossedhead")
+	wid# := black_notehead_width#+2stafflinethickness#;
+	hei# := noteheight#+stafflinethickness#/2;
+	set_char_box(0, wid#,hei#/2,hei#/2);
+	draw_cross(3.0);
+fet_endchar;
+
+fet_beginchar("Crossed notehead", "2cross", "crossedhead")
+	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", "2xcircle", "xcircledhead")
+	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;
+	draw fullcircle xscaled 2cxr yscaled 2cyr shifted (w/2,0);
+	xpos := cxr/sqrt2;
+	ypos := cyr/sqrt2;
+	draw (-xpos+w/2,-ypos) -- (xpos+w/2,ypos);
+	draw (-xpos+w/2,ypos) -- (xpos+w/2,-ypos);
+
+	charwx := charwd ; 
+	charwy := 0 ;
+
+	z12 = (charwx * hppp , charwy * vppp );
+	labels (12);
+fet_endchar;
+
+
+
+fet_endgroup("noteheads");
 
 define_pixels(black_notehead_width);