X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftext-spanner-engraver.cc;h=f7b2576d85043c734d0dc9e55add6526ff762ddc;hb=c5a3f0c024f4cb629811cff9eb04abff36e94138;hp=0ac0944fa77a7dac17c91fc13864cc1767f5b211;hpb=6b9bfd374643d1eed1ea158777d796c57a2bcd3a;p=lilypond.git

diff --git a/lily/text-spanner-engraver.cc b/lily/text-spanner-engraver.cc
index 0ac0944fa7..f7b2576d85 100644
--- a/lily/text-spanner-engraver.cc
+++ b/lily/text-spanner-engraver.cc
@@ -3,149 +3,94 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2002 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2007 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:
-  TRANSLATOR_DECLARATIONS(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 process_music ();
+  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 ();
 };
 
-
 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::start_translation_timestep ()
-{
-  req_drul_[START] = 0;
-  req_drul_[STOP] = 0;
-}
-
-bool
-Text_spanner_engraver::try_music (Music *m)
+Text_spanner_engraver::listen_text_span (Stream_event *ev)
 {
-  if (Span_req *s =  dynamic_cast <Span_req*> (m))
-    {
-      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;
-	}
-    }
-  return false;
+  Direction d = to_dir (ev->get_property ("span-direction"));
+  ASSIGN_EVENT_ONCE (event_drul_[d], ev);
 }
 
 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 (_ ("cannot 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_  = new Spanner (get_property ("TextSpanner"));
-
-	  /* Ugh.  Reset (de)cresc. specific properties */
-	  span_->set_grob_property ("outer", SCM_BOOL_T);
-	  span_->set_grob_property ("if-text-padding", gh_double2scm (0));
-	  span_->set_grob_property ("width-correct", gh_double2scm (0));
-	  	    
-	  Side_position_interface::set_axis (span_, Y_AXIS);
-	  announce_grob (span_, req_drul_[START]->self_scm());
-	  req_drul_[START] = 0;
-	}
-    }
-}
+	  current_event_ = event_drul_[START];
+	  span_ = make_spanner ("TextSpanner", event_drul_[START]->self_scm ());
 
-void
-Text_spanner_engraver::acknowledge_grob (Grob_info info)
-{
-  Spanner * spans[2] ={span_, finished_};
-  for (int i = 0;  i < 2 ; i++)
-    {
-      if (spans[i] && Note_column::has_interface (info.grob_))
-	{
-	  Side_position_interface::add_support (spans[i], info.grob_);
-	  add_bound_item (spans[i], dynamic_cast<Item*> (info.grob_));
+	  Side_position_interface::set_axis (span_, Y_AXIS);
+	  event_drul_[START] = 0;
 	}
     }
 }
 
 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;
     }
 }
@@ -155,11 +100,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 ();
+  event_drul_[START] = 0;
+  event_drul_[STOP] = 0;
 }
 
 void
@@ -168,16 +115,19 @@ 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 Span_req.",
-/* creats*/       "TextSpanner",
-/* accepts */     "general-music",
-/* acks  */      "note-column-interface",
-/* reads */       "",
-/* write */       "");
+ADD_TRANSLATOR (Text_spanner_engraver,
+		/* doc */
+		"Create text spanner from an event.",
+		/* create */
+		"TextSpanner ",
+		/* read */
+		"",
+		/* write */
+		""
+		);