* The grand 2005-2006 replace.

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

diff --git a/lily/extender-engraver.cc b/lily/extender-engraver.cc
index f44460530d373a9fa998a863e1757a3214bc823e..d4b521af9ccf5362b439b812ac6323e0a7714bb8 100644 (file)
--- a/lily/extender-engraver.cc
+++ b/lily/extender-engraver.cc
@@ -3,8 +3,8 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2005 Glen Prideaux <glenprideaux@iname.com>,
-  Han-Wen Nienhuys <hanwen@cs.uu.nl>,
+  (c) 1999--2006 Glen Prideaux <glenprideaux@iname.com>,
+  Han-Wen Nienhuys <hanwen@xs4all.nl>,
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
@@ -28,11 +28,11 @@ public:
   TRANSLATOR_DECLARATIONS (Extender_engraver);
 
 protected:
-  virtual void acknowledge_grob (Grob_info);
+  DECLARE_ACKNOWLEDGER (lyric_syllable);
   virtual void finalize ();
   virtual bool try_music (Music *);
-  PRECOMPUTED_VIRTUAL void stop_translation_timestep ();
-  PRECOMPUTED_VIRTUAL void process_music ();
+  void stop_translation_timestep ();
+  void process_music ();
 };
 
 Extender_engraver::Extender_engraver ()
@@ -61,22 +61,17 @@ Extender_engraver::process_music ()
 }
 
 void
-Extender_engraver::acknowledge_grob (Grob_info i)
+Extender_engraver::acknowledge_lyric_syllable (Grob_info i)
 {
-  Item *item = dynamic_cast<Item *> (i.grob ());
+  Item *item = i.item ();
+  if (extender_)
+    extender_->set_bound (LEFT, item);
 
-  if (item
-      && item->internal_has_interface (ly_symbol2scm ("lyric-syllable-interface")))
+  if (pending_extender_)
     {
-      if (extender_)
-       extender_->set_bound (LEFT, item);
-
-      if (pending_extender_)
-       {
-         pending_extender_->set_object ("next", item->self_scm ());
-         completize_extender (pending_extender_);
-         pending_extender_ = 0;
-       }
+      pending_extender_->set_object ("next", item->self_scm ());
+      completize_extender (pending_extender_);
+      pending_extender_ = 0;
     }
 }
 
@@ -120,9 +115,7 @@ completize_extender (Spanner *sp)
     {
       extract_item_set (sp, "heads", heads);
       if (heads.size ())
-       {
-         sp->set_bound (RIGHT, heads.top());
-       }
+       sp->set_bound (RIGHT, heads.top ());
     }
 }
 
@@ -150,10 +143,10 @@ Extender_engraver::finalize ()
 
 #include "translator.icc"
 
+ADD_ACKNOWLEDGER (Extender_engraver, lyric_syllable);
 ADD_TRANSLATOR (Extender_engraver,
-               /* descr */ "Create lyric extenders",
-               /* creats*/ "LyricExtender",
-               /* accepts */ "extender-event",
-               /* acks  */ "lyric-syllable-interface",
-               /* reads */ "",
+               /* doc */ "Create lyric extenders",
+               /* create */ "LyricExtender",
+               /* accept */ "extender-event",
+               /* read */ "",
                /* write */ "");