X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=mf%2Ffeta-beugel.mf;h=8ab96f18c61ce34fdaa2db0c8cc535b9fa3daf5d;hb=599f815907b517eedc6223d302c789477ab3ab05;hp=608ecd5b4ff0bb4b033e71f4d315d8d7fc93ef5a;hpb=7c4b190c428073b0653ddecdbf8c1a9c1e8bc5c4;p=lilypond.git

diff --git a/mf/feta-beugel.mf b/mf/feta-beugel.mf
index 608ecd5b4f..8ab96f18c6 100644
--- a/mf/feta-beugel.mf
+++ b/mf/feta-beugel.mf
@@ -1,16 +1,36 @@
+
+
 input feta-autometric;
 input feta-macros;
+
+staffsize# := 20 pt#;  %% arbitrary.
+
+
 input feta-params;
 
-fet_beginfont("feta-braces", 16);
+font_coding_scheme "feta braces";
+
+% we set the designsize arbitrarily at 10
+% if the * 10 is left out, pktrace gets confused  over the proper magnification,
+% and makes it too large.
+fet_beginfont("feta-braces", font_count * 10);
+
 mode_setup;
 
-staffsize#:=16pt#;
+
 
 save code;
-code := 0;
+code := -1;
 
 
+def abc_encode_int (expr i) =
+	if i > 0:
+		abc_encode_int(i div 26)&char(65 + i mod 26)
+	else:
+		"A"
+	fi
+enddef ;
+
 def draw_brace (expr height_sharp, width_sharp, slt_sharp) =
 
 	save pendir, height, width, thin, thick, slt;
@@ -19,8 +39,11 @@ def draw_brace (expr height_sharp, width_sharp, slt_sharp) =
 	width# := width_sharp;
 	slt# := slt_sharp;
 
-	beginchar(code, width#, height#/2, height#/2);
-	code := incr code;
+%% +1  is needed because fet_beginchar increments after dumping the strings.
+fet_beginchar("brace number "&(decimal (code + 1)), "brace"&abc_encode_int(code+1),
+		"brace"&abc_encode_int (code+1))
+
+	set_char_box (0, width#, height#/2, height#/2);
 	  
 	define_pixels (height, width, slt);
 	thin = 2 slt;
@@ -44,16 +67,15 @@ def draw_brace (expr height_sharp, width_sharp, slt_sharp) =
 		.. z2l .. simple_serif (z1l, z1r, 90) ..cycle;
 
 	addto currentpicture also currentpicture yscaled -1;
-endchar;
+fet_endchar;
 enddef;
 
 
 
-% l is the increment.
 save stafflinethickness;
 save increment;
 
-stafflinethickness := 0.5pt#;
+linethickness := 0.5pt#;
 increment := 0.5pt#;
 y := 10pt#;
 
@@ -71,14 +93,14 @@ for i := 0 step 1 until font_count:
     y := min (y + increment, infinity/hppp - 1);
 
     % x should be about one staff space, taking brace to have
-    % default height of 3 staffs, this yields height / 3 / 4
+    % default height of 3 staffs, this yields height / 3 / 4 = 12
+    % but 15 looks better
     x := y / 15;
-    % l should be about one stafflinethickness
 
     increment := x / 10;
-    stafflinethickness :=  min (0.5pt#, y/120 );
+    linethickness :=  min (0.5pt#, y/150);
     if i = font_count:
-      draw_brace (y, x, stafflinethickness);
+      draw_brace (y, x, linethickness);
     fi
   endfor;
 endfor