X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=mf%2Ffeta-beugel.mf;h=f87c7edbf408d1583156ff7c8d16058ea6a1b92a;hb=c7f9ff0920291af6600970116c289add61e3a852;hp=94218544ca856d03618b84cc982f6c823d5acd5a;hpb=81316263fa675e45a34047c874cbed8417faeef4;p=lilypond.git

diff --git a/mf/feta-beugel.mf b/mf/feta-beugel.mf
index 94218544ca..f87c7edbf4 100644
--- a/mf/feta-beugel.mf
+++ b/mf/feta-beugel.mf
@@ -1,17 +1,35 @@
+% 
+% feta-beugel.mf -- [Staff] braces
+% 
+% source file of the Feta (not an acronym for Font-En-Tja)
+% pretty-but-neat music font
+% 
+% (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+%                Jan Nieuwenhuizen <janneke@gnu.org>
+
 input feta-autometric;
 input feta-macros;
+
+staffsize# := 20 pt#;   %% arbitrary.
+
 input feta-params;
 
-fet_beginfont("feta-braces", 16);
+
+% we must let the design increase for each
+% font to make sure that mftrace doesn't jack up the resolution too highly
+% for the longer braces.
+fet_beginfont ("feta-braces-" & char (97 + font_count), (font_count + 1) * 20,
+               "fetaBraces");
+
 mode_setup;
 
-staffsize#:=16pt#;
 
-save code;
-code := 0;
 
+save code, braces_per_font;
+code := 64;
+braces_per_font := 64;
 
-def draw_brace (expr height_sharp, width_sharp, slt_sharp) =
+def draw_brace (expr height_sharp, width_sharp, slt_sharp, brace_number) =
 
 	save pendir, height, width, thin, thick, slt;
 	save penangle;
@@ -19,8 +37,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 (brace_number)),
+		"brace" & decimal(brace_number))
+
+	set_char_box (0, width#, height#/2, height#/2);
 	  
 	define_pixels (height, width, slt);
 	thin = 2 slt;
@@ -44,7 +65,7 @@ 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;
 
 
@@ -52,22 +73,25 @@ enddef;
 save stafflinethickness;
 save increment;
 
-stafflinethickness := 0.5pt#;
+linethickness := 0.5pt#;
 increment := 0.5pt#;
 y := 10pt#;
 
-
-
 for i := 0 step 1 until font_count:
 
-  %% We can't store more than 64 (65?) height dimensions in a TFM
-  %% file, so we make small files.
+  save number;
 
-  for j := 0 step 1 until 63:
+  number := braces_per_font * i;
+
+  for j := 0 step 1 until (braces_per_font -1):
     % message "l: "&decimal l;
     % note: define_pixels (x) multiplies x by hppp,
     % must never get bigger than infinity
-    y := min (y + increment, infinity/hppp - 1);
+    y := y + increment;
+    if y > infinity/hppp:
+      message "Resolution and/or magnification is too high";
+      error please report: <bug-lilypond@gnu.org>;
+    fi
 
     % x should be about one staff space, taking brace to have
     % default height of 3 staffs, this yields height / 3 / 4 = 12
@@ -75,10 +99,11 @@ for i := 0 step 1 until font_count:
     x := y / 15;
 
     increment := x / 10;
-    stafflinethickness :=  min (0.5pt#, y/150);
+    linethickness :=  min (0.5pt#, y/150);
     if i = font_count:
-      draw_brace (y, x, stafflinethickness);
+      draw_brace (y, x, linethickness, number);
     fi
+    number := number + 1;
   endfor;
 endfor