patch::: 1.3.128.jcn4

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

diff --git a/lily/spacing-engraver.cc b/lily/spacing-engraver.cc
index c61dd3df3f9222e405240b1cbe68458690af3ecc..0950112705e3341a6c7bd4b71ee39fa91695769f 100644 (file)
--- a/lily/spacing-engraver.cc
+++ b/lily/spacing-engraver.cc
@@ -3,14 +3,56 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
 #include "musical-request.hh"
-#include "score-column.hh"
-#include "spacing-engraver.hh"
+#include "paper-column.hh"
+
 #include "spacing-spanner.hh"
+#include "engraver.hh"
+#include "pqueue.hh"
+
+struct Rhythmic_tuple
+{
+  Grob_info info_;
+  Moment end_;
+  
+  Rhythmic_tuple ()
+    {
+    }
+  Rhythmic_tuple (Grob_info i, Moment m )
+    {
+      info_ = i;
+      end_ = m;
+    }
+  static int time_compare (Rhythmic_tuple const &, Rhythmic_tuple const &);  
+};
+
+/**
+   Acknowledge rhythmic elements, for initializing spacing fields in
+   the columns.
+
+   should be the  last one of the toplevel context
+*/
+class Spacing_engraver : public Engraver
+{
+  PQueue<Rhythmic_tuple> playing_durations_;
+  Array<Rhythmic_tuple> now_durations_;
+  Array<Rhythmic_tuple> stopped_durations_;
+
+  Spanner * spacing_p_;
+protected:
+  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 ();
+};
 
 inline int
 compare (Rhythmic_tuple const &a, Rhythmic_tuple const &b)
@@ -22,7 +64,6 @@ int
 Rhythmic_tuple::time_compare (Rhythmic_tuple const &h1,
                              Rhythmic_tuple const &h2)
 {
-  
   return (h1.end_ - h2.end_ ).sign ();
 }
 
@@ -32,26 +73,32 @@ Spacing_engraver::Spacing_engraver()
 }
 
 void
-Spacing_engraver::do_creation_processing ()
+Spacing_engraver::initialize ()
 {
-  spacing_p_  =new Spacing_spanner;
-  spacing_p_->set_bounds (LEFT, get_staff_info ().command_pcol_l ());  
-  announce_element (Score_element_info (spacing_p_, 0));
+  spacing_p_  =new Spanner (get_property ("SpacingSpanner"));
+  Spacing_spanner::set_interface (spacing_p_);
+  spacing_p_->set_bound (LEFT, unsmob_grob (get_property ("currentCommandColumn")));  
+  announce_grob (spacing_p_, 0);
 }
 
 void
-Spacing_engraver::do_removal_processing ()
+Spacing_engraver::finalize ()
 {
-  Paper_column * p = get_staff_info ().command_pcol_l ();
-
-  spacing_p_->set_bounds (RIGHT, p);
-  typeset_element (spacing_p_);
+  Grob * p = unsmob_grob (get_property ("currentCommandColumn"));
+  spacing_p_->set_bound (RIGHT, 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_grob_property ("grace")))
+    return;
+
+  if (to_boolean (i.elem_l_->get_grob_property ("non-rhythmic")))
+    return;
+  
   if (Rhythmic_req * r = dynamic_cast<Rhythmic_req*>(i.req_l_))
     {
       Rhythmic_tuple t(i, now_mom () + r->length_mom ());
@@ -60,7 +107,7 @@ Spacing_engraver::acknowledge_element (Score_element_info i)
 }
 
 void
-Spacing_engraver::do_pre_move_processing ()
+Spacing_engraver::stop_translation_timestep ()
 {
   Moment shortest_playing;
   shortest_playing.set_infinite (1);
@@ -68,9 +115,11 @@ Spacing_engraver::do_pre_move_processing ()
     {
       Moment m = (playing_durations_[i].info_.req_l_)->length_mom ();
       if (m)
-       shortest_playing = shortest_playing <? m;
+       {
+         shortest_playing = shortest_playing <? m;
+       }
     }
-
+  
   Moment starter, inf;
   inf.set_infinite (1);
   starter=inf;
@@ -86,15 +135,18 @@ Spacing_engraver::do_pre_move_processing ()
   
   shortest_playing = shortest_playing <? starter;
   
-  Score_column * sc
-    = dynamic_cast<Score_column*> (get_staff_info ().musical_pcol_l ());
+  Paper_column * sc
+    = dynamic_cast<Paper_column*> (unsmob_grob (get_property ("currentMusicalColumn")));
 
-  sc->shortest_playing_mom_ = shortest_playing;
-  sc->shortest_starter_mom_ = starter;
+  SCM sh = shortest_playing.smobbed_copy( );
+  SCM st = starter.smobbed_copy();
+
+  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 ();
@@ -106,3 +158,4 @@ Spacing_engraver::do_post_move_processing ()
 
 ADD_THIS_TRANSLATOR(Spacing_engraver);
 
+