* lily/auto-beam-engraver.cc (process_music): end/junk beam if

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

diff --git a/lily/lyric-extender.cc b/lily/lyric-extender.cc
index 38c44068cde9850e764bab425ce3102e676fe575..7d1166c063fb8c506aadd02f9a097969fd4d8361 100644 (file)
--- a/lily/lyric-extender.cc
+++ b/lily/lyric-extender.cc
@@ -2,13 +2,13 @@
   lyric-extender.cc -- implement Lyric_extender
   source file of the GNU LilyPond music typesetter
 
-  (c)  1998--2002 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c)  1998--2003 Jan Nieuwenhuizen <janneke@gnu.org>
   Han-Wen Nienhuys
 */
 
 
 #include "box.hh"
-#include "debug.hh"
+#include "warn.hh"
 #include "lookup.hh"
 #include "molecule.hh"
 #include "paper-column.hh"
@@ -21,17 +21,27 @@ SCM
 Lyric_extender::brew_molecule (SCM smob) 
 {
   Spanner *sp = unsmob_spanner (smob);
+  Item* l = sp->get_bound (LEFT);
+  Item*r = sp->get_bound (RIGHT);
+  
+  Real leftext = l->extent (l, X_AXIS).length ();
 
-  // ugh: refp
-  Real leftext = sp->get_bound (LEFT)->extent (sp->get_bound (LEFT),
-                                              X_AXIS).length ();
-
-  Real sl = sp->paper_l ()->get_var ("stafflinethickness");  
+  Real sl = sp->get_paper ()->get_realvar (ly_symbol2scm ("linethickness"));  
   Real righttrim = 0.5; // default to half a space gap on the right
-  SCM righttrim_scm = sp->get_grob_property ("right-trim-amount");
-  if (gh_number_p (righttrim_scm)) {
-    righttrim = gh_scm2double (righttrim_scm);
-  }
+
+
+  /*
+    If we're broken, we shouldn't extend past the end of the line.
+   */
+  if (r->break_status_dir () == CENTER)
+    {
+      SCM righttrim_scm = sp->get_grob_property ("right-trim-amount");
+      if (gh_number_p (righttrim_scm))
+       {
+         righttrim = gh_scm2double (righttrim_scm);
+       }
+    }
+  
   // The extender can exist in the word space of the left lyric ...
   SCM space =  sp->get_bound (LEFT)->get_grob_property ("word-space");
   if (gh_number_p (space))
@@ -57,6 +67,6 @@ Lyric_extender::set_textitem (Spanner*sp, Direction d, Grob*s)
 
 
 ADD_INTERFACE (Lyric_extender,"lyric-extender-interface",
-  "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 melissima (tied/slurred note).",
   "word-space height right-trim-amount");