X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftext-spanner-engraver.cc;h=2994956a50c01d665a717b92a3c36df6d1837024;hb=b0e84661a9c85182436501c539aac32040fcc9f3;hp=fe89e752bc6630db731e334c4307bc895be76451;hpb=7a558267cfbc5a90bf87a80ce9bcfed087692064;p=lilypond.git

diff --git a/lily/text-spanner-engraver.cc b/lily/text-spanner-engraver.cc
index fe89e752bc..2994956a50 100644
--- a/lily/text-spanner-engraver.cc
+++ b/lily/text-spanner-engraver.cc
@@ -3,162 +3,142 @@
 
   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 "engraver.hh"
+
+#include "international.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 "spanner.hh"
+#include "stream-event.hh"
 
+#include "translator.icc"
 
 class Text_spanner_engraver : public Engraver
 {
 public:
-  VIRTUAL_COPY_CONS (Translator);
-  Text_spanner_engraver ();
-  
+  TRANSLATOR_DECLARATIONS (Text_spanner_engraver);
 protected:
-  virtual void do_removal_processing ();
-  virtual void acknowledge_element (Score_element_info);
-  virtual bool do_try_music (Music *);
-  virtual void do_process_music ();
-  virtual void do_pre_move_processing ();
-  virtual void do_post_move_processing ();
+  virtual void finalize ();
+  DECLARE_ACKNOWLEDGER (note_column);
+  DECLARE_TRANSLATOR_LISTENER (text_span);
+  void stop_translation_timestep ();
+  void process_music ();
 
 private:
   Spanner *span_;
   Spanner *finished_;
-  Span_req *current_req_;
-  Drul_array<Span_req*> req_drul_;
+  Stream_event *current_event_;
+  Drul_array<Stream_event *> 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;
+  current_event_ = 0;
+  span_ = 0;
+  event_drul_[START] = 0;
+  event_drul_[STOP] = 0;
 }
 
+IMPLEMENT_TRANSLATOR_LISTENER (Text_spanner_engraver, text_span);
 void
-Text_spanner_engraver::do_post_move_processing ()
-{
-  req_drul_[START] = 0;
-  req_drul_[STOP] = 0;
-}
-
-bool
-Text_spanner_engraver::do_try_music (Music *m)
+Text_spanner_engraver::listen_text_span (Stream_event *ev)
 {
-  if (Span_req *s =  dynamic_cast <Span_req*> (m))
-    {
-      if (s->span_type_str_ == "abort")
-	{
-	  req_drul_[LEFT] = 0;
-	  req_drul_[RIGHT] = 0;
-	  if (span_)
-	    span_->suicide ();
-	  span_ = 0;
-	}
-      else if (s->span_type_str_ == "text")
-	{
-	  req_drul_[s->get_span_dir()] = s;
-	  return true;
-	}
-    }
-  return false;
+  Direction d = to_dir (ev->get_property ("span-direction"));
+  ASSIGN_EVENT_ONCE (event_drul_[d], ev);
 }
 
 void
-Text_spanner_engraver::do_process_music ()
+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 (_ ("cannot find start of text spanner"));
       else
 	{
-	  assert (!finished_);
-	  Score_element* e = unsmob_element (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);
-	  Score_element *e = unsmob_element (get_property ("currentMusicalColumn"));
-	  span_->set_bound (LEFT, e);
-	  announce_element (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_element (Score_element_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], info.grob ());
+	}
     }
 }
 
 void
 Text_spanner_engraver::typeset_all ()
-{  
+{
   if (finished_)
     {
-      Side_position::add_staff_support (finished_);
-      typeset_element (finished_);
+      if (!finished_->get_bound (RIGHT))
+	{
+	  Grob *e = unsmob_grob (get_property ("currentMusicalColumn"));
+	  finished_->set_bound (RIGHT, e);
+	}
       finished_ = 0;
     }
 }
 
 void
-Text_spanner_engraver::do_pre_move_processing ()
+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
-Text_spanner_engraver::do_removal_processing ()
+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;
     }
 }
 
+ADD_ACKNOWLEDGER (Text_spanner_engraver, note_column);
+ADD_TRANSLATOR (Text_spanner_engraver,
+		/* doc */ "Create text spanner from an event.",
+		/* create */ "TextSpanner",
+		/* read */ "",
+		/* write */ "");