X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspacing-engraver.cc;h=a8f19e16745a36a989bc1ebfd29f1730c3429241;hb=947454c5cc430a9627262de4f25274a64789d3c2;hp=0b3b58673159f08145eec098644ca9d7950323db;hpb=fc3e875d6bf06f0680e897faffdcab36ad975a03;p=lilypond.git

diff --git a/lily/spacing-engraver.cc b/lily/spacing-engraver.cc
index 0b3b586731..a8f19e1674 100644
--- a/lily/spacing-engraver.cc
+++ b/lily/spacing-engraver.cc
@@ -3,16 +3,18 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2001 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 "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
 {
@@ -41,17 +43,16 @@ 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:
-  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 process_music ();
   virtual void finalize ();
-public:
-  Spacing_engraver ();
 };
 
 inline int
@@ -64,45 +65,62 @@ 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_p_ = 0;
+  spacing_ = 0;
 }
 
 void
-Spacing_engraver::initialize ()
+Spacing_engraver::process_music ()
 {
-  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);
+  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 (to_boolean (i.elem_l_->get_grob_property ("grace")))
+  if (Note_spacing::has_interface (i.grob_) || Staff_spacing::has_interface (i.grob_))
+    {
+      Pointer_group_interface::add_grob (spacing_, ly_symbol2scm  ("wishes"), i.grob_);
+    }
+  
+  if (i.grob_->internal_has_interface (ly_symbol2scm ("lyric-syllable-interface"))
+      || i.grob_->internal_has_interface (ly_symbol2scm ("multi-measure-event")))
     return;
 
-  if (to_boolean (i.elem_l_->get_grob_property ("non-rhythmic")))
-    return;
-  
-  if (Rhythmic_req * r = dynamic_cast<Rhythmic_req*> (i.req_l_))
+  /*
+    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);
+	}
     }
 }
 
@@ -113,23 +131,25 @@ 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_.req_l_)->length_mom ();
-      if (m)
+      Music * mus = playing_durations_[i].info_.music_cause ();
+      if (mus)
 	{
+	  Moment m = mus->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_.req_l_->length_mom ();
-      if (m)
-	starter = starter <? m;
+      Moment m = now_durations_[i].info_.music_cause ()->get_length ();
+      if (m.to_bool ())
+	{
+	  starter = starter <? m;
+	  playing_durations_.insert (now_durations_[i]);
 
-      playing_durations_.insert (now_durations_[i]);
+	}
     }
   now_durations_.clear ();
   
@@ -138,24 +158,32 @@ 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 ();
 
-  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
 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 ());
 }
 
-ADD_THIS_TRANSLATOR (Spacing_engraver);
 
 
+
+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 */       "");