From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Fri, 22 Oct 2004 21:31:48 +0000 (+0000)
Subject: (print): only run to right-bound if
X-Git-Tag: release/2.3.23~2
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=4f5ff61181a8d8987ae4df8aefe8a6dc6735affe;p=lilypond.git

(print): only run to right-bound if
broken. This fixes input/regression/lyric-extender.ly
---

diff --git a/ChangeLog b/ChangeLog
index 692ff74093..83065d2803 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-10-22  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+	* lily/lyric-extender.cc (print): only run to right-bound if
+	broken. This fixes input/regression/lyric-extender.ly
+
 	* input/regression/beamed-chord.ly: removed.
 
 	* Documentation/user/macros.itexi: add \global to definitions for
diff --git a/lily/lyric-extender.cc b/lily/lyric-extender.cc
index 51fc9d4b1a..cc2be05f08 100644
--- a/lily/lyric-extender.cc
+++ b/lily/lyric-extender.cc
@@ -70,10 +70,10 @@ Lyric_extender::print (SCM smob)
     right_point = right_point <? (robust_relative_extent (right_text, common, X_AXIS)[LEFT] - pad);
 
   /* run to end of line. */
-  right_point = right_point >? (robust_relative_extent (me->get_bound (RIGHT), common, X_AXIS)[LEFT] - pad);
+  if (me->get_bound (RIGHT)->break_status_dir ())
+    right_point = right_point >? (robust_relative_extent (me->get_bound (RIGHT), common, X_AXIS)[LEFT] - pad);
   
   left_point += pad;
-
   Real w = right_point - left_point;
 
   if (w < 1.5 * h)