X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fextender-engraver.cc;h=d3b2e90972facbdee6b1579468aedafb9900d345;hb=7e0dab27123da5d52b90c81f70ac10669a34d45a;hp=f44460530d373a9fa998a863e1757a3214bc823e;hpb=a7f82e4dc22fc6219a9fe0f6874f8c91e3f31f24;p=lilypond.git

diff --git a/lily/extender-engraver.cc b/lily/extender-engraver.cc
index f44460530d..d3b2e90972 100644
--- a/lily/extender-engraver.cc
+++ b/lily/extender-engraver.cc
@@ -3,17 +3,18 @@
 
   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>
 */
 
 #include "context.hh"
 #include "engraver.hh"
-#include "pointer-group-interface.hh"
+#include "international.hh"
 #include "item.hh"
 #include "lyric-extender.hh"
 #include "note-head.hh"
+#include "pointer-group-interface.hh"
 #include "warn.hh"
 
 void completize_extender (Spanner *sp);
@@ -28,11 +29,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 +62,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 +116,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.back ());
     }
 }
 
@@ -150,10 +144,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 */ "");