release: 1.3.101

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

diff --git a/lily/lyric-extender.cc b/lily/lyric-extender.cc
index 456f8a53172b40d7211d8000bec4973a31b2bfda..cd207ce9cab7505cbac703bbca386f355b83a222 100644 (file)
--- a/lily/lyric-extender.cc
+++ b/lily/lyric-extender.cc
@@ -16,16 +16,18 @@
 #include "lyric-extender.hh"
 
 
-MAKE_SCHEME_CALLBACK(Lyric_extender,brew_molecule)
+MAKE_SCHEME_CALLBACK(Lyric_extender,brew_molecule,1)
 SCM 
 Lyric_extender::brew_molecule (SCM smob) 
 {
   Spanner *sp = dynamic_cast<Spanner*> (unsmob_element (smob));
-  
-  Real leftext = sp->get_bound (LEFT)->extent (X_AXIS).length ();
-  Real ss = sp->paper_l ()->get_var ("staffspace");
+
+  // ugh: refp
+  Real leftext = sp->get_bound (LEFT)->extent (sp->get_bound (LEFT),
+                                              X_AXIS).length ();
+  Real ss = 1.0;
   Real sl = sp->paper_l ()->get_var ("stafflinethickness");  
-  Real righttrim = 0.5; // default to half a staffspace gap on the right
+  Real righttrim = 0.5; // default to half a space gap on the right
   SCM righttrim_scm = sp->get_elt_property("right-trim-amount");
   if (gh_number_p (righttrim_scm)) {
     righttrim = gh_scm2double (righttrim_scm);
@@ -39,7 +41,7 @@ Lyric_extender::brew_molecule (SCM smob)
   Real w = sp->spanner_length () - leftext - righttrim*ss;
   
   Real h = sl * gh_scm2double (sp->get_elt_property  ("height"));
-  Molecule  mol (sp->lookup_l ()->filledbox ( Box (Interval (0,w), Interval (0,h))));
+  Molecule  mol (Lookup::filledbox ( Box (Interval (0,w), Interval (0,h))));
   mol.translate (Offset (leftext, 0));
   return mol.create_scheme();
 }