(print): only run to right-bound if

broken. This fixes input/regression/lyric-extender.ly

diff --git a/ChangeLog b/ChangeLog
index 692ff74093fd7440348a51ee48c1f0caeee18208..83065d28035a3f570b7efcc04f2981834c4a66ac 100644 (file)
--- 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 51fc9d4b1aac934858e1d7e54d7a276d2a4773f6..cc2be05f08cffa4696599a64f6e51f1eea5dae51 100644 (file)
--- 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)