mutopia move

[lilypond.git] / lily / text-spanner-engraver.cc

diff --git a/lily/text-spanner-engraver.cc b/lily/text-spanner-engraver.cc
index bba9f9be4e1895c9a304ca15c04b82a7dfce01e3..ac3f08c7baba6484c93bd4e797a400882bddcc5d 100644 (file)
--- a/lily/text-spanner-engraver.cc
+++ b/lily/text-spanner-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2002 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "dimensions.hh"
@@ -22,16 +22,14 @@
 class Text_spanner_engraver : public Engraver
 {
 public:
-  VIRTUAL_COPY_CONS (Translator);
-  Text_spanner_engraver ();
-  
+  TRANSLATOR_DECLARATIONS(Text_spanner_engraver);  
 protected:
   virtual void finalize ();
   virtual void acknowledge_grob (Grob_info);
   virtual bool try_music (Music *);
   virtual void stop_translation_timestep ();
   virtual void start_translation_timestep ();
-  virtual void create_grobs ();
+  virtual void process_acknowledged_grobs ();
 
 private:
   Spanner *span_;
@@ -41,7 +39,7 @@ private:
   void typeset_all ();
 };
 
-ADD_THIS_TRANSLATOR (Text_spanner_engraver);
+
 
 
 Text_spanner_engraver::Text_spanner_engraver ()
@@ -76,7 +74,7 @@ Text_spanner_engraver::try_music (Music *m)
        }
       else if (t == "text")
        {
-         req_drul_[s->get_span_dir()] = s;
+         req_drul_[s->get_span_dir ()] = s;
          return true;
        }
     }
@@ -84,14 +82,14 @@ Text_spanner_engraver::try_music (Music *m)
 }
 
 void
-Text_spanner_engraver::create_grobs ()
+Text_spanner_engraver::process_acknowledged_grobs ()
 {
   if (req_drul_[STOP])
     {
       if (!span_)
        {
          req_drul_[STOP]->origin ()->warning
-           (_ ("can't find start of text spanner"));
+ (_ ("can't find start of text spanner"));
        }
       else
        {
@@ -111,7 +109,7 @@ Text_spanner_engraver::create_grobs ()
       if (current_req_)
        {
          req_drul_[START]->origin ()->warning
-           (_ ("already have a text spanner"));
+ (_ ("already have a text spanner"));
        }
       else
        {
@@ -127,7 +125,7 @@ Text_spanner_engraver::create_grobs ()
          Grob *e = unsmob_grob (get_property ("currentMusicalColumn"));
          span_->set_bound (LEFT, e);
          
-         announce_grob (span_, req_drul_[START]);
+         announce_grob (span_, req_drul_[START]->self_scm());
          req_drul_[START] = 0;
        }
     }
@@ -136,10 +134,10 @@ Text_spanner_engraver::create_grobs ()
 void
 Text_spanner_engraver::acknowledge_grob (Grob_info info)
 {
-  if (span_ && Note_column::has_interface (info.elem_l_))
+  if (span_ && Note_column::has_interface (info.grob_l_))
     {
-      Side_position_interface::add_support (span_, info.elem_l_);
-      add_bound_item (span_, dynamic_cast<Item*> (info.elem_l_));
+      Side_position_interface::add_support (span_, info.grob_l_);
+      add_bound_item (span_, dynamic_cast<Item*> (info.grob_l_));
     }
 }
 
@@ -172,3 +170,9 @@ Text_spanner_engraver::finalize ()
     }
 }
 
+ENTER_DESCRIPTION(Text_spanner_engraver,
+/* descr */       "Create text spanner from a  Span_req ",
+/* creats*/       "TextSpanner",
+/* acks  */       "note-column-interface",
+/* reads */       "",
+/* write */       "");