X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=mf%2Ffeta-haak.mf;h=9fb5c2b163d79413ba27bf9d996129b00b92ffc3;hb=ca4a47ffd343a3672c0e13b801eeb2647866ce98;hp=186a9ddeac758897d6cc0b75d5aa5e0874cae322;hpb=51c60f298f38254add022ecc3df3c7c8a265b1b4;p=lilypond.git

diff --git a/mf/feta-haak.mf b/mf/feta-haak.mf
index 186a9ddeac..9fb5c2b163 100644
--- a/mf/feta-haak.mf
+++ b/mf/feta-haak.mf
@@ -1,5 +1,6 @@
 input feta-macros;
 input feta-params;
+input feta-autometric;
 
 save code;
 code :=0;
@@ -13,8 +14,8 @@ def draw_bracket( expr height_sharp, width_sharp) =
 	beginchar(incr code, width#, height#/2, height#/2);
  
 	define_pixels (height, width);
-	thin = 2 stafflinethickness;
-	thick = .5 interline;
+	thin = 2 linethickness;
+	thick = .5 staff_space;
 	
 	pickup pencircle scaled thin;
 	lft x1 = 0;
@@ -29,7 +30,7 @@ def draw_bracket( expr height_sharp, width_sharp) =
 	bot y4 = y1 - thick + thin/2;
 
 	alpha = 50;
-	z5 = z1 + (width, 3/4interline);
+	z5 = z1 + (width, 3/4staff_space);
 
 	% need silly z6?
 	% strange turning path when invoked via MakeTeXTFM...?
@@ -39,14 +40,35 @@ def draw_bracket( expr height_sharp, width_sharp) =
 	filldraw z5{dir(180+alpha)}..{left}z1--z2--z3..{up}z4{right}
 		..{dir(alpha)}z6..cycle;
 
-	labels(1,2,3,4,5,6);
+%	% try control points to do this in ps
+%	currentpicture:=currentpicture shifted (-x5/2,(x5-x4)/2);
+%
+%	s7 := 0.4*(x5-x1);
+%	x7 = x1 + s7 * cosd(0);
+%	y7 = y1 + s7 * sind(0);
+%
+%	s8 := -0.25*(x5-x1);
+%	x8 := x5 + s8 * cosd(alpha);
+%	y8 := y5 + s8 * sind(alpha);
+%
+%	s9 := 0.5*(x5-x4);
+%	x9 := x4 + s9 * cosd(0);
+%	y9 := y4 + s9 * sind(0);
+%
+%	s10 := -0.15*(x5-x4);
+%	x10 := x5 + s10 * cosd(alpha);
+%	y10 := y5 + s10 * sind(alpha);
+%
+%	draw z5..controls z8 and z7..z1--z2--z3..{up}z4
+%		..controls z9 and z10..z6..cycle;
+%
+%	labels(1,2,3,4,5,6,7,8,9,10);
 	addto currentpicture also currentpicture yscaled -1;
 endchar;
 enddef;
 
-
-% for h :=  staffsize# step 1 pt# until (2 * staffsize#):
+% for h :=  staffsize# step 1 pt# until (1.1 * staffsize#):
 for h :=  staffsize# step 1 pt# until (7 * staffsize#):
-	draw_bracket(h, 2interline# );
+	draw_bracket(h, 2staff_space# );
 endfor