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

diff --git a/lily/spacing-engraver.cc b/lily/spacing-engraver.cc
index ebba459d17..0e4a4fe717 100644
--- a/lily/spacing-engraver.cc
+++ b/lily/spacing-engraver.cc
@@ -3,19 +3,18 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
-#include "musical-request.hh"
+#include "request.hh"
 #include "paper-column.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
 {
@@ -44,8 +43,8 @@ class Spacing_engraver : public Engraver
   PQueue<Rhythmic_tuple> playing_durations_;
   Array<Rhythmic_tuple> now_durations_;
   Array<Rhythmic_tuple> stopped_durations_;
-
-  Spanner * spacing_p_;
+  Moment now_;
+  Spanner * spacing_;
   
   TRANSLATOR_DECLARATIONS(Spacing_engraver);
 protected:
@@ -71,42 +70,49 @@ Rhythmic_tuple::time_compare (Rhythmic_tuple const &h1,
 
 Spacing_engraver::Spacing_engraver ()
 {
-  spacing_p_ = 0;
+  spacing_ = 0;
 }
 
 void
 Spacing_engraver::initialize ()
 {
-  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);
+  spacing_  =new Spanner (get_property ("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;
+  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_element (spacing_p_, ly_symbol2scm  ("wishes"), i.grob_l_);
+      Pointer_group_interface::add_grob (spacing_, ly_symbol2scm  ("wishes"), i.grob_);
     }
   
-  if (to_boolean (i.grob_l_->get_grob_property ("non-rhythmic")))
+  if (i.grob_->internal_has_interface (ly_symbol2scm ("lyric-syllable-interface")))
     return;
-  
-  if (Rhythmic_req * r = dynamic_cast<Rhythmic_req*> (i.music_cause ()))
+
+  /*
+    only pay attention to durations that are not grace notes. 
+   */
+  if (!now_.grace_part_)
     {
-      Rhythmic_tuple t (i, now_mom () + r->length_mom ());
-      now_durations_.push (t);
+      Music *r = i.music_cause ();
+      if (r && r->is_mus_type ("rhythmic-event"))
+	{
+	  Moment len = r->get_length ();
+	  Rhythmic_tuple t (i, now_mom () + len);
+	  now_durations_.push (t);
+	}
     }
 }
 
@@ -117,23 +123,22 @@ 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 ();
-      if (m.to_bool ())
-	{
-	  shortest_playing = shortest_playing <? m;
-	}
+      Moment m = (playing_durations_[i].info_.music_cause ())->get_length ();
+      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_.music_cause ()->length_mom ();
+      Moment m = now_durations_[i].info_.music_cause ()->get_length ();
       if (m.to_bool ())
-	starter = starter <? m;
+	{
+	  starter = starter <? m;
+	  playing_durations_.insert (now_durations_[i]);
 
-      playing_durations_.insert (now_durations_[i]);
+	}
     }
   now_durations_.clear ();
   
@@ -142,6 +147,7 @@ Spacing_engraver::stop_translation_timestep ()
   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 ();
 
@@ -152,11 +158,11 @@ Spacing_engraver::stop_translation_timestep ()
 void
 Spacing_engraver::start_translation_timestep ()
 {
-  Moment now = now_mom ();
+  now_ = now_mom ();
   stopped_durations_.clear ();
-  while (playing_durations_.size () && playing_durations_.front ().end_ < now)
+  while (playing_durations_.size () && playing_durations_.front ().end_ < now_)
     playing_durations_.delmin ();
-  while (playing_durations_.size () && playing_durations_.front ().end_ == now)
+  while (playing_durations_.size () && playing_durations_.front ().end_ == now_)
     stopped_durations_.push (playing_durations_.get ());
 }
 
@@ -166,6 +172,7 @@ Spacing_engraver::start_translation_timestep ()
 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 */       "");