X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=mf%2Ffeta-klef.mf;h=f1ed167ed506fae9597966afaa6c287dc866cab7;hb=2745cbd907f8216a4cc1fc5f488ae19efdfdbd10;hp=3d78d804f42c2c7aab0844a6087b1ca92d1cd662;hpb=946c135a338e2daadfed8da3026f0ed9d29bf9ad;p=lilypond.git

diff --git a/mf/feta-klef.mf b/mf/feta-klef.mf
index 3d78d804f4..f1ed167ed5 100644
--- a/mf/feta-klef.mf
+++ b/mf/feta-klef.mf
@@ -1,46 +1,46 @@
+% feta-klef.mf --  implement Clefs -*-Fundamental-*-
 % 
-% feta-klef.mf --  implement Clefs
-% 
-% source file of the Feta (Font-En-Tja) music font
+% part of LilyPond's pretty-but-neat music font
+%
+% source file of the Feta (not the Font-En-Tja) music font
 % 
-% (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>,
-% Jan Nieuwenhuizen <jan@digicash.com>
-
-
+% (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>,
+% Jan Nieuwenhuizen <janneke@gnu.org>,
+% Juergen Reuter <reuter@ipd.uka.de>
 
 
 fet_begingroup("clefs");
 
 %
-% [Ross] says that clefs take 1 interline space on the left and right
+% [Ross] says that clefs take 1 staff_space space on the left and right
+%
+% this is now handled in the lilypond spacing engine. 
 %
+
 def set_horizontal_spacing =
 	save left_space ,right_space;
-	left_space# = reduced_il#;
-	right_space# = reduced_il#;
+	left_space# = 0;
+	right_space# = 0;
 enddef;
 
-def draw_staff(expr first, last)=
-	pickup pencircle scaled stafflinethickness;
-	for i:= first step 1 until last:
-		draw (- interline, i* interline) .. (4 interline, i* interline);
-	endfor
-	enddef;
 
 % [Wanske] says the bulbs should be positioned about 1/4 right of the
 % "arrow"
+
+%
+% TODO: the hair-curve at z6r looks a little awkward.
 def draw_c_clef (expr reduction) = 
-	save hair, norm, reduced_il, right_edge;
-	reduced_il#=interline#*reduction;
-	norm#:=2/3reduced_il#;
+	save hair, norm, reduced_ss, right_edge;
+	reduced_ss#=staff_space#*reduction;
+	norm#:=2/3reduced_ss#;
 	hair#:=1/6norm#;
 
 	set_horizontal_spacing;
 	right_edge# = 15/4norm#+2hair#;
 
 	set_char_box (left_space#, right_edge# + right_space#, 
-		2 reduced_il#, 2 reduced_il#);
-	define_pixels (hair,norm,reduced_il, right_edge);
+		2 reduced_ss#, 2 reduced_ss#);
+	define_pixels (hair,norm,reduced_ss, right_edge);
 
 	draw_block ((0,-d), (3/4norm+1/2hair,h));
 	draw_block ((3/4norm+2hair,-d), 
@@ -56,7 +56,7 @@ def draw_c_clef (expr reduction) =
 	z3=(((right_edge -xoff)/2)+xoff,2hair);
 
 	penpos4(hair,0);
-	z4=(xoff+1/2norm+1/2hair,reduced_il-hair);
+	z4=(xoff+1/2norm+1/2hair,reduced_ss-hair);
 	
 	penpos5(4hair,0);
 	z5=(xoff+5/4hair,0);
@@ -64,111 +64,204 @@ def draw_c_clef (expr reduction) =
 	penpos6(norm-hair,90);
 	z6=(xoff+3/4norm,0);
 
-	penpos7(hair,-90);
-	z7r=(x1,-d);
 
 	save t; t=0.833;
 	save p; path p;
 	p = z5l..z4l{up}..z4r{down}..z3r{right}..tension t..z2r{up}
-		..tension t..z1r{left}..z1l{right}..tension t..z2l{down}
+		..tension t..
+		flare_path(z1l,180,90,hair,norm-1/2hair, -1)
+		..tension t..z2l{down}
 		..z3l{left}..z6r..z5r{down};
 	pickup pencircle scaled 1pt#;
 	filldraw p..(reverse p yscaled -1)..cycle;
 	penlabels (1,2,3,4,5,6);
 
 	% ugh, should be bulb, not flare?
-	draw_flare(z1l,180,90,hair,norm-1/2hair);
-	draw_flare(z7r,180,-90,hair,norm-1/2hair);
+
 	enddef;
 
-fet_beginchar ("C clef", "alto", "altoclef")
+fet_beginchar ("C clef", "C", "altoclef")
 	if test = 1:
-		draw_staff (-2,2);
+		draw_staff (-2,2, 0.0);
 	fi;
 	draw_c_clef (1.0);
 fet_endchar;
 
-fet_beginchar ("C clef", "alto_change", "caltoclef")
+fet_beginchar ("C clef", "C_change", "caltoclef")
 	if test = 1:
-		draw_staff (-2,2);
+		draw_staff (-2,2, 0.0);
 	fi;
 	draw_c_clef (.8);
 fet_endchar;
 
 %
-% Inspired by Baerenreiter and Breitkopf
-% 
-% FIXME: dims
-% FIXME: right vertical tangent seems to be lower than the F-line
-% FIXME: bulb curve smoothly into "long curve" on the  inside
+% New bulb routine:
+%
+% Insert a brushed piece of the path, and draw a bulb separately
+%
+% The bulb is  circular form. Neat merging of the bulb and brushed path
+% is done by playing with tension.
 %
 %
-% [Wanske] says that the extreme x point should be exactly between 
-% the dots, but her picture shows that the extreme is ~ 0.2 ss lower
 
-def draw_bass_klef(expr exact_center, reduction) = 
-	save reduced_il, left_tilt, left_thick, ball_to_right;
-	reduced_il# = interline# * reduction;
-	
-	set_horizontal_spacing;
-	ball_to_right# = 2.1 reduced_il#;
-	set_char_box(left_space# +
-		- xpart exact_center,
-		right_space# +
-		xpart exact_center + ball_to_right#, 
-		- ypart exact_center + 2.5 reduced_il#, 
-		ypart exact_center +reduced_il#);
+def new_bulb (expr outer_tangent_point, 
+    big_radius, bulb_radius, flare, direction, turning_dir) =
+
+begingroup;
+    save p, oldpen;
+    path p;
+    pen oldpen;
+    save center;
+    pair center;
+    clearxy;
+    
+    center = outer_tangent_point +big_radius* dir(0) + big_radius* dir(-turning_dir * 90)
+      - bulb_radius * dir (- turning_dir * 90);
+
+    z1 = center + bulb_radius * dir (turning_dir * 180);
+    z2 = center + bulb_radius * dir (turning_dir * 270);
+
+    z9 = center + bulb_radius * dir (0);
+    z10 = center + bulb_radius * dir (turning_dir *90);
+    z3 = outer_tangent_point + flare * dir (0);
+
+    labels(1,2,3,9,10);
+
+    % tension is needed to open up the space between return path and the
+    % ball.
+    fill
+%	draw
+      z9 .. z10 .. tension 1.1  .. z1 .. z2 .. cycle;
+    
+    p:=    outer_tangent_point{dir (-turning_dir* 90)}
+       .. tension 0.97
+       .. {dir (turning_dir * 90)}z9 -- z3
+     ;
+    if direction = 1:
+      p
+    else:
+      reverse p
+    fi
+  endgroup
+enddef;
 
-	define_pixels(reduced_il, ball_to_right);
-	left_tilt = 5;
-	left_thick = .25  reduced_il;
 
-	x1r - x1l = left_thick;
-	z1l = (hround_pixels(xpart exact_center), 
-		vround_pixels(ypart exact_center));
 
-	y2 = reduced_il;
+%
+%
+% There is  some variation is shape of bass clefs. Important points
+%
+% * the size of the swoosh tip: in some clefs, it almost reaches the
+% bottom staff line, in some it crosses the 2nd line from the bottom
+% with a small overshoot.
+%
+% The most popular design is where the X part of the tip is aligned 
+% left bulb boundary, and the Y part ends on the 2nd staffline exactly. 
+% This is what we do.
+%
+% * The size of the bulb. The diameter of the bulb is the width of the 
+% open space.
+%
+% * The y-alignment of the bulb. The center of the bulb can be on or slightly 
+% above the staff line.
+%
+% * The position of the dots. They can be symmetrical around the
+% staffline, centered in the staff space. The Baerenreiter SCS has the
+% bottom dot raised by approx. 0.1 ss.
+%
+% * uncarefully set music may have overshoots at the top. We have none. 
+%
+% * It is not exactly clear where the vertical tangent at the right
+% of the swoosh should be.
+%
+%
+
+def draw_bass_clef(expr exact_center, reduction) = 
+        save reduced_ss, left_tilt, left_thick, swoosh_width;
+	save right_thickness, tip_protude;
+	pair tip_protude;
+        save dot_diam;
+        reduced_ss# = staff_space# * reduction;
+
+
+        2.2 dot_diam = round reduction* (staff_space - stafflinethickness);
+	right_thickness = 0.48;
+        left_thick = .25;
+        swoosh_width# = 2.1 reduced_ss#;
+%	tip_protude := (-stafflinethickness, -.2 staff_space);
+	tip_protude := (0, 0);	
+        set_horizontal_spacing;
+	bulb_y_offset := 0.15 staff_space;
+	overshoot_top := 0.0;
+	%% 
+
+        set_char_box(left_space# +
+                - xpart exact_center,
+                right_space# +
+                xpart exact_center + swoosh_width# + 7/12 reduced_ss#, 
+                - ypart exact_center + 2.5 reduced_ss#, 
+                ypart exact_center +reduced_ss#);
+
+        define_pixels(swoosh_width);
+	define_whole_pixels(reduced_ss); 
+        left_tilt = 5;
+
+	y1 = bulb_y_offset;
+	x1 = 0;
+
+        x2 = .5 [x1,x3];
+	x2l = x2r = x2;
+
+	y2l := vround_pixels (reduced_ss#  + 0.5 stafflinethickness#);
+	y2l - y2r = (1.0 + overshoot_top) * stafflinethickness;
+	y2 = .5 [y2l, y2r];
+
+        x3l - x1 =  swoosh_width;
+        x3l - x3r = right_thickness * reduced_ss;
+
+	% try to correct: the top dot seems farther away if y3l = 0.
+        y3l = 0.05 staff_space;
+	
+        z4 =  - (0, 2.0 reduced_ss) + tip_protude;
 
-	x3l - x1l =  ball_to_right;
-	x2 = .5 [x1,x3];
-	x3l - x3r = .48 reduced_il;
-	y3l = -0.05 interline;
-	x4 = x1l - stafflinethickness;
-	y4 = -2.2  reduced_il;
-	z5 = (x3l +  1/3 reduced_il, .5 reduced_il);
+        z5 = (x3l +  1/3 reduced_ss, .5 reduced_ss);
 
-	penpos1(whatever, left_tilt);
-	penpos2(1.2 stafflinethickness, -90);
-	penpos3(whatever,  185);
-	penpos4(stafflinethickness, 135);
+        penpos3(whatever,  185);
+        penpos4(stafflinethickness, 135);
 
-	draw_bulb(1, z1r,  z1l, .45 reduced_il, 1.0);
+	pickup pencircle scaled 1; 
+%	draw
+	fill
+           new_bulb (z1, 0.45 reduced_ss, 0.4 reduced_ss, 2.5 stafflinethickness,  1, 1)
 
+{dir (90)}
+	        .. z2r{right} .. tension 1.0 .. z3r{down}  .. {curl 0} 
+                simple_serif(z4r, z4l, 90) {curl 0}
+                .. z3l{up} .. tension 0.9 .. z2l{left} 
+                 .. cycle
+		;
+        labels(2,4);
+        labels(range 1 thru 12);
 
-	fill z1r{up} .. z2r{right} .. tension 1.0 .. z3r{down}  .. {curl 0} 
-		simple_serif(z4r, z4l, 90) {curl 0}
-		.. z3l{up} .. tension 0.9 .. z2l{left} 
-		.. z1l{dir (-90 + left_tilt)} -- cycle;
-	labels(2,4);
-	penlabels(1,2,3,4);
+	penlabels(2,3,4);
 
-	save dot_diam;
-	2 dot_diam = reduction* (interline - stafflinethickness);
-	pickup pencircle scaled dot_diam;
-	draw z5;
-	draw z5 yscaled -1;
+        pickup pencircle scaled dot_diam;
+        drawdot z5;
+        drawdot z5 yscaled -1;
 enddef;
 
 
 
-fet_beginchar("F clef ", "bass", "bassclef")
+
+fet_beginchar("F clef ", "F", "bassclef")
 	if test = 1:
-		draw_staff(-3,1);
+		draw_staff(-3,1, 0.0);
 	fi;
-	draw_bass_klef((.5 interline#, 0), 1.0);
+	draw_bass_clef((0, 0), 1.0);
 fet_endchar;
-fet_beginchar("F clef (reduced)", "bass_change", "cbassclef")
-	draw_bass_klef((.4 interline#, 0),0.8);
+
+fet_beginchar("F clef (reduced)", "F_change", "cbassclef")
+	draw_bass_clef((0, 0),0.8);
 fet_endchar;
 
 
@@ -176,11 +269,6 @@ fet_endchar;
 %
 % Inspired by Baerenreiter
 % 
-% FIXME top should be thinner at z8,
-% FIXME bulb should curve (see bass clef)
-% FIXME start (inside) should be little thinner
-% FIXME parametrise.
-%
 
 % Beste lezers, kijk,
 %
@@ -190,76 +278,86 @@ fet_endchar;
 % Ikzelf heb bijvoorbeeld over mijn eerste gave G-sleutel
 % 35 kilobyte metafont, 12 patchlevels, 0 vriendinnen en 45 dagen gedaan
 %
+%  -- vrij naar Van Kooten & De Bie
+%
+def debugfill = fill enddef;
 def draw_gclef (expr exact_center, reduction)=
-	save reduced_il, downstroke_dir, downstroke_angle, hair, center;
+	save reduced_ss, downstroke_dir, downstroke_angle, center;
 	save breapth_factor, inner_thick_end, thinness, thickness, thinnib;
-	save inner_start_angle, thinness, thinpen;
-	reduced_il# = interline# * reduction;
-	define_pixels(reduced_il);
+	save inner_start_angle, thinness;
+	reduced_ss# = staff_space# * reduction;
+	define_pixels(reduced_ss);
 	pair downstroke_dir, center;
 
 	center := (hround_pixels(xpart exact_center), 
 		vround_pixels(ypart exact_center));
 
-	hair =  .3 stafflinethickness;
-	thinness = 1.3 stafflinethickness;
-	downstroke_dir = (14, -75);
-	breapth_factor = 11/7;
+	thinness = 1.4 stafflinethickness;
+	downstroke_dir = unitvector (14, -75);
+	downstroke_angle = angle downstroke_dir;
+
+
+	breapth_factor = 21.0 /14;
 	inner_thick_end = 45;
 	inner_start_angle = downstroke_angle - 43;
-	thickness = .4 reduced_il - hair;
+	thickness = .4 reduced_ss;
+
+	thinnib = thinness;
 
-	thinnib = thinness - hair;
-	thinpen = thinness;
 	set_horizontal_spacing;
 	
 	set_char_box(
 		left_space# +
-		-xpart exact_center + 1.1 * breapth_factor* reduced_il#, 
+		-xpart exact_center + 1.0 * breapth_factor* reduced_ss#, 
 		right_space# +
-		xpart exact_center + .66 breapth_factor* reduced_il#,
-		-ypart exact_center + 3 * reduced_il#,
-		ypart exact_center + 5 * reduced_il#);
-	
-	pickup pencircle scaled hair;
-	downstroke_angle = angle downstroke_dir;
+		xpart exact_center + .66 breapth_factor* reduced_ss#,
+		-ypart exact_center + 2.6 * reduced_ss#,
+		ypart exact_center + 5 * reduced_ss#);
 
+
+	save upward_swoosh_angle;
+	upward_swoosh_angle =130 ;
+	penpos7(thickness, upward_swoosh_angle);
+	penpos5(thickness, upward_swoosh_angle);
+
+	
 	z1 = center + whatever * dir (inner_start_angle);
-	x1 = xpart center -.28 reduced_il;
+	x1 = xpart center -.28 reduced_ss;
 	
-	top z2r = center + (0,reduced_il + stafflinethickness/2);
+	top z2r = center + (0,reduced_ss + stafflinethickness/2);
 	
-	x4 = xpart center - .1 reduced_il;
-	bot y4r = -(reduced_il + .5 stafflinethickness);
+	x4 = xpart center - .1 reduced_ss;
+	bot y4r = -(reduced_ss + .5 stafflinethickness);
 
 	z3 = (z4 - center) rotated inner_thick_end + center;
-	
-	z5r = (- breapth_factor, .37)* reduced_il + center;
-	penpos5(thickness, 135);
+	x5r = - breapth_factor* reduced_ss + xpart center;
+	y5r = .37 reduced_ss + ypart center;
 
 	z6 = center + whatever * downstroke_dir;
-	y6 = ypart center + 2 reduced_il;
+	y6 = ypart center + 2 reduced_ss;
 
-	z7l - z6 = whatever *(z5- z6) ;
-	y7l = 3.5 reduced_il;
-	z8r = .4 [z9r, z7r] + 1.5 stafflinethickness * dir 52;
+	z7l - z6 = whatever * (z5 - z6) ;
+	y7l = 3.5 reduced_ss;
 
 	x9 = .7 [x10, x7r];
-	top y9l = 5 reduced_il;
-
-	y10 = 3. reduced_il;
-	y11 = -11/7 reduced_il;
+	top y9l = 5 reduced_ss;
 
-	y12 = ypart center - 18.5/7 reduced_il;
-	x12 = x11 - 5 /7 reduced_il;	
+	y11 = ypart center  - 47/28 reduced_ss;
+	y12 = ypart center  - 71/28 reduced_ss;
+	y13 = .48 [y12,y4r];
+	x11 - x13r  = 1.5 reduced_ss + 0.5 thinnib;
+	x12r = xpart (.45 [z13r , z11] + .75 reduced_ss * downstroke_dir) ;
 
-	z13 = z12 + .6 reduced_il*(-1,1);
+%	z10=  center + whatever * dir (downstroke_angle - 1.5 );
+	x10 = x6 - 2 thinnib;
+	y10 = ypart center + 3.5  reduced_ss;
+	y10l  - y10r = 1.2 thickness;
+	z10r - z10l =
+		.7 thinnib* dir (downstroke_angle + 90) + whatever * downstroke_dir;
 
-	(z10r - z10l) dotprod (unitvector downstroke_dir rotated 90) = 
-		thinnib;
+	z10 = .5 [z10l, z10r];
 
-	center - z10= whatever * downstroke_dir;
-	center - z11 =  whatever * downstroke_dir;
+	z11 =  center + whatever * downstroke_dir +  ( .05 reduced_ss, 0);
 
 	penpos1(thinnib, inner_start_angle);
 	penpos2(thickness, 90);
@@ -267,50 +365,321 @@ def draw_gclef (expr exact_center, reduction)=
 	penpos4(thinnib, -90);
 
 
-	penpos7(thickness, 135);
-	penpos8(1.5 thinnib, - 70 + angle downstroke_dir);
-	penpos9(1.4 thickness, -80);  % ugh
-	penpos10(whatever, downstroke_angle + 10);
-	penpos11(thinnib, downstroke_angle + 90);
-	penpos12(thinnib, -90);
-	penpos13(3 thinnib, 180);
+	penpos9(1.45 thickness, -70);  
+	save lipje;
+	pair lipje;
+	lipje= .5 [z9l, z9r] +  .25 ((z9r- z9l)  rotated -90);
+	penpos13(2 thinnib, 180);
 
-	
-	filldraw z2l{right}   .. z3l.. z4l{left} .. z5l{up}  .. z7l{up} 
+	pickup pencircle scaled 1;
+
+	debugfill
+		z2l{right}
+		.. z3l
+		.. z4l{left}
+		.. z5l{up}
+		.. z7l{up} 
 		%.. z8l	
 		.. tension 1.2 
-		.. z9l & z9l ..
-		{downstroke_dir}z10l --- z11l -- z11r --- z10r{- downstroke_dir} 
-		.. tension .8 
-		.. z9r & z9r{dir (downstroke_angle+ 40)} % ugh
+		.. z9l -- lipje
+		--z9r % {dir (downstroke_angle+ 0)}
+		.. tension 0.8
 		%.. z8r
 		.. z7r{down} .. z5r{down} .. z4r{right}
 		.. z3r .. z2r{left} .. 
 		tension .95 .. 
-		z1r -- z1l 
+		z1r -- simple_serif(z1r, z1l, 80) -- z1l 
 		.. tension 0.85 ..cycle;
 
-	filldraw simple_serif(z1r, z1l, 90)  -- cycle;
+ 	save p, staffline_time, staff_line_path, down_staff_line_intersection;
+	path p, staff_line_path;
+	pair down_staff_line_intersection;
+	p := z4{left} .. z5{up} .. z7{up} ;
+
+	staff_line_path := (-reduced_ss, 2 reduced_ss) ..  (2 reduced_ss,2 reduced_ss);
+
+	draw p;
+
+
+	% we don't do this with a path: variations in thickness
+	% are  very easily made and look very ugh.
+	pickup pencircle scaled thinnib;
+	
+
+	save bot_angle;
+
+	bot_angle = -180; % downstroke_angle- 87;
+
+	penpos12(thinnib, bot_angle + 90);
+
+	p := z9 .. z10{down}
+		.. z6
+		.. (.52 [z4, z3])
+		.. z11{down}
+		.. z12{dir(bot_angle)}
+		.. z13{up}
+	;
+	save down_intersection_t;	
+	down_intersection_t :=  xpart (p intersectiontimes  staff_line_path) ;
+	down_staff_line_intersection = point down_intersection_t of p;
+	z14 = down_staff_line_intersection;
+	penpos14(thinnib, angle (direction down_intersection_t of p) + 90);
+
+	save start_angle;
+	start_angle=angle (direction xpart (p intersectiontimes z11) of p);
+	penpos11 (thinnib, start_angle+ 90);
 
-	filldraw z12r{left} .. z13r{up} -- z13l{down} .. z12l{right} .. cycle;
+	save loop_end_dir;
+	pair loop_end_dir;
+	loop_end_dir = direction (xpart (p intersectiontimes staff_line_path)) of p;
+	draw p;
 
-	draw_bulb(-1,  z13l, lft z13r, 6/14 reduced_il, 1.0);
+	penpos6(thinnib, angle (loop_end_dir) + 90);
+	pickup pencircle scaled 1;
+	debugfill
+		z9l
+		.. {down}z10l
+		.. z14l{loop_end_dir} -- z14r{-loop_end_dir}
+		.. z10r{up}
+		.. tension .98
+		.. z9r
+		-- cycle;
 
-	pickup pencircle scaled (thinpen);
-	draw z10 --- z11 .. z12{left};
+	pickup pencircle scaled 1;
 
-	penlabels(range 1 thru 15);
+	debugfill
+		z11r{dir(start_angle)}
+		.. z12r{dir(bot_angle)}
+
+		..new_bulb (z13r, 0.45 reduced_ss, 0.38 reduced_ss, 3 stafflinethickness,  1, -1) {down}
+
+%		.. tension 0.98
+		.. z12l{-dir (bot_angle)}
+
+		.. z11l{-dir(start_angle)}
+		.. cycle;
+
+
+
+	penlabels(range 1 thru 16);
 enddef;
 
 
-fet_beginchar("G clef", "violin", "violinclef")
+fet_beginchar("G clef", "G", "trebleclef")
 	if test = 1:
-		draw_staff(-1,3);
+		draw_staff(-1,3, 0.0);
 	fi;
-	draw_gclef((1.7 interline#,0), 1.0);
+	draw_gclef((1.7 staff_space#,0), 1.0);
 fet_endchar;
-fet_beginchar("G clef", "violin_change", "cviolinclef")
-	draw_gclef((1.3 interline#,0), .8);
+fet_beginchar("G clef", "G_change", "ctrebleclef")
+	draw_gclef((1.3 staff_space#,0), .8);
+fet_endchar;
+
+%%%%
+% PERCUSSION
+%
+%
+
+
+def draw_percussion_clef(expr reduction) =
+	save reduced_ss;
+	reduced_ss# = staff_space# * reduction;
+	define_pixels(reduced_ss);
+	set_char_box(-.67reduced_ss#,2.0reduced_ss#,reduced_ss#,reduced_ss#);
+	razt := 0.45reduced_ss;
+	draw_block((-b,-d),(-b+razt,h));
+	draw_block((w-razt,-d),(w,h));
+enddef;
+
+fet_beginchar("percussion clef", "percussion", "percussionclef")
+	draw_percussion_clef(1.0);
+fet_endchar;
+
+fet_beginchar("percussion clef (reduced)", "percussion_change", "cpercussionclef")
+	draw_percussion_clef(.8);
+fet_endchar;
+
+def draw_tab_T(expr pos, siz, slant) =
+	begingroup;
+	clearxy;
+	pair vx,vy;
+	vx=(xpart siz) * dir 0;
+	vy=(ypart siz) * dir 90;
+
+	penpos1(.75penh, 100);
+	z1=z2+(1/6*vx-.15*vy);
+	penpos2(.9penw, 0);
+	z2l = pos+.75vy;
+	penpos3(penh,-100);
+	z3l = pos+.4vx+vy;
+	penpos4(penh,-90);
+	z4=-.1vy+.5[z3,z5];
+	penpos5(.8penh,-30);
+	x5r=xpart (pos+siz);
+	y5l=ypart (pos+siz);
+
+	penpos10(penw,170);
+	z10=pos+.55vx+.85vy;
+	penpos11(.75[penh,penw],170);
+	z11=z10-.5vy+.025vx;
+	penpos12(penh,100);
+	z12l=(xpart .5[z13,z11],ypart (pos-.025*siz));
+	penpos13(.75penh,60);
+	z13=pos +.2vx+.15vy;
+	
+	% penlabels (1,2,3,4,5,10,11,12,13);
+
+	soft_penstroke (z1e..tension 1.1
+		..z2e
+	   	..z3e{right}..tension 1.5
+		..z4e
+		..z5e
+		) slanted slant shifted (slant*-ypart pos,0);
+
+	soft_penstroke (z10e..tension 1.5
+		..z11e
+		..z12e..tension 1.1
+		..z13e{(z13r-z13l) rotated 90}
+		) slanted slant shifted (slant*-ypart pos,0);
+	endgroup;
+enddef;
+	   
+def draw_tab_A(expr pos, siz, slant) =
+	begingroup;
+	clearxy;
+	pair vx,vy;
+	vx=(xpart siz) * dir 0;
+	vy=(ypart siz) * dir 90;
+	
+	penpos1(.75penh,-110);
+	z1r=pos+.07vy;
+	penpos2(penh,-75);
+	z2r=(.5[x1,x3],ypart pos);
+	penpos3(.25[penh,penw],-30);
+	z3=(.45[x2,x4],.15[y2,y4]);
+	penpos4(1[penh,penw],0);
+	z4=pos+.5vx+.975vy;
+
+	penpos5(1[penh,penw],-180);
+	z5=z4;
+	penpos6(.2[penh,penw],-150);
+	z6l=(.8[x5l,x7l],.9[y5l,y7l]);
+	penpos7(penh,-90);
+	z7r=(.5[x6,x8],ypart pos);
+	penpos8(.75penh,-70);
+	z8r=(xpart(pos+siz),y7r+.075ypart(siz));
+
+	penpos10(penh,-105);
+	z10=.2[z3,z4];
+	penpos11(.9penh,-90);
+	z11=.4[z10,z6]-0.05vy;
+	penpos12(.75penh,-75);
+	z12=.3[z11,z6]+0.02vy;
+
+	% penlabels(1,2,3,4,5,6,7,8,10,11,12);
+
+	soft_penstroke (z1e {(z1r-z1l) rotated 90}
+		..z2e 
+		..z3e
+		..z4e
+		) slanted slant shifted (slant*-ypart pos,0);
+
+	soft_penstroke (z5e
+		..z6e 
+		..z7e
+		..z8e {(z8r-z8l) rotated 90}
+		) slanted slant shifted (slant*-ypart pos,0);
+
+	soft_penstroke (z10e
+		..z11e
+		..z12e
+		) slanted slant shifted (slant*-ypart pos,0);
+
+	endgroup;
+enddef;
+
+def draw_tab_B(expr pos, siz, slant) =
+	begingroup;
+	clearxy;
+	pair vx,vy;
+	vx=(xpart siz) * dir 0;
+	vy=(ypart siz) * dir 90;
+
+	penpos1(.75penh, 100);
+	z1=z2+(.15*vx-.1*vy);
+	penpos2(.9penw, 0);
+	z2l = pos+.75vy;
+	penpos3(penh,-100);
+	z3l = pos+.4vx+1.05vy;
+	penpos4(.8[penh,penw],-180);
+	z4=(xpart(pos+.75siz),.5[y3,y5]);
+	penpos5(.8penh,90);
+	z5=(.5[x10,x4],ypart (pos+.55siz));
+
+	penpos6(.8penh,270);
+	z6=z5;
+	penpos7(penw,180);
+	z7l=(xpart(pos+siz),.5[y6,y8]);
+	penpos8(.8penh,45);
+	z8=.5[z12l,z11l]+.15vx-.05vy;
+
+	penpos10(.75[penh,penw],170);
+	z10=pos+.375vx+.95vy;
+	penpos11(.8[penh,penw],150);
+	z11=z10-.5vy+.04vx;
+	penpos12(penh,100);
+	z12l=(xpart .5[z13,z11],ypart pos);
+	penpos13(.75penh,60);
+	z13=pos+.1vx+.15vy;
+	
+	% penlabels (1,2,3,4,5,6,7,8,10,11,12,13);
+
+	soft_penstroke (z1e..tension 1.1
+		..z2e
+	   	..z3e
+		..z4e
+		..z5e{left}
+		) slanted slant shifted (slant*-ypart pos,0);
+
+	soft_penstroke (z6e{right}
+		..z7e
+	   	..z8e{(z8r-z8l) rotated 90}
+		) slanted slant shifted (slant*-ypart pos,0);
+
+	soft_penstroke (z10e.. tension 1.5
+		..z11e
+		..z12e..tension 1.1
+		..z13e{(z13r-z13l) rotated 90}
+		) slanted slant shifted (slant*-ypart pos,0);
+	endgroup;
+enddef;
+
+def draw_tab_clef(expr reduction) =
+        save reduced_ss,vx,vy,letterheight,penw,penh;
+	reduced_ss# = staff_space# * reduction;
+	letterheight# = 1.8*reduced_ss#;
+	define_pixels(reduced_ss,letterheight);
+	set_char_box(-.2*reduced_ss#,2.8*reduced_ss#,1.6*letterheight#,1.6*letterheight#);
+
+		%draw_staff (-3,2, 0.5);
+
+	penw = .45reduced_ss;
+	penh = .2reduced_ss;
+
+	draw_tab_T((-b+.15reduced_ss,h-letterheight),
+	  (2.1*reduced_ss,letterheight),0.2);
+	draw_tab_A((-b-.05reduced_ss,-.5letterheight +.15reduced_ss),
+	  (2.2*reduced_ss,letterheight),0.4);
+	draw_tab_B((-b+.025reduced_ss,-d),
+	  (2.1*reduced_ss,letterheight),0.25);
+enddef;
+
+fet_beginchar("tab clef", "tab", "tabclef")
+	draw_tab_clef(1.0);
+fet_endchar;
+
+fet_beginchar("tab clef (reduced)", "tab_change", "ctabclef")
+	draw_tab_clef(.8);
 fet_endchar;
 
 fet_endgroup("clefs");