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

diff --git a/lily/rest-collision-engraver.cc b/lily/rest-collision-engraver.cc
index 23a351c2f1..70984ae2ad 100644
--- a/lily/rest-collision-engraver.cc
+++ b/lily/rest-collision-engraver.cc
@@ -1,117 +1,116 @@
 /*
-  rest-collision-engraver.cc -- implement Rest_collision_engraver
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <list>
+#include <set>
 
 #include "duration.hh"
 #include "engraver.hh"
+#include "international.hh"
 #include "item.hh"
 #include "moment.hh"
 #include "note-column.hh"
+#include "paper-column.hh"
+#include "rest.hh"
 #include "rest-collision.hh"
+#include "rhythmic-head.hh"
 #include "stream-event.hh"
 #include "warn.hh"
 
+#include "translator.icc"
+
 class Rest_collision_engraver : public Engraver
 {
-  Item *rest_collision_;
-  vsize rest_count_;
-  list<pair<Grob*, Moment> > note_columns_;
 protected:
-  DECLARE_ACKNOWLEDGER (note_column);
+  Grob *rest_collision_;
+
   void process_acknowledged ();
   void stop_translation_timestep ();
-  void start_translation_timestep ();
 public:
   TRANSLATOR_DECLARATIONS (Rest_collision_engraver);
 };
 
-Rest_collision_engraver::Rest_collision_engraver ()
+Rest_collision_engraver::Rest_collision_engraver (Context *c)
+  : Engraver (c)
 {
   rest_collision_ = 0;
-  rest_count_ = 0;
 }
 
 void
 Rest_collision_engraver::process_acknowledged ()
 {
-  if (rest_collision_
-      || note_columns_.empty ()
-      || !rest_count_
-      || (note_columns_.size () == rest_count_
-	  && rest_count_ < 2))
-    return;
-
-  rest_collision_ = make_item ("RestCollision", SCM_EOL);
-
-  list<pair<Grob*, Moment> >::iterator i;
-  for (i = note_columns_.begin (); i != note_columns_.end (); i++)
-    Rest_collision::add_column (rest_collision_, i->first);
-}
+  vsize rest_count = 0;
+  set<Grob *> columns;
+  Moment now = now_mom ();
 
-void
-Rest_collision_engraver::acknowledge_note_column (Grob_info i)
-{
-  Moment end = now_mom ();
-  if (Note_column::has_rests (i.grob ()))
-    rest_count_++;
-  else
+  for (SCM s = get_property ("busyGrobs"); scm_is_pair (s); s = scm_cdr (s))
     {
-      // 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 ();
-	}
+      Grob *g = unsmob<Grob> (scm_cdar (s));
+      Moment *m = unsmob<Moment> (scm_caar (s));
+      if (!g || !m)
+        continue;
+
+      if (has_interface<Rhythmic_head> (g) && (*m) > now)
+        {
+          Grob *column = g->get_parent (X_AXIS);
+          if (!column)
+              continue;
+
+          // Only include rests that start now. Include notes that started any time.
+          Paper_column *paper_column = dynamic_cast<Item *> (column)->get_column ();
+          if (!has_interface<Rest> (g) || !paper_column || Paper_column::when_mom (paper_column) == now)
+            {
+              columns.insert (column);
+              rest_count += Note_column::has_rests (column);
+            }
+        }
+    }
+
+  if (!rest_collision_ && rest_count && columns.size () > 1)
+    {
+      rest_collision_ = make_item ("RestCollision", SCM_EOL);
+      for (set<Grob *>::iterator i = columns.begin (); i != columns.end (); ++i)
+        Rest_collision::add_column (rest_collision_, *i);
     }
-  note_columns_.push_back (pair<Grob*, Moment> (i.grob (), end));
 }
 
 void
 Rest_collision_engraver::stop_translation_timestep ()
 {
   rest_collision_ = 0;
-  rest_count_ = 0;
 }
 
 void
-Rest_collision_engraver::start_translation_timestep ()
+Rest_collision_engraver::boot ()
 {
-  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 */
-		"Handle collisions of rests.",
+                /* doc */
+                "Handle collisions of rests.",
 
-		/* create */
-		"RestCollision ",
+                /* create */
+                "RestCollision ",
 
-		/* read */
-		"",
+                /* read */
+                "busyGrobs ",
 
-		/* write */
-		""
-		);
+                /* write */
+                ""
+               );