* lily/parser.yy (relative_music): whoops. All \relative were off

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

diff --git a/lily/extender-engraver.cc b/lily/extender-engraver.cc
index 21a246d71319fe1d1f79aed87457dd997861b643..25ca7a65b9aa5dbcaa1ca92cc29623d6d9c1cfc4 100644 (file)
--- a/lily/extender-engraver.cc
+++ b/lily/extender-engraver.cc
@@ -1,13 +1,15 @@
 /*
   extender-engraver.cc -- implement Extender_engraver
 
-  (c) 1999 Glen Prideaux <glenprideaux@iname.com>,
-  Han-Wen Nienhuys, Jan Nieuwenhuizen.
+  source file of the GNU LilyPond music typesetter
   
+  (c)  1999--2003 Glen Prideaux <glenprideaux@iname.com>,
+                  Han-Wen Nienhuys <hanwen@cs.uu.nl>,
+                  Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "flower-proto.hh"
-#include "musical-request.hh"
+#include "event.hh"
 #include "lyric-extender.hh"
 #include "paper-column.hh"
 #include "item.hh"
@@ -23,123 +25,124 @@
   gap between syllables.
 
   We remember the last Item that come across. When we get a
-  request, we create the spanner, and attach the left point to the
+  event, we create the spanner, and attach the left point to the
   last lyrics, and the right point to any lyrics we receive by
   then.  */
 class Extender_engraver : public Engraver
 {
-  Score_element *last_lyric_l_;
-  Score_element *current_lyric_l_;
-  Extender_req* req_l_;
-  Spanner* extender_p_;
+  Grob *last_lyric_;
+  Grob *current_lyric_;
+  Music* req_;
+  Spanner* extender_;
 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 ()
 {
-  current_lyric_l_ = 0;
-  last_lyric_l_ = 0;
-  extender_p_ = 0;
-  req_l_ = 0;
+  current_lyric_ = 0;
+  last_lyric_ = 0;
+  extender_ = 0;
+  req_ = 0;
 }
 
 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_->internal_has_interface (ly_symbol2scm ("lyric-syllable-interface")))
     {
-      current_lyric_l_ = i.elem_l_;
-      if (extender_p_
-         && !extender_p_->get_bound (RIGHT)
+      current_lyric_ = i.grob_;
+      if (extender_
+         && !extender_->get_bound (RIGHT)
            )
          {
-           Lyric_extender(extender_p_).set_textitem (RIGHT, dynamic_cast<Item*> (i.elem_l_));
+           Lyric_extender::set_textitem (extender_, RIGHT, dynamic_cast<Item*> (i.grob_));
          }
     }
 }
 
 
 bool
-Extender_engraver::do_try_music (Music* r)
+Extender_engraver::try_music (Music* r)
 {
-  if (Extender_req* p = dynamic_cast <Extender_req *> (r))
-    {
-      if (req_l_)
-       return false;
+  if (req_)
+    return false;
 
-      req_l_ = p;
-      return true;
-    }
-  return false;
+  req_ = r;
+  return true;
 }
 
 void
-Extender_engraver::do_removal_processing ()
+Extender_engraver::finalize ()
 {
-  if (extender_p_)
+  if (extender_)
     {
-      req_l_->warning (_ ("unterminated extender"));
-      extender_p_->set_bound(RIGHT, unsmob_element (get_property ("currentCommandColumn")));
+      req_->origin ()->warning (_ ("unterminated extender"));
+      extender_->set_bound (RIGHT, unsmob_grob (get_property ("currentCommandColumn")));
     }
 }
 
 void
-Extender_engraver::do_process_music ()
+Extender_engraver::process_music ()
 {
-  if (req_l_)
+  if (req_ && ! extender_)
     {
-      if (!last_lyric_l_)
+      if (!last_lyric_)
        {
-         req_l_->warning (_ ("Nothing to connect extender to on the left.  Ignoring extender request."));
+         req_->origin ()->warning (_ ("Nothing to connect extender to on the left.  Ignoring extender event."));
          return;
        }
       
-      extender_p_ = new Spanner (get_property ("basicLyricExtenderProperties"));
-      extender_p_->set_extent_callback (Score_element::point_dimension_callback, Y_AXIS);
+      extender_ = new Spanner (get_property ("LyricExtender"));
+
 
-      Lyric_extender (extender_p_).set_textitem  (LEFT, last_lyric_l_);
-      announce_element (Score_element_info (extender_p_, req_l_));
+      Lyric_extender::set_textitem (extender_, LEFT, last_lyric_);
+      announce_grob(extender_, req_->self_scm());
     }
 }
 
 
 void
-Extender_engraver::do_pre_move_processing ()
+Extender_engraver::stop_translation_timestep ()
 {
-  if (extender_p_)
+  if (extender_)
     {
-      typeset_element (extender_p_);
-      extender_p_ = 0;
+      typeset_grob (extender_);
+      extender_ = 0;
     }
 
-  if (current_lyric_l_)
+  if (current_lyric_)
     {
-      last_lyric_l_ = current_lyric_l_;
-      current_lyric_l_ =0;
+      last_lyric_ = current_lyric_;
+      current_lyric_ =0;
     }
 }
 
 void
-Extender_engraver::do_post_move_processing ()
+Extender_engraver::start_translation_timestep ()
 {
-  req_l_ = 0;
+  req_ = 0;
 }
 
 
+ENTER_DESCRIPTION(Extender_engraver,
+/* descr */       "Create lyric extenders",
+/* creats*/       "LyricExtender",
+/* accepts */     "extender-event",
+/* acks  */      "lyric-syllable-interface",
+/* reads */       "",
+/* write */       "");