X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftext-spanner-engraver.cc;h=8bd59c74b292e428ba6d92129834f5022e5a3a6e;hb=eea589c2d7bee6ab38bc611eb205d4c74e2011f7;hp=f8c520b1cbaeb3ec4c508d0c724546de72128977;hpb=2804f8f79e01dc606ce067bffda2d966524e6e36;p=lilypond.git

diff --git a/lily/text-spanner-engraver.cc b/lily/text-spanner-engraver.cc
index f8c520b1cb..8bd59c74b2 100644
--- a/lily/text-spanner-engraver.cc
+++ b/lily/text-spanner-engraver.cc
@@ -3,57 +3,38 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2002 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2004 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"
-
 
 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 create_grobs ();
+  virtual void process_music ();
 
 private:
   Spanner *span_;
   Spanner *finished_;
-  Span_req *current_req_;
-  Drul_array<Span_req*> req_drul_;
+  Music *current_req_;
+  Drul_array<Music*> req_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;
-}
-
-void
-Text_spanner_engraver::start_translation_timestep ()
-{
+  span_ = 0;
   req_drul_[START] = 0;
   req_drul_[STOP] = 0;
 }
@@ -61,46 +42,30 @@ Text_spanner_engraver::start_translation_timestep ()
 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"));
+      req_drul_[d] = m;
+      return true;
     }
+
   return false;
 }
 
 void
-Text_spanner_engraver::create_grobs ()
+Text_spanner_engraver::process_music ()
 {
   if (req_drul_[STOP])
     {
       if (!span_)
 	{
-	  req_drul_[STOP]->origin ()->warning
- (_ ("can't find start of text spanner"));
+	  req_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;
-	  req_drul_[STOP] = 0;
 	}
     }
 
@@ -108,24 +73,15 @@ Text_spanner_engraver::create_grobs ()
     {
       if (current_req_)
 	{
-	  req_drul_[START]->origin ()->warning
- (_ ("already have a text spanner"));
+	  req_drul_[START]->origin ()->warning (_ ("already have a text spanner"));
 	}
       else
 	{
 	  current_req_ = req_drul_[START];
-	  span_  = new Spanner (get_property ("TextSpanner"));
+	  span_  = make_spanner ("TextSpanner", req_drul_[START]->self_scm ());
 
-	  /* 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);
-	  Grob *e = unsmob_grob (get_property ("currentMusicalColumn"));
-	  span_->set_bound (LEFT, e);
 	  
-	  announce_grob (span_, req_drul_[START]->self_scm());
+	  Side_position_interface::set_axis (span_, Y_AXIS);
 	  req_drul_[START] = 0;
 	}
     }
@@ -134,10 +90,14 @@ Text_spanner_engraver::create_grobs ()
 void
 Text_spanner_engraver::acknowledge_grob (Grob_info info)
 {
-  if (span_ && Note_column::has_interface (info.grob_l_))
+  Spanner * spans[2] ={span_, finished_};
+  for (int i = 0;  i < 2 ; i++)
     {
-      Side_position_interface::add_support (span_, info.grob_l_);
-      add_bound_item (span_, dynamic_cast<Item*> (info.grob_l_));
+      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_));
+	}
     }
 }
 
@@ -146,8 +106,11 @@ Text_spanner_engraver::typeset_all ()
 {  
   if (finished_)
     {
-      Side_position_interface::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;
     }
 }
@@ -155,7 +118,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 ();
+  req_drul_[START] = 0;
+  req_drul_[STOP] = 0;
 }
 
 void
@@ -170,9 +141,10 @@ Text_spanner_engraver::finalize ()
     }
 }
 
-ENTER_DESCRIPTION(Text_spanner_engraver,
-/* descr */       "Create text spanner from a  Span_req ",
+ADD_TRANSLATOR (Text_spanner_engraver,
+/* descr */       "Create text spanner from a Music.",
 /* creats*/       "TextSpanner",
-/* acks  */       "note-column-interface",
+/* accepts */     "text-span-event",
+/* acks  */      "note-column-interface",
 /* reads */       "",
 /* write */       "");