Oops.

[lilypond.git] / lily / lyric-extender.cc

diff --git a/lily/lyric-extender.cc b/lily/lyric-extender.cc
index ce9e0fbc2e0070ee9030466ad8174bdcf9ff4619..64d2b9715d3184635f74de2e00b2f2cc1cee5351 100644 (file)
--- a/lily/lyric-extender.cc
+++ b/lily/lyric-extender.cc
@@ -8,7 +8,7 @@
 
 #include "lyric-extender.hh"
 
-#include "spanner.hh"
+#include "system.hh"
 #include "item.hh"
 #include "warn.hh"
 #include "lookup.hh"
@@ -30,6 +30,8 @@ Lyric_extender::print (SCM smob)
     common = common->common_refpoint (right_text, X_AXIS);
 
   common = common->common_refpoint (me->get_bound (RIGHT), X_AXIS);
+  common = common->common_refpoint (me->get_system (), X_AXIS);
+  
   Real sl = me->layout ()->get_dimension (ly_symbol2scm ("line-thickness"));
 
   extract_grob_set (me, "heads", heads);
@@ -56,6 +58,8 @@ Lyric_extender::print (SCM smob)
   Real right_point
     = left_point + (robust_scm2double (minlen, 0));
 
+  right_point = min (right_point, me->get_system ()->get_bound (RIGHT)->relative_coordinate (common, X_AXIS));
+    
   if (heads.size ())
     right_point = max (right_point, heads.back ()->extent (common, X_AXIS)[RIGHT]);
 
@@ -85,9 +89,11 @@ Lyric_extender::print (SCM smob)
 }
 
 ADD_INTERFACE (Lyric_extender,
-              "The extender is a simple line at the baseline of the lyric "
-              "that helps show the length of a melissima (tied/slurred note).",
+              "The extender is a simple line at the baseline of the lyric"
+              " that helps show the length of a melisma (a tied or slurred"
+              " note).",
 
+              /* properties */
               "heads "
               "left-padding "
               "next "