2003 -> 2004

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

diff --git a/lily/extender-engraver.cc b/lily/extender-engraver.cc
index eb2b31f7aa058f23e098b47ab8ca47dfac865d90..323edb8ea66a3a257d63d2c40a62984244c6979e 100644 (file)
--- a/lily/extender-engraver.cc
+++ b/lily/extender-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
   
-  (c)  1999--2003 Glen Prideaux <glenprideaux@iname.com>,
+  (c) 1999--2004 Glen Prideaux <glenprideaux@iname.com>,
                   Han-Wen Nienhuys <hanwen@cs.uu.nl>,
                   Jan Nieuwenhuizen <janneke@gnu.org>
 */
@@ -26,7 +26,6 @@ protected:
   virtual void finalize ();
   virtual bool try_music (Music*);
   virtual void stop_translation_timestep ();
-  virtual void start_translation_timestep ();
   virtual void process_music ();
 private:
 
@@ -68,19 +67,42 @@ Extender_engraver::try_music (Music* r)
   return true;
 }
 
+void
+completize_extender (Spanner* sp)
+{
+  if (!sp->get_bound (RIGHT))
+    {
+      SCM heads = sp->get_grob_property ("heads");
+      if (gh_pair_p (heads))
+       {
+         Item* it = dynamic_cast<Item*> (unsmob_grob (gh_car (heads)));
+         if (it)
+           sp->set_bound (RIGHT, it);
+       }
+    }
+}
+
+  
+
 void
 Extender_engraver::finalize ()
 {
   if (extender_)
     {
-      extender_->warning (_ ("unterminated extender"));
+      completize_extender (extender_);
+
+      if (!extender_->get_bound (RIGHT))
+       extender_->warning (_ ("unterminated extender"));
       typeset_grob (extender_);
       extender_ = 0;
     }
 
   if (finished_extender_)
     {
-      finished_extender_->warning (_("unterminated extender"));
+      completize_extender (finished_extender_);
+
+      if (!finished_extender_->get_bound (RIGHT))
+         finished_extender_->warning (_("unterminated extender"));
       typeset_grob (finished_extender_);
       finished_extender_ =0;
     }
@@ -91,7 +113,7 @@ Extender_engraver::process_music ()
 {
   if (ev_)
     {
-      extender_ = new Spanner (get_property ("LyricExtender"));
+      extender_ = make_spanner ("LyricExtender");
       announce_grob (extender_, ev_->self_scm());
     }
 }
@@ -116,15 +138,12 @@ Extender_engraver::stop_translation_timestep ()
   if (extender_)
     finished_extender_ = extender_;
   extender_ = 0;
-}
 
-void
-Extender_engraver::start_translation_timestep ()
-{
   ev_ = 0;
 }
 
 
+
 ENTER_DESCRIPTION(Extender_engraver,
 /* descr */       "Create lyric extenders",
 /* creats*/       "LyricExtender",