X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspacing-engraver.cc;h=00fce0be69a42347482de4f408809c74dbca2efa;hb=ee9d99190ecd2a054322eabca66b1e0c2507474f;hp=0f26e7ca16c17c2949835f847d1afb113f2e4a2f;hpb=b638d530ac5a32a832646cdd2b680ce52d0764f0;p=lilypond.git

diff --git a/lily/spacing-engraver.cc b/lily/spacing-engraver.cc
index 0f26e7ca16..00fce0be69 100644
--- a/lily/spacing-engraver.cc
+++ b/lily/spacing-engraver.cc
@@ -3,14 +3,57 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
 #include "musical-request.hh"
 #include "paper-column.hh"
-#include "spacing-engraver.hh"
-#include "spacing-spanner.hh"
+#include "engraver.hh"
+#include "pqueue.hh"
+#include "note-spacing.hh"
+#include "staff-spacing.hh"
+#include "group-interface.hh"
+#include "spanner.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_;
+  
+  TRANSLATOR_DECLARATIONS(Spacing_engraver);
+protected:
+  virtual void acknowledge_grob (Grob_info);
+  virtual void start_translation_timestep ();
+  virtual void stop_translation_timestep ();
+  virtual void initialize ();
+  virtual void finalize ();
+};
 
 inline int
 compare (Rhythmic_tuple const &a, Rhythmic_tuple const &b)
@@ -22,89 +65,92 @@ 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 Spacing_spanner (SCM_EOL);
-  spacing_p_->set_bound (LEFT, unsmob_element (get_property ("currentCommandColumn")));  
-  announce_element (Score_element_info (spacing_p_, 0));
+  spacing_p_  =new Spanner (get_property ("SpacingSpanner"));
+  spacing_p_->set_bound (LEFT, unsmob_grob (get_property ("currentCommandColumn")));  
+  announce_grob(spacing_p_, SCM_EOL);
 }
 
 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 (Note_spacing::has_interface (i.grob_l_) || Staff_spacing::has_interface (i.grob_l_))
+    {
+      Pointer_group_interface::add_grob (spacing_p_, ly_symbol2scm  ("wishes"), i.grob_l_);
+    }
+  
+  if (to_boolean (i.grob_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.music_cause ()))
     {
-      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)
+      Moment m = (playing_durations_[i].info_.music_cause ())->length_mom ();
+      if (m.to_bool ())
 	{
 	  shortest_playing = shortest_playing <? m;
 	}
     }
   
-  Moment starter, inf;
-  inf.set_infinite (1);
-  starter=inf;
+  Moment starter;
+  starter.set_infinite (1);
+
   for (int i=0; i < now_durations_.size (); i++)
     {
-      Moment m = now_durations_[i].info_.req_l_->length_mom ();
-      if (m)
-	starter = starter <? m;
-
-      playing_durations_.insert (now_durations_[i]);
+      Moment m = now_durations_[i].info_.music_cause ()->length_mom ();
+      if (m.to_bool ())
+	{
+	  starter = starter <? m;
+	  playing_durations_.insert (now_durations_[i]);
+	}
     }
   now_durations_.clear ();
   
   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 = smobify (new Moment (shortest_playing));
-  SCM st = smobify (new Moment (starter));
+  assert (starter.to_bool ());
+  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 ();
@@ -114,6 +160,12 @@ Spacing_engraver::do_post_move_processing ()
     stopped_durations_.push (playing_durations_.get ());
 }
 
-ADD_THIS_TRANSLATOR(Spacing_engraver);
 
 
+
+ENTER_DESCRIPTION(Spacing_engraver,
+/* descr */       "make a SpacingSpanner and do bookkeeping of shortest starting and playing notes  ",
+/* creats*/       "SpacingSpanner",
+/* acks  */       "grob-interface",
+/* reads */       "",
+/* write */       "");