patch::: 1.3.26.jcn1

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

diff --git a/mf/feta-eindelijk.mf b/mf/feta-eindelijk.mf
index 538b006eb00d286a6d6c61fc13b33dbe9a2ff840..b5f172dbe29aab6366fdce5243007c938ecfd41c 100644 (file)
--- a/mf/feta-eindelijk.mf
+++ b/mf/feta-eindelijk.mf
@@ -4,7 +4,7 @@
 %
 % source file of the Feta (not the Font-En-Tja) music font
 % 
-% (c) 1997, 1998 Jan Nieuwenhuizen <janneke@gnu.org>
+% (c) 1997--2000 Jan Nieuwenhuizen <janneke@gnu.org>
 
 fet_begingroup("rests");
 
@@ -92,10 +92,10 @@ save breve_rest_y, breve_rest_x;
 
 breve_rest_y# =  staff_space#;
 breve_rest_x# = 3/5 staff_space#;
-multi_rest_x# = 2 staff_space#;
-multi_rest_y# = 1/3 staff_space#;
+multi_rest_x# = 4 staff_space#;
+multi_beam_height# = 1/3 staff_space#;
 
-define_pixels(breve_rest_y, breve_rest_x, multi_rest_x, multi_rest_y);
+define_pixels(breve_rest_y, breve_rest_x, multi_rest_x, multi_beam_height);
 
 fet_beginchar("breve rest", "-1", "breverest");
        set_char_box(0, breve_rest_x#, 0, breve_rest_y#);
@@ -112,12 +112,12 @@ tracingvariables := 1;
 fet_beginchar("multi rest", "-4", "multirest");
        set_char_box(multi_rest_x#, multi_rest_x#,
                     breve_rest_y#, breve_rest_y#);
-       draw_block ((-multi_rest_x, -multi_rest_y),
-                  (multi_rest_x, multi_rest_y));
-       draw_block ((-multi_rest_x,-breve_rest_y),
-                  (rthin-multi_rest_x, breve_rest_y));
-       draw_block ((multi_rest_x-rthin,-breve_rest_y),
-                  (multi_rest_x, breve_rest_y));
+       draw_block ((- b, - multi_beam_height),
+                  (w, multi_beam_height));
+       draw_block ((- b,-breve_rest_y),
+                  (rthin - b, breve_rest_y));
+       draw_block ((w - rthin,-breve_rest_y),
+                  (w, breve_rest_y));
 fet_endchar;
 
 fet_beginchar("Quarter rest","2","quartrest");