(Paper_column): copy rank_. This fixes

[lilypond.git] / lily / text-spanner-engraver.cc

diff --git a/lily/text-spanner-engraver.cc b/lily/text-spanner-engraver.cc
index 1c843c4555a3f5cf5c0c5974cd0f355e4b201416..38bebe1254e0158c1fffa1e3b35aa4042177439e 100644 (file)
--- a/lily/text-spanner-engraver.cc
+++ b/lily/text-spanner-engraver.cc
@@ -3,110 +3,66 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000 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:
-  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 *);
-  void deprecated_process_music ();
-  virtual void do_pre_move_processing ();
-  virtual void do_post_move_processing ();
-  virtual void process_acknowledged ();
+  virtual void finalize ();
+  virtual void acknowledge_grob (Grob_info);
+  virtual bool try_music (Music *);
+  virtual void stop_translation_timestep ();
+  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::do_post_move_processing ()
-{
+  span_ = 0;
   req_drul_[START] = 0;
   req_drul_[STOP] = 0;
 }
 
 bool
-Text_spanner_engraver::do_try_music (Music *m)
+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::process_acknowledged ()
-{
-  deprecated_process_music ();
+  return false;
 }
 
 void
-Text_spanner_engraver::deprecated_process_music ()
+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_);
-         Score_element* e = unsmob_element (get_property ("currentMusicalColumn"));
-         span_->set_bound (RIGHT, e);
-
          finished_ = span_;
          span_ = 0;
          current_req_ = 0;
@@ -117,28 +73,31 @@ Text_spanner_engraver::deprecated_process_music ()
     {
       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"));
-         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]);
+         span_  = make_spanner ("TextSpanner", req_drul_[START]->self_scm ());
+
+         
+         Side_position_interface::set_axis (span_, Y_AXIS);
+         req_drul_[START] = 0;
        }
     }
 }
 
 void
-Text_spanner_engraver::acknowledge_element (Score_element_info info)
+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::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_));
+       }
     }
 }
 
@@ -147,20 +106,31 @@ 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 ();
+  req_drul_[START] = 0;
+  req_drul_[STOP] = 0;
 }
 
 void
-Text_spanner_engraver::do_removal_processing ()
+Text_spanner_engraver::finalize ()
 {
   typeset_all ();
   if (span_)
@@ -171,3 +141,10 @@ Text_spanner_engraver::do_removal_processing ()
     }
 }
 
+ENTER_DESCRIPTION (Text_spanner_engraver,
+/* descr */       "Create text spanner from a Music.",
+/* creats*/       "TextSpanner",
+/* accepts */     "text-span-event",
+/* acks  */      "note-column-interface",
+/* reads */       "",
+/* write */       "");