Add cautionary-style to interface.

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

diff --git a/lily/extender-engraver.cc b/lily/extender-engraver.cc
index 5c893207eedcbd211b994948454bd97d6e63dd04..a6bcd2593ee6c6dda7ef28afd6590be4023fa5e5 100644 (file)
--- a/lily/extender-engraver.cc
+++ b/lily/extender-engraver.cc
@@ -28,27 +28,26 @@
   then.  */
 class Extender_engraver : public Engraver
 {
-  Score_element *last_lyric_l_;
-  Score_element *current_lyric_l_;
+  Grob *last_lyric_l_;
+  Grob *current_lyric_l_;
   Extender_req* req_l_;
   Spanner* extender_p_;
 public:
-  Extender_engraver ();
-  VIRTUAL_COPY_CONS (Translator);
+  TRANSLATOR_DECLARATIONS(Extender_engraver);
 
 protected:
-  virtual void acknowledge_element (Score_element_info);
-  virtual void do_removal_processing();
-  virtual void do_process_music();
-  virtual bool do_try_music (Music*);
-  virtual void do_pre_move_processing();
-  virtual void do_post_move_processing ();
+  virtual void acknowledge_grob (Grob_info);
+  virtual void finalize ();
+  virtual bool try_music (Music*);
+  virtual void stop_translation_timestep ();
+  virtual void start_translation_timestep ();
+  virtual void process_music ();
 private:
 
 };
 
 
-ADD_THIS_TRANSLATOR (Extender_engraver);
+
 
 Extender_engraver::Extender_engraver ()
 {
@@ -59,25 +58,24 @@ Extender_engraver::Extender_engraver ()
 }
 
 void
-Extender_engraver::acknowledge_element (Score_element_info i)
+Extender_engraver::acknowledge_grob (Grob_info i)
 {
   // -> text_item
-  if (i.elem_l_->has_interface (ly_symbol2scm("text-item-interface")))
-
+  if (i.grob_l_->internal_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(extender_p_).set_textitem (RIGHT, dynamic_cast<Item*> (i.elem_l_));
+           Lyric_extender::set_textitem (extender_p_, RIGHT, dynamic_cast<Item*> (i.grob_l_));
          }
     }
 }
 
 
 bool
-Extender_engraver::do_try_music (Music* r)
+Extender_engraver::try_music (Music* r)
 {
   if (Extender_req* p = dynamic_cast <Extender_req *> (r))
     {
@@ -91,19 +89,19 @@ Extender_engraver::do_try_music (Music* r)
 }
 
 void
-Extender_engraver::do_removal_processing ()
+Extender_engraver::finalize ()
 {
   if (extender_p_)
     {
       req_l_->origin ()->warning (_ ("unterminated extender"));
-      extender_p_->set_bound(RIGHT, unsmob_element (get_property ("currentCommandColumn")));
+      extender_p_->set_bound (RIGHT, unsmob_grob (get_property ("currentCommandColumn")));
     }
 }
 
 void
-Extender_engraver::do_process_music ()
+Extender_engraver::process_music ()
 {
-  if (req_l_)
+  if (req_l_ && ! extender_p_)
     {
       if (!last_lyric_l_)
        {
@@ -114,18 +112,18 @@ Extender_engraver::do_process_music ()
       extender_p_ = new Spanner (get_property ("LyricExtender"));
 
 
-      Lyric_extender (extender_p_).set_textitem  (LEFT, last_lyric_l_);
-      announce_element (extender_p_, req_l_);
+      Lyric_extender::set_textitem (extender_p_, LEFT, last_lyric_l_);
+      announce_grob(extender_p_, req_l_->self_scm());
     }
 }
 
 
 void
-Extender_engraver::do_pre_move_processing ()
+Extender_engraver::stop_translation_timestep ()
 {
   if (extender_p_)
     {
-      typeset_element (extender_p_);
+      typeset_grob (extender_p_);
       extender_p_ = 0;
     }
 
@@ -137,9 +135,15 @@ Extender_engraver::do_pre_move_processing ()
 }
 
 void
-Extender_engraver::do_post_move_processing ()
+Extender_engraver::start_translation_timestep ()
 {
   req_l_ = 0;
 }
 
 
+ENTER_DESCRIPTION(Extender_engraver,
+/* descr */       "Create lyric extenders",
+/* creats*/       "LyricExtender",
+/* acks  */       "lyric-syllable-interface",
+/* reads */       "",
+/* write */       "");