mutopia move

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

diff --git a/lily/text-spanner-engraver.cc b/lily/text-spanner-engraver.cc
index 2b04b01a7d61798673adb36a2054eda73e1cdeb0..ac3f08c7baba6484c93bd4e797a400882bddcc5d 100644 (file)
--- a/lily/text-spanner-engraver.cc
+++ b/lily/text-spanner-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2002 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "dimensions.hh"
@@ -22,16 +22,14 @@
 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 *);
-  virtual void do_process_music ();
-  virtual void do_pre_move_processing ();
-  virtual void do_post_move_processing ();
+  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_acknowledged_grobs ();
 
 private:
   Spanner *span_;
@@ -41,7 +39,7 @@ private:
   void typeset_all ();
 };
 
-ADD_THIS_TRANSLATOR (Text_spanner_engraver);
+
 
 
 Text_spanner_engraver::Text_spanner_engraver ()
@@ -54,14 +52,14 @@ Text_spanner_engraver::Text_spanner_engraver ()
 }
 
 void
-Text_spanner_engraver::do_post_move_processing ()
+Text_spanner_engraver::start_translation_timestep ()
 {
   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))
     {
@@ -76,7 +74,7 @@ Text_spanner_engraver::do_try_music (Music *m)
        }
       else if (t == "text")
        {
-         req_drul_[s->get_span_dir()] = s;
+         req_drul_[s->get_span_dir ()] = s;
          return true;
        }
     }
@@ -84,24 +82,25 @@ Text_spanner_engraver::do_try_music (Music *m)
 }
 
 void
-Text_spanner_engraver::do_process_music ()
+Text_spanner_engraver::process_acknowledged_grobs ()
 {
   if (req_drul_[STOP])
     {
       if (!span_)
        {
          req_drul_[STOP]->origin ()->warning
-           (_ ("can't find start of text spanner"));
+ (_ ("can't find start of text spanner"));
        }
       else
        {
          assert (!finished_);
-         Score_element* e = unsmob_element (get_property ("currentMusicalColumn"));
+         Grob* e = unsmob_grob (get_property ("currentMusicalColumn"));
          span_->set_bound (RIGHT, e);
 
          finished_ = span_;
          span_ = 0;
          current_req_ = 0;
+         req_drul_[STOP] = 0;
        }
     }
 
@@ -110,27 +109,35 @@ Text_spanner_engraver::do_process_music ()
       if (current_req_)
        {
          req_drul_[START]->origin ()->warning
-           (_ ("already have a text spanner"));
+ (_ ("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"));
+
+         /* 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_element (span_, req_drul_[START]);
+         
+         announce_grob (span_, req_drul_[START]->self_scm());
+         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_))
+  if (span_ && Note_column::has_interface (info.grob_l_))
     {
-      Side_position::add_support (span_, info.elem_l_);
-      add_bound_item (span_, dynamic_cast<Item*> (info.elem_l_));
+      Side_position_interface::add_support (span_, info.grob_l_);
+      add_bound_item (span_, dynamic_cast<Item*> (info.grob_l_));
     }
 }
 
@@ -139,20 +146,20 @@ Text_spanner_engraver::typeset_all ()
 {  
   if (finished_)
     {
-      Side_position::add_staff_support (finished_);
-      typeset_element (finished_);
+      Side_position_interface::add_staff_support (finished_);
+      typeset_grob (finished_);
       finished_ = 0;
     }
 }
 
 void
-Text_spanner_engraver::do_pre_move_processing ()
+Text_spanner_engraver::stop_translation_timestep ()
 {
   typeset_all ();
 }
 
 void
-Text_spanner_engraver::do_removal_processing ()
+Text_spanner_engraver::finalize ()
 {
   typeset_all ();
   if (span_)
@@ -163,3 +170,9 @@ Text_spanner_engraver::do_removal_processing ()
     }
 }
 
+ENTER_DESCRIPTION(Text_spanner_engraver,
+/* descr */       "Create text spanner from a  Span_req ",
+/* creats*/       "TextSpanner",
+/* acks  */       "note-column-interface",
+/* reads */       "",
+/* write */       "");