Fixes bounding boxes for breves, improves longas (Issue 3480)

diff --git a/mf/feta-noteheads.mf b/mf/feta-noteheads.mf
index d976b2df947dd3fcf00ca3aff66984e9eb6478eb..df433e98d22dfb48f9ea7ae701d8f83a15f76d62 100644 (file)
--- a/mf/feta-noteheads.mf
+++ b/mf/feta-noteheads.mf
@@ -98,11 +98,6 @@ def draw_longa (expr up) =
        draw_outside_ellipse (1.80, 0, 0.707, 0);
        undraw_inside_ellipse (1.30, 125, 0.68, 2 stafflinethickness#);
 
-       set_char_box (stemthick#,
-                     width# + stemthick#,
-                     noteheight# / 2,
-                     noteheight# / 2);
-
        pickup pencircle scaled stemthick;
 
        % Longas of smaller design sizes should have their lines longer.
@@ -117,6 +112,11 @@ def draw_longa (expr up) =
                quanted_line_length := max (0.77, line_length);
        fi;
 
+       set_char_box (stemthick#,
+                     width# + stemthick#,
+                     staff_space# * quanted_line_length,
+                     staff_space# * quanted_line_length);
+
        final_line_length := quanted_line_length * staff_space;
 
        if up:
@@ -200,11 +200,6 @@ def draw_brevis (expr linecount, line_thickness_multiplier) =
        draw_outside_ellipse (1.80, 0, 0.707, 0);
        undraw_inside_ellipse (1.30, 125, 0.68, 2 stafflinethickness#);
 
-       set_char_box (stemthick# * linecount + gap# * (linecount - 1),
-                     width# + stemthick# * linecount + gap# * (linecount - 1),
-                     noteheight# / 2,
-                     noteheight# / 2);
-
        define_pixels (gap);
        pickup pencircle scaled stemthick;
 
@@ -220,6 +215,11 @@ def draw_brevis (expr linecount, line_thickness_multiplier) =
                quanted_line_length := max (0.77, line_length);
        fi;
 
+       set_char_box (stemthick# * linecount + gap# * (linecount - 1),
+                     width# + stemthick# * linecount + gap# * (linecount - 1),
+                     staff_space# * quanted_line_length,
+                     staff_space# * quanted_line_length);
+
        bot y1 = -quanted_line_length * staff_space;
        top y2 = quanted_line_length * staff_space;
        rt x1 - fudge = 0;