2003 -> 2004

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

diff --git a/lily/text-spanner-engraver.cc b/lily/text-spanner-engraver.cc
index 294545aa454a1ca39bf7fcd0b6dd45440a873f78..29814d752b514c613e30814e35b536b1dba6ee4c 100644 (file)
--- a/lily/text-spanner-engraver.cc
+++ b/lily/text-spanner-engraver.cc
@@ -3,21 +3,13 @@
 
   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 "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
 {
@@ -28,7 +20,6 @@ protected:
   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 ();
 
 private:
@@ -49,13 +40,6 @@ Text_spanner_engraver::Text_spanner_engraver ()
   req_drul_[STOP] = 0;
 }
 
-void
-Text_spanner_engraver::start_translation_timestep ()
-{
-  req_drul_[START] = 0;
-  req_drul_[STOP] = 0;
-}
-
 bool
 Text_spanner_engraver::try_music (Music *m)
 {
@@ -66,14 +50,6 @@ Text_spanner_engraver::try_music (Music *m)
       req_drul_[d] = m;
       return true;
     }
-  else if (m->is_mus_type ("abort-event"))
-    {
-      req_drul_[LEFT] = 0;
-      req_drul_[RIGHT] = 0;
-      if (span_)
-       span_->suicide ();
-      span_ = 0;
-    }
 
   return false;
 }
@@ -105,13 +81,9 @@ Text_spanner_engraver::process_music ()
       else
        {
          current_req_ = req_drul_[START];
-         span_  = new Spanner (get_property ("TextSpanner"));
+         span_  = make_spanner ("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;
@@ -138,7 +110,6 @@ 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"));
@@ -159,6 +130,8 @@ Text_spanner_engraver::stop_translation_timestep ()
     }
 
   typeset_all ();
+  req_drul_[START] = 0;
+  req_drul_[STOP] = 0;
 }
 
 void