X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspacing-engraver.cc;h=4aeebc586a74437cb19134e810808aaa32b542f7;hb=205203e856ba125f43b9caa66fc7177db16a6db9;hp=0e4a4fe71749df3a51e486a167fcf68874c728c9;hpb=051d7e7cbdbbe5f5337ab2b477b0bd1e72eedd04;p=lilypond.git

diff --git a/lily/spacing-engraver.cc b/lily/spacing-engraver.cc
index 0e4a4fe717..4aeebc586a 100644
--- a/lily/spacing-engraver.cc
+++ b/lily/spacing-engraver.cc
@@ -1,13 +1,11 @@
-/*   
-  spacing-engraver.cc --  implement Spacing_engraver
-  
+/*
+  spacing-engraver.cc -- implement Spacing_engraver
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
 
-#include "request.hh"
+  (c) 1999--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+*/
+
 #include "paper-column.hh"
 #include "engraver.hh"
 #include "pqueue.hh"
@@ -20,16 +18,16 @@ 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 &);  
+  {
+    info_ = i;
+    end_ = m;
+  }
+  static int time_compare (Rhythmic_tuple const &, Rhythmic_tuple const &);
 };
 
 /**
@@ -44,21 +42,21 @@ class Spacing_engraver : public Engraver
   Array<Rhythmic_tuple> now_durations_;
   Array<Rhythmic_tuple> stopped_durations_;
   Moment now_;
-  Spanner * spacing_;
-  
-  TRANSLATOR_DECLARATIONS(Spacing_engraver);
+  Spanner *spacing_;
+
+  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 ();
 };
 
 inline int
 compare (Rhythmic_tuple const &a, Rhythmic_tuple const &b)
 {
-  return Rhythmic_tuple::time_compare (a,b);
+  return Rhythmic_tuple::time_compare (a, b);
 }
 
 int
@@ -74,36 +72,42 @@ Spacing_engraver::Spacing_engraver ()
 }
 
 void
-Spacing_engraver::initialize ()
+Spacing_engraver::process_music ()
 {
-  spacing_  =new Spanner (get_property ("SpacingSpanner"));
-  spacing_->set_bound (LEFT, unsmob_grob (get_property ("currentCommandColumn")));  
-  announce_grob(spacing_, SCM_EOL);
+  if (!spacing_)
+    {
+      spacing_ = make_spanner ("SpacingSpanner", SCM_EOL);
+      spacing_->set_bound (LEFT, unsmob_grob (get_property ("currentCommandColumn")));
+    }
 }
 
 void
 Spacing_engraver::finalize ()
 {
-  Grob * p = unsmob_grob (get_property ("currentCommandColumn"));
-  spacing_->set_bound (RIGHT, p);
-  typeset_grob (spacing_);
-  spacing_ =0;
+  if (spacing_)
+    {
+      Grob *p = unsmob_grob (get_property ("currentCommandColumn"));
+
+      spacing_->set_bound (RIGHT, p);
+      spacing_ = 0;
+    }
 }
 
 void
 Spacing_engraver::acknowledge_grob (Grob_info i)
 {
-  if (Note_spacing::has_interface (i.grob_) || Staff_spacing::has_interface (i.grob_))
+  if (Note_spacing::has_interface (i.grob ()) || Staff_spacing::has_interface (i.grob ()))
     {
-      Pointer_group_interface::add_grob (spacing_, ly_symbol2scm  ("wishes"), i.grob_);
+      Pointer_group_interface::add_grob (spacing_, ly_symbol2scm ("wishes"), i.grob ());
     }
-  
-  if (i.grob_->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;
 
   /*
-    only pay attention to durations that are not grace notes. 
-   */
+    only pay attention to durations that are not grace notes.
+  */
   if (!now_.grace_part_)
     {
       Music *r = i.music_cause ();
@@ -121,38 +125,40 @@ Spacing_engraver::stop_translation_timestep ()
 {
   Moment shortest_playing;
   shortest_playing.set_infinite (1);
-  for (int i=0; i < playing_durations_.size (); i++)
+  for (int i = 0; i < playing_durations_.size (); i++)
     {
-      Moment m = (playing_durations_[i].info_.music_cause ())->get_length ();
-      shortest_playing = shortest_playing <? m;
+      Music *mus = playing_durations_[i].info_.music_cause ();
+      if (mus)
+	{
+	  Moment m = mus->get_length ();
+	  shortest_playing = min (shortest_playing, m);
+	}
     }
-  
   Moment starter;
   starter.set_infinite (1);
 
-  for (int i=0; i < now_durations_.size (); i++)
+  for (int i = 0; i < now_durations_.size (); i++)
     {
       Moment m = now_durations_[i].info_.music_cause ()->get_length ();
       if (m.to_bool ())
 	{
-	  starter = starter <? m;
+	  starter = min (starter, m);
 	  playing_durations_.insert (now_durations_[i]);
-
 	}
     }
   now_durations_.clear ();
-  
-  shortest_playing = shortest_playing <? starter;
-  
-  Paper_column * sc
-    = dynamic_cast<Paper_column*> (unsmob_grob (get_property ("currentMusicalColumn")));
+
+  shortest_playing = min (shortest_playing, starter);
+
+  Paper_column *sc
+    = dynamic_cast<Paper_column *> (unsmob_grob (get_property ("currentMusicalColumn")));
 
   assert (starter.to_bool ());
   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
@@ -166,13 +172,10 @@ Spacing_engraver::start_translation_timestep ()
     stopped_durations_.push (playing_durations_.get ());
 }
 
-
-
-
-ENTER_DESCRIPTION(Spacing_engraver,
-/* descr */       "make a SpacingSpanner and do bookkeeping of shortest starting and playing notes  ",
-/* creats*/       "SpacingSpanner",
-/* accepts */     "",
-/* acks  */      "grob-interface",
-/* reads */       "",
-/* write */       "");
+ADD_TRANSLATOR (Spacing_engraver,
+		/* descr */ "make a SpacingSpanner and do bookkeeping of shortest starting and playing notes  ",
+		/* creats*/ "SpacingSpanner",
+		/* accepts */ "",
+		/* acks  */ "grob-interface",
+		/* reads */ "",
+		/* write */ "");