>From e37b3eeaca692db26a2384548c71d180f090c4a1 Mon Sep 17 00:00:00 2001 From: Knut Petersen Date: Sun, 11 Dec 2016 12:30:38 +0100 Subject: [PATCH] Better lyric extender handling --- lily/lyric-extender.cc | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/lily/lyric-extender.cc b/lily/lyric-extender.cc index 8afe2c5569..d05e71a41a 100644 --- a/lily/lyric-extender.cc +++ b/lily/lyric-extender.cc @@ -48,7 +48,7 @@ Lyric_extender::print (SCM smob) extract_grob_set (me, "heads", heads); - if (!heads.size ()) + if (heads.size () < 2) return SCM_EOL; common = common_refpoint_of_array (heads, common, X_AXIS); @@ -66,9 +66,8 @@ Lyric_extender::print (SCM smob) /* It seems that short extenders are even lengthened to go past the note head, but haven't found a pattern in it yet. --hwn 1/1/04 */ - SCM minlen = me->get_property ("minimum-length"); - Real right_point - = left_point + (robust_scm2double (minlen, 0)); + Real minlen = robust_scm2double (me->get_property ("minimum-length"), 0); + Real right_point = left_point + minlen; right_point = min (right_point, me->get_system ()->get_bound (RIGHT)->relative_coordinate (common, X_AXIS)); @@ -89,7 +88,7 @@ Lyric_extender::print (SCM smob) left_point += paddings[LEFT]; Real w = right_point - left_point; - if (w < 1.5 * h) + if (w <= minlen) return SCM_EOL; Stencil mol (Lookup::round_filled_box (Box (Interval (0, w), -- 2.11.0