patch::: 1.5.9.jcn1

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

diff --git a/lily/lyric-extender.cc b/lily/lyric-extender.cc
index 89f3eddf05ddf9891d88b4e4ee019a61a5c1fca9..57d790618f6ba8f8875a4d576d1e68e8dad3b5cd 100644 (file)
--- a/lily/lyric-extender.cc
+++ b/lily/lyric-extender.cc
@@ -2,45 +2,55 @@
   lyric-extender.cc -- implement Lyric_extender
   source file of the GNU LilyPond music typesetter
 
-  (c)  1998--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c)  1998--2001 Jan Nieuwenhuizen <janneke@gnu.org>
   Han-Wen Nienhuys
 */
 
-#include "dimension-cache.hh"
+
 #include "box.hh"
 #include "debug.hh"
 #include "lookup.hh"
 #include "molecule.hh"
 #include "paper-column.hh"
 #include "paper-def.hh"
-#include "extender-spanner.hh"
+#include "lyric-extender.hh"
 
 
-MAKE_SCHEME_SCORE_ELEMENT_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");
-  Real w = sp->spanner_length () - leftext - ss/2;
+  Spanner *sp = dynamic_cast<Spanner*> (unsmob_grob (smob));
+
+  // 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 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);
+  }
+  // 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))
+    {
+      leftext -=  gh_scm2double (space);
+    }
+  Real w = sp->spanner_length () - leftext - righttrim;
   
-  Real h = sp->paper_l ()->get_var ("extender_height");
-  Molecule  mol (sp->lookup_l ()->filledbox ( Box (Interval (0,w), Interval (0,h))));
+  Real h = sl * gh_scm2double (sp->get_grob_property ("height"));
+  Molecule  mol (Lookup::filledbox (Box (Interval (0,w), Interval (0,h))));
   mol.translate (Offset (leftext, 0));
-  return mol.create_scheme();
+  return mol.smobbed_copy ();
 }
 
 void
-Lyric_extender::set_textitem (Direction d, Item* textitem_l)
+Lyric_extender::set_textitem (Spanner*sp, Direction d, Grob*s)
 {
-  elt_l_->set_bound (d, textitem_l);
-  elt_l_->add_dependency (textitem_l);
+  sp->set_bound (d, s);
+  sp->add_dependency (s);
 }
 
-Lyric_extender::Lyric_extender (Spanner*s)
-{
-  elt_l_ = s;
-}