From: Phil Holmes <mail@philholmes.net>
Date: Mon, 29 Jul 2013 14:21:46 +0000 (+0100)
Subject: Fixes bounding boxes for breves, improves longas (Issue 3480)
X-Git-Tag: release/2.17.24-1~16^2~3
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=b27354f5fd0df898310a354c4031c2c701ecebaa;p=lilypond.git

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

diff --git a/mf/feta-noteheads.mf b/mf/feta-noteheads.mf
index d976b2df94..df433e98d2 100644
--- 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;