X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftext-spanner-engraver.cc;h=5c177c5a96ae10ecf59a4fcb955ca47b8429bdd5;hb=d11056c687720e610a40f69e6f6ec32525751ff2;hp=bba9f9be4e1895c9a304ca15c04b82a7dfce01e3;hpb=5d5fbb2641fda6605cde61ebcd99b9bef2e94b4a;p=lilypond.git

diff --git a/lily/text-spanner-engraver.cc b/lily/text-spanner-engraver.cc
index bba9f9be4e..5c177c5a96 100644
--- a/lily/text-spanner-engraver.cc
+++ b/lily/text-spanner-engraver.cc
@@ -3,59 +3,37 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2005 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:
-  VIRTUAL_COPY_CONS (Translator);
-  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 ();
 };
 
-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 ()
-{
+  span_ = 0;
   req_drul_[START] = 0;
   req_drul_[STOP] = 0;
 }
@@ -63,46 +41,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;
 	}
     }
 
@@ -110,24 +72,14 @@ 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]);
 	  req_drul_[START] = 0;
 	}
     }
@@ -136,20 +88,27 @@ Text_spanner_engraver::create_grobs ()
 void
 Text_spanner_engraver::acknowledge_grob (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_interface::add_support (span_, info.elem_l_);
-      add_bound_item (span_, dynamic_cast<Item*> (info.elem_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 ()));
+	}
     }
 }
 
 void
 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;
     }
 }
@@ -157,7 +116,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
@@ -172,3 +139,10 @@ Text_spanner_engraver::finalize ()
     }
 }
 
+ADD_TRANSLATOR (Text_spanner_engraver,
+		/* descr */ "Create text spanner from a Music.",
+		/* creats*/ "TextSpanner",
+		/* accepts */ "text-span-event",
+		/* acks  */ "note-column-interface",
+		/* reads */ "",
+		/* write */ "");