* lily/lily-guile.cc (ly_chain_assoc): remove.

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

diff --git a/lily/text-spanner-engraver.cc b/lily/text-spanner-engraver.cc
index 7fd070d831b7c89d44f42c85247288a98ce40022..0001365823ff5f0d6183d6908da9ff6dd03dbe47 100644 (file)
--- a/lily/text-spanner-engraver.cc
+++ b/lily/text-spanner-engraver.cc
@@ -3,47 +3,37 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2003 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2005 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "note-column.hh"
-#include "item.hh"
 #include "side-position-interface.hh"
 #include "engraver.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 process_music ();
 
 private:
   Spanner *span_;
   Spanner *finished_;
   Music *current_req_;
-  Drul_array<Music*> req_drul_;
+  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;
 }
@@ -53,19 +43,10 @@ Text_spanner_engraver::try_music (Music *m)
 {
   if (m->is_mus_type ("text-span-event"))
     {
-
-      Direction d = to_dir (m->get_mus_property ("span-direction"));
+      Direction d = to_dir (m->get_property ("span-direction"));
       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;
 }
@@ -77,8 +58,7 @@ Text_spanner_engraver::process_music ()
     {
       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
        {
@@ -92,22 +72,14 @@ Text_spanner_engraver::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"));
-
-#if 0
-         /* Ugh.  Reset (de)cresc. specific properties */
-         span_->set_grob_property ("enclose-bounds", SCM_BOOL_T);
-         span_->set_grob_property ("if-text-padding", gh_double2scm (0));
-         span_->set_grob_property ("width-correct", gh_double2scm (0));
-#endif
-         
+         span_ = make_spanner ("TextSpanner", req_drul_[START]->self_scm ());
+
          Side_position_interface::set_axis (span_, Y_AXIS);
-         announce_grob (span_, req_drul_[START]->self_scm());
          req_drul_[START] = 0;
        }
     }
@@ -116,29 +88,27 @@ Text_spanner_engraver::process_music ()
 void
 Text_spanner_engraver::acknowledge_grob (Grob_info info)
 {
-  Spanner * spans[2] ={span_, finished_};
-  for (int i = 0;  i < 2 ; i++)
+  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_));
+         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_);
       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;
     }
 }
@@ -148,11 +118,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 ();
+  req_drul_[START] = 0;
+  req_drul_[STOP] = 0;
 }
 
 void
@@ -167,10 +139,10 @@ Text_spanner_engraver::finalize ()
     }
 }
 
-ENTER_DESCRIPTION(Text_spanner_engraver,
-/* descr */       "Create text spanner from a Music.",
-/* creats*/       "TextSpanner",
-/* accepts */     "text-span-event",
-/* acks  */      "note-column-interface",
-/* reads */       "",
-/* write */       "");
+ADD_TRANSLATOR (Text_spanner_engraver,
+               /* descr */ "Create text spanner from a Music.",
+               /* creats*/ "TextSpanner",
+               /* accepts */ "text-span-event",
+               /* acks  */ "note-column-interface",
+               /* reads */ "",
+               /* write */ "");