''

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

diff --git a/lily/extender-engraver.cc b/lily/extender-engraver.cc
index e261af552f7aedb24f49df17faaf4e08629fe9c9..3d78b8b772debb9ab94bda39436c368059d51864 100644 (file)
--- a/lily/extender-engraver.cc
+++ b/lily/extender-engraver.cc
@@ -33,14 +33,13 @@ class Extender_engraver : public Engraver
   Extender_req* req_l_;
   Spanner* extender_p_;
 public:
-  Extender_engraver ();
-  VIRTUAL_COPY_CONS (Translator);
+  TRANSLATOR_DECLARATIONS(Extender_engraver);
 
 protected:
   virtual void acknowledge_grob (Grob_info);
-  virtual void finalize();
+  virtual void finalize ();
   virtual bool try_music (Music*);
-  virtual void stop_translation_timestep();
+  virtual void stop_translation_timestep ();
   virtual void start_translation_timestep ();
   virtual void process_music ();
 private:
@@ -48,7 +47,7 @@ private:
 };
 
 
-ADD_THIS_TRANSLATOR (Extender_engraver);
+
 
 Extender_engraver::Extender_engraver ()
 {
@@ -62,14 +61,14 @@ void
 Extender_engraver::acknowledge_grob (Grob_info i)
 {
   // -> text_item
-  if (i.elem_l_->has_interface (ly_symbol2scm("lyric-syllable-interface")))
+  if (i.grob_l_->has_interface (ly_symbol2scm ("lyric-syllable-interface")))
     {
-      current_lyric_l_ = i.elem_l_;
+      current_lyric_l_ = i.grob_l_;
       if (extender_p_
          && !extender_p_->get_bound (RIGHT)
            )
          {
-           Lyric_extender::set_textitem (extender_p_, RIGHT, dynamic_cast<Item*> (i.elem_l_));
+           Lyric_extender::set_textitem (extender_p_, RIGHT, dynamic_cast<Item*> (i.grob_l_));
          }
     }
 }
@@ -95,7 +94,7 @@ Extender_engraver::finalize ()
   if (extender_p_)
     {
       req_l_->origin ()->warning (_ ("unterminated extender"));
-      extender_p_->set_bound(RIGHT, unsmob_grob (get_property ("currentCommandColumn")));
+      extender_p_->set_bound (RIGHT, unsmob_grob (get_property ("currentCommandColumn")));
     }
 }
 
@@ -113,8 +112,8 @@ Extender_engraver::process_music ()
       extender_p_ = new Spanner (get_property ("LyricExtender"));
 
 
-      Lyric_extender::set_textitem  (extender_p_, LEFT, last_lyric_l_);
-      announce_grob (extender_p_, req_l_);
+      Lyric_extender::set_textitem (extender_p_, LEFT, last_lyric_l_);
+      announce_grob(extender_p_, req_l_->self_scm());
     }
 }
 
@@ -142,3 +141,9 @@ Extender_engraver::start_translation_timestep ()
 }
 
 
+ENTER_DESCRIPTION(Extender_engraver,
+/* descr */       "Create lyric extenders",
+/* creats*/       "LyricExtender",
+/* acks  */       "lyric-syllable-interface",
+/* reads */       "",
+/* write */       "");