X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=mf%2Ffeta-klef.mf;h=7fbdc4cb8bcd7e229c8f5f0534e8deef843c2186;hb=fac2e6ddfa211af496cf9274b7c91e06d79404d3;hp=2e9d1ff8c2ef241071d2bf3edf4d966e79451aa6;hpb=626b85f7b67b97e7635c46d900edd9ca5a568831;p=lilypond.git

diff --git a/mf/feta-klef.mf b/mf/feta-klef.mf
index 2e9d1ff8c2..7fbdc4cb8b 100644
--- a/mf/feta-klef.mf
+++ b/mf/feta-klef.mf
@@ -1,71 +1,91 @@
+% 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--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>,
+% Jan Nieuwenhuizen <janneke@gnu.org>,
+% Juergen Reuter <reuter@ipd.uka.de>
 
-fet_begingroup("klef");
 
-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;
+fet_begingroup("clefs");
 
+%
+% [Ross] says that clefs take 1 staff_space space on the left and right
+%
+def set_horizontal_spacing =
+	save left_space ,right_space;
+	left_space# = 0;
+	right_space# = 0;
+enddef;
+
+
+% [Wanske] says the bulbs should be positioned about 1/4 right of the
+% "arrow"
 def draw_c_clef (expr reduction) = 
-	save hair, norm, reduced_il;
-	reduced_il#=interline#*reduction;
+	save hair, norm, reduced_il, right_edge;
+	reduced_il#=staff_space#*reduction;
 	norm#:=2/3reduced_il#;
 	hair#:=1/6norm#;
-	define_pixels (hair,norm,reduced_il);
-	set_char_box (0, 11/4interline#, 2 reduced_il#, 2 reduced_il#);
-	% huh, what's y-zero?
-	draw_block ((0,-d), (1/2reduced_il,h));
-	draw_block ((1/2reduced_il+stafflinethickness,-d), 
-	  (1/2reduced_il+2stafflinethickness,h));
+
+	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);
+
+	draw_block ((0,-d), (3/4norm+1/2hair,h));
+	draw_block ((3/4norm+2hair,-d), 
+		(3/4norm+7/2hair,h));
 	
 	save xoff;
-	xoff=1/2reduced_il+2hair;
+	xoff=3/4norm+7/2hair;
 	penpos1(hair,-90);
-	z1l=(xoff+norm+hair/2,h);
-	penpos2(norm-hair,180);
-	z2l=(w,h/2);
+	z1l=(xoff+norm+hair,h);
+	penpos2(norm-3/2hair,180);
+	z2l=(right_edge,h/2);
 	penpos3(hair,90);
-	z3=(((w-xoff)/2)+xoff,2hair);
-	penpos4(hair,90);
-	z4=(xoff+hair+1/2norm+hair,y3);
+	z3=(((right_edge -xoff)/2)+xoff,2hair);
+
+	penpos4(hair,0);
+	z4=(xoff+1/2norm+1/2hair,reduced_il-hair);
+	
+	penpos5(4hair,0);
+	z5=(xoff+5/4hair,0);
+
+	penpos6(norm-hair,90);
+	z6=(xoff+3/4norm,0);
 
-	penpos6(hair,-90);
-	z6r=(xoff+norm+hair,-d);
 
 	save t; t=0.833;
 	save p; path p;
-	p = z4r{right}..z3r{right}..tension t..z2r{up}
-		..z1r{left}..z1l{right}..z2l{down}
-		..z3l{left}..z4l{left};
+	p = z5l..z4l{up}..z4r{down}..z3r{right}..tension t..z2r{up}
+		..tension t..
+		flare_path(z1l,180,90,hair,norm-1/2hair, -1)
+%z1r{left}..z1l{right}
+		..tension t..z2l{down}
+		..z3l{left}..z6r..z5r{down};
 	pickup pencircle scaled 1pt#;
