X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fspacing-engraver.cc;h=6985a7903a266bd024255ca9da6f077ae20356da;hb=874fecc2e70c51d2ad34f1677496292a5c56e63d;hp=9aa5e5421db35c072b76b1aa3e0eb939c7996cb5;hpb=498d0148b2c2611a8d96549527a3c14fa6e9de04;p=lilypond.git

diff --git a/lily/spacing-engraver.cc b/lily/spacing-engraver.cc
index 9aa5e5421d..6985a7903a 100644
--- a/lily/spacing-engraver.cc
+++ b/lily/spacing-engraver.cc
@@ -3,11 +3,11 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
-#include "musical-request.hh"
+#include "event.hh"
 #include "paper-column.hh"
 #include "engraver.hh"
 #include "pqueue.hh"
@@ -44,14 +44,14 @@ class Spacing_engraver : public Engraver
   Array<Rhythmic_tuple> now_durations_;
   Array<Rhythmic_tuple> stopped_durations_;
   Moment now_;
-  Spanner * spacing_p_;
+  Spanner * spacing_;
   
-  TRANSLATOR_DECLARATIONS(Spacing_engraver);
+  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 process_music ();
   virtual void finalize ();
 };
 
@@ -70,35 +70,43 @@ Rhythmic_tuple::time_compare (Rhythmic_tuple const &h1,
 
 Spacing_engraver::Spacing_engraver ()
 {
-  spacing_p_ = 0;
+  spacing_ = 0;
 }
 
 void
-Spacing_engraver::initialize ()
+Spacing_engraver::process_music ()
 {
-  spacing_p_  =new Spanner (get_property ("SpacingSpanner"));
-  spacing_p_->set_bound (LEFT, unsmob_grob (get_property ("currentCommandColumn")));  
-  announce_grob(spacing_p_, SCM_EOL);
+  if (!spacing_)
+    {
+      spacing_ = make_spanner ("SpacingSpanner");
+      spacing_->set_bound (LEFT, unsmob_grob (get_property ("currentCommandColumn")));  
+      announce_grob (spacing_, SCM_EOL);
+    }
 }
 
 void
 Spacing_engraver::finalize ()
 {
-  Grob * p = unsmob_grob (get_property ("currentCommandColumn"));
-  spacing_p_->set_bound (RIGHT, p);
-  typeset_grob (spacing_p_);
-  spacing_p_ =0;
+  if (spacing_)
+    {
+      Grob * p = unsmob_grob (get_property ("currentCommandColumn"));
+  
+      spacing_->set_bound (RIGHT, p);
+      typeset_grob (spacing_);
+      spacing_ =0;
+    }
 }
 
 void
 Spacing_engraver::acknowledge_grob (Grob_info i)
 {
-  if (Note_spacing::has_interface (i.grob_l_) || Staff_spacing::has_interface (i.grob_l_))
+  if (Note_spacing::has_interface (i.grob_) || Staff_spacing::has_interface (i.grob_))
     {
-      Pointer_group_interface::add_grob (spacing_p_, ly_symbol2scm  ("wishes"), i.grob_l_);
+      Pointer_group_interface::add_grob (spacing_, ly_symbol2scm  ("wishes"), i.grob_);
     }
   
-  if (i.grob_l_->internal_has_interface (ly_symbol2scm ("lyric-syllable-interface")))
+  if (i.grob_->internal_has_interface (ly_symbol2scm ("lyric-syllable-interface"))
+      || i.grob_->internal_has_interface (ly_symbol2scm ("multi-measure-event")))
     return;
 
   /*
@@ -106,9 +114,10 @@ Spacing_engraver::acknowledge_grob (Grob_info i)
    */
   if (!now_.grace_part_)
     {
-      if (Rhythmic_req * r = dynamic_cast<Rhythmic_req*> (i.music_cause ()))
+      Music *r = i.music_cause ();
+      if (r && r->is_mus_type ("rhythmic-event"))
 	{
-	  Moment len = r->length_mom ();
+	  Moment len = r->get_length ();
 	  Rhythmic_tuple t (i, now_mom () + len);
 	  now_durations_.push (t);
 	}
@@ -122,20 +131,24 @@ Spacing_engraver::stop_translation_timestep ()
   shortest_playing.set_infinite (1);
   for (int i=0; i < playing_durations_.size (); i++)
     {
-      Moment m = (playing_durations_[i].info_.music_cause ())->length_mom ();
-      shortest_playing = shortest_playing <? m;
+      Music * mus = playing_durations_[i].info_.music_cause ();
+      if (mus)
+	{
+	  Moment m = mus->get_length ();
+	  shortest_playing = shortest_playing <? m;
+	}
     }
-  
   Moment starter;
   starter.set_infinite (1);
 
   for (int i=0; i < now_durations_.size (); i++)
     {
-      Moment m = now_durations_[i].info_.music_cause ()->length_mom ();
+      Moment m = now_durations_[i].info_.music_cause ()->get_length ();
       if (m.to_bool ())
 	{
 	  starter = starter <? m;
 	  playing_durations_.insert (now_durations_[i]);
+
 	}
     }
   now_durations_.clear ();
@@ -149,8 +162,8 @@ Spacing_engraver::stop_translation_timestep ()
   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);
+  sc->set_property ("shortest-playing-duration", sh);  
+  sc->set_property ("shortest-starter-duration", st);
 }
 
 void
@@ -167,9 +180,10 @@ Spacing_engraver::start_translation_timestep ()
 
 
 
-ENTER_DESCRIPTION(Spacing_engraver,
+ENTER_DESCRIPTION (Spacing_engraver,
 /* descr */       "make a SpacingSpanner and do bookkeeping of shortest starting and playing notes  ",
 /* creats*/       "SpacingSpanner",
-/* acks  */       "grob-interface",
+/* accepts */     "",
+/* acks  */      "grob-interface",
 /* reads */       "",
 /* write */       "");