X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frest-collision-engraver.cc;h=23a351c2f150e03bb9acd8426606d8946547f1f6;hb=9c3ecc7d6e596e8151a58ce7ed0dd9e1b0802d1e;hp=ef2ecfb4207a73ba2fa18865003f679e51dce79e;hpb=31568c504806f35aac420a394c9eab07abd9faa7;p=lilypond.git

diff --git a/lily/rest-collision-engraver.cc b/lily/rest-collision-engraver.cc
index ef2ecfb420..23a351c2f1 100644
--- a/lily/rest-collision-engraver.cc
+++ b/lily/rest-collision-engraver.cc
@@ -3,23 +3,30 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-#include "warn.hh"
+#include <list>
+
+#include "duration.hh"
 #include "engraver.hh"
-#include "rest-collision.hh"
+#include "item.hh"
+#include "moment.hh"
 #include "note-column.hh"
+#include "rest-collision.hh"
+#include "stream-event.hh"
+#include "warn.hh"
 
 class Rest_collision_engraver : public Engraver
 {
   Item *rest_collision_;
   vsize rest_count_;
-  vector<Grob*> note_columns_;
+  list<pair<Grob*, Moment> > note_columns_;
 protected:
   DECLARE_ACKNOWLEDGER (note_column);
   void process_acknowledged ();
   void stop_translation_timestep ();
+  void start_translation_timestep ();
 public:
   TRANSLATOR_DECLARATIONS (Rest_collision_engraver);
 };
@@ -42,32 +49,69 @@ Rest_collision_engraver::process_acknowledged ()
 
   rest_collision_ = make_item ("RestCollision", SCM_EOL);
 
-  for (vsize i = 0; i < note_columns_.size (); i++)
-    Rest_collision::add_column (rest_collision_, note_columns_[i]);
+  list<pair<Grob*, Moment> >::iterator i;
+  for (i = note_columns_.begin (); i != note_columns_.end (); i++)
+    Rest_collision::add_column (rest_collision_, i->first);
 }
 
 void
 Rest_collision_engraver::acknowledge_note_column (Grob_info i)
 {
-  note_columns_.push_back (i.grob ());
+  Moment end = now_mom ();
   if (Note_column::has_rests (i.grob ()))
     rest_count_++;
+  else
+    {
+      // We only keep track of ending moments for columns with notes.
+      // It is safe to add a column with notes to multiple RestCollisions, but
+      // it might not be safe to add a column with rests to multiple RestCollisions.
+      Grob *stem = Note_column::get_stem (i.grob ());
+      Stream_event *ev = stem ? stem->event_cause () : 0;
+      Duration *dur_ptr = ev ? unsmob_duration (ev->get_property ("duration")) : 0;
+      if (dur_ptr)
+	{
+	  if (end.grace_part_)
+	    end.grace_part_ += dur_ptr->get_length ();
+	  else
+	    end.main_part_ += dur_ptr->get_length ();
+	}
+    }
+  note_columns_.push_back (pair<Grob*, Moment> (i.grob (), end));
 }
 
 void
 Rest_collision_engraver::stop_translation_timestep ()
 {
   rest_collision_ = 0;
-  note_columns_.clear ();
   rest_count_ = 0;
 }
 
+void
+Rest_collision_engraver::start_translation_timestep ()
+{
+  list<pair<Grob*, Moment> >::iterator i = note_columns_.begin ();
+  while (i != note_columns_.end ())
+    {
+      if (i->second <= now_mom ())
+	i = note_columns_.erase (i);
+      else
+	i++;
+    }
+}
+
 #include "translator.icc"
 
 ADD_ACKNOWLEDGER (Rest_collision_engraver, note_column);
 ADD_TRANSLATOR (Rest_collision_engraver,
-		/* doc */ "Handles collisions of rests.",
-		/* create */ "RestCollision",
-		/* accept */ "",
-		/* read */ "",
-		/* write */ "");
+		/* doc */
+		"Handle collisions of rests.",
+
+		/* create */
+		"RestCollision ",
+
+		/* read */
+		"",
+
+		/* write */
+		""
+		);