patch::: 1.5.4.jcn4

[lilypond.git] / lily / spacing-engraver.cc

diff --git a/lily/spacing-engraver.cc b/lily/spacing-engraver.cc
index 324c05cf2c05800da44e5d48a30f9b1dd1a70dda..198080648d046c4d83a963a1b6561b16b4e3d932 100644 (file)
--- a/lily/spacing-engraver.cc
+++ b/lily/spacing-engraver.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -16,13 +16,13 @@
 
 struct Rhythmic_tuple
 {
-  Score_element_info info_;
+  Grob_info info_;
   Moment end_;
   
   Rhythmic_tuple ()
     {
     }
-  Rhythmic_tuple (Score_element_info i, Moment m )
+  Rhythmic_tuple (Grob_info i, Moment m)
     {
       info_ = i;
       end_ = m;
@@ -44,12 +44,12 @@ class Spacing_engraver : public Engraver
 
   Spanner * spacing_p_;
 protected:
-  VIRTUAL_COPY_CONS(Translator);
-  virtual void acknowledge_element (Score_element_info);
-  virtual void do_post_move_processing ();
-  virtual void do_pre_move_processing ();
-  virtual void do_creation_processing ();
-  virtual void do_removal_processing ();
+  VIRTUAL_COPY_CONS (Translator);
+  virtual void acknowledge_grob (Grob_info);
+  virtual void start_translation_timestep ();
+  virtual void stop_translation_timestep ();
+  virtual void initialize ();
+  virtual void finalize ();
 public:
   Spacing_engraver ();
 };
@@ -64,57 +64,54 @@ int
 Rhythmic_tuple::time_compare (Rhythmic_tuple const &h1,
                              Rhythmic_tuple const &h2)
 {
-  return (h1.end_ - h2.end_ ).sign ();
+  return (h1.end_ - h2.end_).main_part_.sign ();
 }
 
-Spacing_engraver::Spacing_engraver()
+Spacing_engraver::Spacing_engraver ()
 {
   spacing_p_ = 0;
 }
 
 void
-Spacing_engraver::do_creation_processing ()
+Spacing_engraver::initialize ()
 {
   spacing_p_  =new Spanner (get_property ("SpacingSpanner"));
   Spacing_spanner::set_interface (spacing_p_);
-  spacing_p_->set_bound (LEFT, unsmob_element (get_property ("currentCommandColumn")));  
-  announce_element (spacing_p_, 0);
+  spacing_p_->set_bound (LEFT, unsmob_grob (get_property ("currentCommandColumn")));  
+  announce_grob (spacing_p_, 0);
 }
 
 void
-Spacing_engraver::do_removal_processing ()
+Spacing_engraver::finalize ()
 {
-  Score_element * p = unsmob_element (get_property ("currentCommandColumn"));
+  Grob * p = unsmob_grob (get_property ("currentCommandColumn"));
   spacing_p_->set_bound (RIGHT, p);
-  typeset_element (spacing_p_);
+  typeset_grob (spacing_p_);
   spacing_p_ =0;
 }
 
 void
-Spacing_engraver::acknowledge_element (Score_element_info i)
+Spacing_engraver::acknowledge_grob (Grob_info i)
 {
-  if (to_boolean (i.elem_l_->get_elt_property ("grace")))
-    return;
-
-  if (to_boolean (i.elem_l_->get_elt_property ("non-rhythmic")))
+  if (to_boolean (i.elem_l_->get_grob_property ("non-rhythmic")))
     return;
   
-  if (Rhythmic_req * r = dynamic_cast<Rhythmic_req*>(i.req_l_))
+  if (Rhythmic_req * r = dynamic_cast<Rhythmic_req*> (i.req_l_))
     {
-      Rhythmic_tuple t(i, now_mom () + r->length_mom ());
+      Rhythmic_tuple t (i, now_mom () + r->length_mom ());
       now_durations_.push (t);
     }
 }
 
 void
-Spacing_engraver::do_pre_move_processing ()
+Spacing_engraver::stop_translation_timestep ()
 {
   Moment shortest_playing;
   shortest_playing.set_infinite (1);
   for (int i=0; i < playing_durations_.size (); i++)
     {
       Moment m = (playing_durations_[i].info_.req_l_)->length_mom ();
-      if (m)
+      if (m.to_bool ())
        {
          shortest_playing = shortest_playing <? m;
        }
@@ -126,7 +123,7 @@ Spacing_engraver::do_pre_move_processing ()
   for (int i=0; i < now_durations_.size (); i++)
     {
       Moment m = now_durations_[i].info_.req_l_->length_mom ();
-      if (m)
+      if (m.to_bool ())
        starter = starter <? m;
 
       playing_durations_.insert (now_durations_[i]);
@@ -136,17 +133,17 @@ Spacing_engraver::do_pre_move_processing ()
   shortest_playing = shortest_playing <? starter;
   
   Paper_column * sc
-    = dynamic_cast<Paper_column*> (unsmob_element (get_property ("currentMusicalColumn")));
+    = dynamic_cast<Paper_column*> (unsmob_grob (get_property ("currentMusicalColumn")));
 
-  SCM sh = shortest_playing.smobbed_copy( );
-  SCM st = starter.smobbed_copy();
+  SCM sh = shortest_playing.smobbed_copy ();
+  SCM st = starter.smobbed_copy ();
 
-  sc->set_elt_property ("shortest-playing-duration", sh);  
-  sc->set_elt_property ("shortest-starter-duration", st);
+  sc->set_grob_property ("shortest-playing-duration", sh);  
+  sc->set_grob_property ("shortest-starter-duration", st);
 }
 
 void
-Spacing_engraver::do_post_move_processing ()
+Spacing_engraver::start_translation_timestep ()
 {
   Moment now = now_mom ();
   stopped_durations_.clear ();
@@ -156,6 +153,6 @@ Spacing_engraver::do_post_move_processing ()
     stopped_durations_.push (playing_durations_.get ());
 }
 
-ADD_THIS_TRANSLATOR(Spacing_engraver);
+ADD_THIS_TRANSLATOR (Spacing_engraver);