creates LyricText objects

[lilypond.git] / mf / feta-beugel.mf

diff --git a/mf/feta-beugel.mf b/mf/feta-beugel.mf
index 8ab96f18c61ce34fdaa2db0c8cc535b9fa3daf5d..3d6f6b037023f652a207ca6bd53821b0601d0adf 100644 (file)
--- a/mf/feta-beugel.mf
+++ b/mf/feta-beugel.mf
@@ -3,17 +3,25 @@
 input feta-autometric;
 input feta-macros;
 
-staffsize# := 20 pt#;  %% arbitrary.
+staffsize#  := 20 pt#;  %% arbitrary.
 
 
 input feta-params;
 
-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);
+def abc_encode_int (expr i) =
+       if i > 0:
+               abc_encode_int(i div 26)&char(65 + i mod 26)
+       else:
+               "A"
+       fi
+enddef ;
+
+% 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)* 15,
+               "fetaBraces");
 
 mode_setup;
 
@@ -23,14 +31,6 @@ save code;
 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;
@@ -90,7 +90,12 @@ for i := 0 step 1 until font_count:
     % 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