* configure.in: Test for and accept lmodern if EC fonts not found.

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

diff --git a/lily/lyric-extender.cc b/lily/lyric-extender.cc
index 6d1c037c003ecc4ae2601fa47367f37f6507e059..5776e88486e4a0d78d8f204102ccc1f054ac86fb 100644 (file)
--- a/lily/lyric-extender.cc
+++ b/lily/lyric-extender.cc
@@ -6,31 +6,32 @@
   Han-Wen Nienhuys
 */
 
-#include <math.h>
+#include "lyric-extender.hh"
+
+#include <cmath>
 
-#include "box.hh"
 #include "warn.hh"
 #include "lookup.hh"
-#include "stencil.hh"
 #include "paper-column.hh"
 #include "output-def.hh"
-#include "lyric-extender.hh"
 #include "note-head.hh"
 #include "group-interface.hh"
 
-
-
 MAKE_SCHEME_CALLBACK (Lyric_extender, print, 1)
 SCM 
 Lyric_extender::print (SCM smob) 
 {
   Spanner *me = unsmob_spanner (smob);
-  Item *le = me->get_bound (LEFT);
+  Item *left_edge = me->get_bound (LEFT);
   Item *right_text = unsmob_item (me->get_property ("next"));
   
-  Grob *common = le->common_refpoint (right_text, X_AXIS);
+  Grob *common = left_edge;
+
+  if (right_text)
+    common = common->common_refpoint (right_text, X_AXIS);
+  
   common = common->common_refpoint (me->get_bound (RIGHT), X_AXIS);
-  Real sl = me->get_paper ()->get_dimension (ly_symbol2scm ("linethickness"));  
+  Real sl = me->get_layout ()->get_dimension (ly_symbol2scm ("linethickness"));  
   Link_array<Grob> heads (Pointer_group_interface__extract_grobs (me, (Grob*)0,
                                                                  "heads"));
 
@@ -40,12 +41,12 @@ Lyric_extender::print (SCM smob)
   common = common_refpoint_of_array (heads, common, X_AXIS);
   
   Real left_point = 0.0;
-  if (le->internal_has_interface (ly_symbol2scm ("lyric-syllable-interface")))
-    left_point = le->extent (common, X_AXIS)[RIGHT];
+  if (left_edge->internal_has_interface (ly_symbol2scm ("lyric-syllable-interface")))
+    left_point = left_edge->extent (common, X_AXIS)[RIGHT];
   else if (heads.size ())
     left_point = heads[0]->extent (common, X_AXIS)[LEFT];
   else
-    left_point = le->extent (common, X_AXIS)[RIGHT];
+    left_point = left_edge->extent (common, X_AXIS)[RIGHT];
 
   if (isinf (left_point))
     return SCM_EOL;
@@ -66,10 +67,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 >? (me->get_bound (RIGHT)->extent (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)