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

diff --git a/lily/text-spanner-engraver.cc b/lily/text-spanner-engraver.cc
index e004d14ae2..d5212ded7f 100644
--- a/lily/text-spanner-engraver.cc
+++ b/lily/text-spanner-engraver.cc
@@ -3,145 +3,110 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2006 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include "dimensions.hh"
-#include "musical-request.hh"
-#include "paper-column.hh"
-#include "note-column.hh"
-#include "item.hh"
-#include "side-position-interface.hh"
 #include "engraver.hh"
-#include "group-interface.hh"
-#include "directional-element-interface.hh"
-#include "translator-group.hh"
-#include "axis-group-interface.hh"
 
+#include "international.hh"
+#include "note-column.hh"
+#include "side-position-interface.hh"
 
 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);
+  DECLARE_ACKNOWLEDGER (note_column);
   virtual bool try_music (Music *);
-  virtual void stop_translation_timestep ();
-  virtual void start_translation_timestep ();
-  virtual void create_grobs ();
+  void stop_translation_timestep ();
+  void process_music ();
 
 private:
   Spanner *span_;
   Spanner *finished_;
-  Span_req *current_req_;
-  Drul_array<Span_req*> req_drul_;
+  Music *current_event_;
+  Drul_array<Music *> event_drul_;
   void typeset_all ();
 };
 
-ADD_THIS_TRANSLATOR (Text_spanner_engraver);
-
-
 Text_spanner_engraver::Text_spanner_engraver ()
 {
   finished_ = 0;
-  current_req_ = 0;
-  span_ =0;
-  req_drul_[START] = 0;
-  req_drul_[STOP] = 0;
-}
-
-void
-Text_spanner_engraver::start_translation_timestep ()
-{
-  req_drul_[START] = 0;
-  req_drul_[STOP] = 0;
+  current_event_ = 0;
+  span_ = 0;
+  event_drul_[START] = 0;
+  event_drul_[STOP] = 0;
 }
 
 bool
 Text_spanner_engraver::try_music (Music *m)
 {
-  if (Span_req *s =  dynamic_cast <Span_req*> (m))
+  if (m->is_mus_type ("text-span-event"))
     {
-      String t =  ly_scm2string (s->get_mus_property ("span-type"));            
-      if (t == "abort")
-	{
-	  req_drul_[LEFT] = 0;
-	  req_drul_[RIGHT] = 0;
-	  if (span_)
-	    span_->suicide ();
-	  span_ = 0;
-	}
-      else if (t == "text")
-	{
-	  req_drul_[s->get_span_dir()] = s;
-	  return true;
-	}
+      Direction d = to_dir (m->get_property ("span-direction"));
+      event_drul_[d] = m;
+      return true;
     }
+
   return false;
 }
 
 void
-Text_spanner_engraver::create_grobs ()
+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
 	{
-	  assert (!finished_);
-	  Grob* e = unsmob_grob (get_property ("currentMusicalColumn"));
-	  span_->set_bound (RIGHT, e);
-
 	  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_  = new Spanner (get_property ("TextSpanner"));
-	  Side_position::set_axis (span_, Y_AXIS);
-	  Grob *e = unsmob_grob (get_property ("currentMusicalColumn"));
-	  span_->set_bound (LEFT, e);
-	  announce_grob (span_, req_drul_[START]);
+	  current_event_ = event_drul_[START];
+	  span_ = make_spanner ("TextSpanner", event_drul_[START]->self_scm ());
+
+	  Side_position_interface::set_axis (span_, Y_AXIS);
+	  event_drul_[START] = 0;
 	}
     }
 }
 
 void
-Text_spanner_engraver::acknowledge_grob (Grob_info info)
+Text_spanner_engraver::acknowledge_note_column (Grob_info info)
 {
-  if (span_ && Note_column::has_interface (info.elem_l_))
+  Spanner *spans[2] ={span_, finished_};
+  for (int i = 0; i < 2; i++)
     {
-      Side_position::add_support (span_, info.elem_l_);
-      add_bound_item (span_, dynamic_cast<Item*> (info.elem_l_));
+      if (spans[i])
+	{
+	  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::add_staff_support (finished_);
-      typeset_grob (finished_);
+      if (!finished_->get_bound (RIGHT))
+	{
+	  Grob *e = unsmob_grob (get_property ("currentMusicalColumn"));
+	  finished_->set_bound (RIGHT, e);
+	}
       finished_ = 0;
     }
 }
@@ -149,7 +114,15 @@ Text_spanner_engraver::typeset_all ()
 void
 Text_spanner_engraver::stop_translation_timestep ()
 {
+  if (span_ && !span_->get_bound (LEFT))
+    {
+      Grob *e = unsmob_grob (get_property ("currentMusicalColumn"));
+      span_->set_bound (LEFT, e);
+    }
+
   typeset_all ();
+  event_drul_[START] = 0;
+  event_drul_[STOP] = 0;
 }
 
 void
@@ -158,9 +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;
     }
 }
 
+#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 */ "");