X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftext-spanner-engraver.cc;h=d5212ded7fbd43f657f9f361253c0baf890002f5;hb=58a112d5df3f1a8313ee721cea5cd9ce479e2f48;hp=a683befb81ac793d5878198f2d47728424d9d4be;hpb=243db47a88df9240a66bde37356b43aaeb41260d;p=lilypond.git

diff --git a/lily/text-spanner-engraver.cc b/lily/text-spanner-engraver.cc
index a683befb81..d5212ded7f 100644
--- a/lily/text-spanner-engraver.cc
+++ b/lily/text-spanner-engraver.cc
@@ -3,41 +3,41 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2003 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2006 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
+#include "engraver.hh"
+
+#include "international.hh"
 #include "note-column.hh"
-#include "item.hh"
 #include "side-position-interface.hh"
-#include "engraver.hh"
 
 class Text_spanner_engraver : public Engraver
 {
 public:
-  TRANSLATOR_DECLARATIONS(Text_spanner_engraver);  
+  TRANSLATOR_DECLARATIONS (Text_spanner_engraver);
 protected:
   virtual void finalize ();
-  virtual void acknowledge_grob (Grob_info);
+  DECLARE_ACKNOWLEDGER (note_column);
   virtual bool try_music (Music *);
-  virtual void stop_translation_timestep ();
-  virtual void process_music ();
+  void stop_translation_timestep ();
+  void process_music ();
 
 private:
   Spanner *span_;
   Spanner *finished_;
-  Music *current_req_;
-  Drul_array<Music*> req_drul_;
+  Music *current_event_;
+  Drul_array<Music *> event_drul_;
   void typeset_all ();
 };
 
-
 Text_spanner_engraver::Text_spanner_engraver ()
 {
   finished_ = 0;
-  current_req_ = 0;
-  span_ =0;
-  req_drul_[START] = 0;
-  req_drul_[STOP] = 0;
+  current_event_ = 0;
+  span_ = 0;
+  event_drul_[START] = 0;
+  event_drul_[STOP] = 0;
 }
 
 bool
@@ -45,19 +45,10 @@ Text_spanner_engraver::try_music (Music *m)
 {
   if (m->is_mus_type ("text-span-event"))
     {
-
-      Direction d = to_dir (m->get_mus_property ("span-direction"));
-      req_drul_[d] = m;
+      Direction d = to_dir (m->get_property ("span-direction"));
+      event_drul_[d] = m;
       return true;
     }
-  else if (m->is_mus_type ("abort-event"))
-    {
-      req_drul_[LEFT] = 0;
-      req_drul_[RIGHT] = 0;
-      if (span_)
-	span_->suicide ();
-      span_ = 0;
-    }
 
   return false;
 }
@@ -65,66 +56,57 @@ Text_spanner_engraver::try_music (Music *m)
 void
 Text_spanner_engraver::process_music ()
 {
-  if (req_drul_[STOP])
+  if (event_drul_[STOP])
     {
       if (!span_)
-	{
-	  req_drul_[STOP]->origin ()->warning
- (_ ("can't find start of text spanner"));
-	}
+	event_drul_[STOP]->origin ()->warning (_ ("can't find start of text spanner"));
       else
 	{
 	  finished_ = span_;
 	  span_ = 0;
-	  current_req_ = 0;
+	  current_event_ = 0;
 	}
     }
 
-  if (req_drul_[START])
+  if (event_drul_[START])
     {
-      if (current_req_)
-	{
-	  req_drul_[START]->origin ()->warning(_ ("already have a text spanner"));
-	}
+      if (current_event_)
+	event_drul_[START]->origin ()->warning (_ ("already have a text spanner"));
       else
 	{
-	  current_req_ = req_drul_[START];
-	  span_  = make_spanner ("TextSpanner");
+	  current_event_ = event_drul_[START];
+	  span_ = make_spanner ("TextSpanner", event_drul_[START]->self_scm ());
 
-	  
 	  Side_position_interface::set_axis (span_, Y_AXIS);
-	  announce_grob (span_, req_drul_[START]->self_scm());
-	  req_drul_[START] = 0;
+	  event_drul_[START] = 0;
 	}
     }
 }
 
 void
-Text_spanner_engraver::acknowledge_grob (Grob_info info)
+Text_spanner_engraver::acknowledge_note_column (Grob_info info)
 {
-  Spanner * spans[2] ={span_, finished_};
-  for (int i = 0;  i < 2 ; i++)
+  Spanner *spans[2] ={span_, finished_};
+  for (int i = 0; i < 2; i++)
     {
-      if (spans[i] && Note_column::has_interface (info.grob_))
+      if (spans[i])
 	{
-	  Side_position_interface::add_support (spans[i], info.grob_);
-	  add_bound_item (spans[i], dynamic_cast<Item*> (info.grob_));
+	  Side_position_interface::add_support (spans[i], info.grob ());
+	  add_bound_item (spans[i], dynamic_cast<Item *> (info.grob ()));
 	}
     }
 }
 
 void
 Text_spanner_engraver::typeset_all ()
-{  
+{
   if (finished_)
     {
-      Side_position_interface::add_staff_support (finished_);
       if (!finished_->get_bound (RIGHT))
 	{
-	  Grob* e = unsmob_grob (get_property ("currentMusicalColumn"));
+	  Grob *e = unsmob_grob (get_property ("currentMusicalColumn"));
 	  finished_->set_bound (RIGHT, e);
 	}
-      typeset_grob (finished_);
       finished_ = 0;
     }
 }
@@ -134,13 +116,13 @@ Text_spanner_engraver::stop_translation_timestep ()
 {
   if (span_ && !span_->get_bound (LEFT))
     {
-      Grob* e = unsmob_grob (get_property ("currentMusicalColumn"));
+      Grob *e = unsmob_grob (get_property ("currentMusicalColumn"));
       span_->set_bound (LEFT, e);
     }
 
   typeset_all ();
-  req_drul_[START] = 0;
-  req_drul_[STOP] = 0;
+  event_drul_[START] = 0;
+  event_drul_[STOP] = 0;
 }
 
 void
@@ -149,16 +131,17 @@ Text_spanner_engraver::finalize ()
   typeset_all ();
   if (span_)
     {
-      current_req_->origin ()->warning (_ ("unterminated text spanner"));
+      current_event_->origin ()->warning (_ ("unterminated text spanner"));
       span_->suicide ();
       span_ = 0;
     }
 }
 
-ENTER_DESCRIPTION(Text_spanner_engraver,
-/* descr */       "Create text spanner from a Music.",
-/* creats*/       "TextSpanner",
-/* accepts */     "text-span-event",
-/* acks  */      "note-column-interface",
-/* reads */       "",
-/* write */       "");
+#include "translator.icc"
+ADD_ACKNOWLEDGER (Text_spanner_engraver, note_column);
+ADD_TRANSLATOR (Text_spanner_engraver,
+		/* doc */ "Create text spanner from a Music.",
+		/* create */ "TextSpanner",
+		/* accept */ "text-span-event",
+		/* read */ "",
+		/* write */ "");