-	% boehoe, howto?
-%	draw p..(p yscaled -1)..cycle;
-	fill p..cycle;
-	fill (p yscaled -1)..cycle;
-	penlabels (1,2,3,4);
-
-	% ugh, should be bulb, not flare
-	draw_flare(z1l,180,90,hair,norm);
-	draw_flare(z6r,180,-90,hair,norm+hair);
+	filldraw p..(reverse p yscaled -1)..cycle;
+	penlabels (1,2,3,4,5,6);
+
+	% ugh, should be bulb, not flare?
+
 	enddef;
 
-fet_beginchar ("C clef", "ugh_alto", "ugh_altoclef")
+fet_beginchar ("C clef", "C", "altoclef")
 	if test = 1:
-		draw_staff (-1,3);
+		draw_staff (-2,2, 0.0);
 	fi;
 	draw_c_clef (1.0);
 fet_endchar;
 
-fet_beginchar ("C clef", "ugh_alto_change", "ugh_caltoclef")
+fet_beginchar ("C clef", "C_change", "caltoclef")
+	if test = 1:
+		draw_staff (-2,2, 0.0);
+	fi;
 	draw_c_clef (.8);
 fet_endchar;
 
@@ -80,62 +100,71 @@ fet_endchar;
 % [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;
-	reduced_il# = interline# * reduction;
-	left_tilt = 5;
-	define_pixels(reduced_il);
-	left_thick = .25  reduced_il;
-	
-	set_char_box(
-		- xpart exact_center+ .2 reduced_il#, 
-		xpart exact_center + 2.7 reduced_il#, 
-		- ypart exact_center + 2.5 reduced_il#, 
-		ypart exact_center +reduced_il#);
-	x1r - x1l = left_thick;
-	z1l = (hround_pixels(xpart exact_center), 
-		vround_pixels(ypart exact_center));
-
-	y2 = reduced_il;
-
-	x3l - x1l =  2.1 reduced_il;
-	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);
-
-	penpos1(whatever, left_tilt);
-	penpos2(1.2 stafflinethickness, -90);
-	penpos3(whatever,  185);
-	penpos4(stafflinethickness, 135);
-
-	draw_bulb(1, z1r,  z1l, .45 reduced_il, 1.0);
-
-
-	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);
-
-	pickup pencircle scaled (.35 reduced_il);
-	draw z5;
-	draw z5 yscaled -1;
+def draw_bass_clef(expr exact_center, reduction) = 
+        save reduced_il, left_tilt, left_thick, ball_to_right;
+        reduced_il# = staff_space# * 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# + 7/12 reduced_il#, 
+                - ypart exact_center + 2.5 reduced_il#, 
+                ypart exact_center +reduced_il#);
+
+        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;
+
+        x3l - x1l =  ball_to_right;
+        x2 = .5 [x1,x3];
+        x3l - x3r = .48 reduced_il;
+        y3l = -0.05 staff_space;
+        x4 = x1l - stafflinethickness;
+        y4 = -2.2  reduced_il;
+        z5 = (x3l +  1/3 reduced_il, .5 reduced_il);
+
+        penpos1(whatever, left_tilt);
+        penpos2(1.2 stafflinethickness, -90);
+        penpos3(whatever,  185);
+        penpos4(stafflinethickness, 135);
+
+        draw_bulb(1, z1r,  z1l, .45 reduced_il, 1.0);
+
+
+        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);
+
+        save dot_diam;
+        2 dot_diam = round reduction* (staff_space - stafflinethickness);
+        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((.5 staff_space#, 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((.4 staff_space#, 0),0.8);
 fet_endchar;
 
 
@@ -143,11 +172,9 @@ 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.
-% FIXME should be a bit more upright
 %
 
 % Beste lezers, kijk,
@@ -158,11 +185,14 @@ 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 draw_gclef (expr exact_center, reduction)=
 	save reduced_il, downstroke_dir, downstroke_angle, hair, center;
 	save breapth_factor, inner_thick_end, thinness, thickness, thinnib;
 	save inner_start_angle, thinness, thinpen;
-	reduced_il# = interline# * reduction;
+	reduced_il# = staff_space# * reduction;
 	define_pixels(reduced_il);
 	pair downstroke_dir, center;
 
@@ -174,20 +204,25 @@ def draw_gclef (expr exact_center, reduction)=
 	downstroke_dir = (14, -75);
 	breapth_factor = 11/7;
 	inner_thick_end = 45;
-	inner_start_angle = angle(-1,-2);
+	inner_start_angle = downstroke_angle - 43;
 	thickness = .4 reduced_il - hair;
 
 	thinnib = thinness - hair;
 	thinpen = thinness;
-	set_char_box(-xpart exact_center + breapth_factor* reduced_il#, 
+	set_horizontal_spacing;
+	
+	set_char_box(
+		left_space# +
+		-xpart exact_center + 1.0 * breapth_factor* reduced_il#, 
+		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;
-	z1 = center + whatever * dir inner_start_angle;
+
+	z1 = center + whatever * dir (inner_start_angle);
 	x1 = xpart center -.28 reduced_il;
 	
 	top z2r = center + (0,reduced_il + stafflinethickness/2);
@@ -223,7 +258,7 @@ def draw_gclef (expr exact_center, reduction)=
 
 	center - z10= whatever * downstroke_dir;
 	center - z11 =  whatever * downstroke_dir;
-
+	center - z14 = .8 (center - z11);
 	penpos1(thinnib, inner_start_angle);
 	penpos2(thickness, 90);
 	penpos3(thinnib, -90 + inner_thick_end);
@@ -232,19 +267,20 @@ def draw_gclef (expr exact_center, reduction)=
 
 	penpos7(thickness, 135);
 	penpos8(1.5 thinnib, - 70 + angle downstroke_dir);
-	penpos9(1.5 thickness, -80);
+	penpos9(1.4 thickness, -80);  % ugh
 	penpos10(whatever, downstroke_angle + 10);
 	penpos11(thinnib, downstroke_angle + 90);
+	penpos14(thinnib, downstroke_angle + 90);
 	penpos12(thinnib, -90);
 	penpos13(3 thinnib, 180);
 
-	
 	filldraw 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  
+		.. z9r & z9r{dir (downstroke_angle+ 40)} % ugh
 		%.. z8r
 		.. z7r{down} .. z5r{down} .. z4r{right}
 		.. z3r .. z2r{left} .. 
@@ -259,20 +295,227 @@ def draw_gclef (expr exact_center, reduction)=
 	draw_bulb(-1,  z13l, lft z13r, 6/14 reduced_il, 1.0);
 
 	pickup pencircle scaled (thinpen);
-	draw z10 --- z11 .. z12{left};
+	draw z10 --- z14 .. z11  .. tension 0.85 ..  z12{left};
 
 	penlabels(range 1 thru 15);
 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.6 interline#,0), 1.0);
+	draw_gclef((1.7 staff_space#,0), 1.0);
+fet_endchar;
+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_il;
+	reduced_il# = staff_space# * reduction;
+	define_pixels(reduced_il);
+	set_char_box(-.67reduced_il#,2.0reduced_il#,reduced_il#,reduced_il#);
+	razt := 0.45reduced_il;
+	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;
-fet_beginchar("G clef", "violin_change", "cviolinclef")
-	draw_gclef((1.3 interline#,0), .8);
+
+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_il,vx,vy,letterheight,penw,penh;
+	reduced_il# = staff_space# * reduction;
+	letterheight# = 1.8*reduced_il#;
+	define_pixels(reduced_il,letterheight);
+	set_char_box(-.2*reduced_il#,2.8*reduced_il#,1.6*letterheight#,1.6*letterheight#);
+
+		%draw_staff (-3,2, 0.5);
+
+	penw = .45reduced_il;
+	penh = .2reduced_il;
+
+	draw_tab_T((-b+.15reduced_il,h-letterheight),
+	  (2.1*reduced_il,letterheight),0.2);
+	draw_tab_A((-b-.05reduced_il,-.5letterheight +.15reduced_il),
+	  (2.2*reduced_il,letterheight),0.4);
+	draw_tab_B((-b+.025reduced_il,-d),
+	  (2.1*reduced_il,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("klef");
+fet_endgroup("clefs");