X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frest-collision-engraver.cc;h=66a2c558a4200796d021295491be1ecbcd43f5e1;hb=0b544cfb7332615ef809b71b57ab656741311ae1;hp=2d2b6df053b7119301b9b7a2b8bf744ae4f9d2f5;hpb=64313890b232c731d432e5b096f30bffc3f3756d;p=lilypond.git

diff --git a/lily/rest-collision-engraver.cc b/lily/rest-collision-engraver.cc
index 2d2b6df053..66a2c558a4 100644
--- a/lily/rest-collision-engraver.cc
+++ b/lily/rest-collision-engraver.cc
@@ -1,23 +1,42 @@
 /*
-  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--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2006 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 "warn.hh"
+#include <set>
+
+#include "duration.hh"
 #include "engraver.hh"
-#include "rest-collision.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"
 
 class Rest_collision_engraver : public Engraver
 {
-  Item *rest_collision_;
-  int rest_count_;
-  Link_array<Grob> note_columns_;
 protected:
-  DECLARE_ACKNOWLEDGER (note_column);
+  Grob *rest_collision_;
+
   void process_acknowledged ();
   void stop_translation_timestep ();
 public:
@@ -27,47 +46,67 @@ public:
 Rest_collision_engraver::Rest_collision_engraver ()
 {
   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;
+  vsize rest_count = 0;
+  set<Grob *> columns;
+  Moment now = now_mom ();
 
-  rest_collision_ = make_item ("RestCollision", SCM_EOL);
+  for (SCM s = get_property ("busyGrobs"); scm_is_pair (s); s = scm_cdr (s))
+    {
+      Grob *g = unsmob_grob (scm_cdar (s));
+      Moment *m = unsmob_moment (scm_caar (s));
+      if (!g || !m)
+        continue;
 
-  for (vsize i = 0; i < note_columns_.size (); i++)
-    Rest_collision::add_column (rest_collision_, note_columns_[i]);
-}
+      if (Rhythmic_head::has_interface (g) && (*m) > now)
+        {
+          Grob *column = g->get_parent (X_AXIS);
+          if (!column)
+            {
+              g->warning (_ ("rhythmic head is not part of a rhythmic column"));
+              continue;
+            }
 
-void
-Rest_collision_engraver::acknowledge_note_column (Grob_info i)
-{
-  note_columns_.push_back (i.grob ());
-  if (Note_column::has_rests (i.grob ()))
-    rest_count_++;
+          // Only include rests that start now. Include notes that started any time.
+          Paper_column *paper_column = dynamic_cast<Item *> (column)->get_column ();
+          if (!Rest::has_interface (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);
+    }
 }
 
 void
 Rest_collision_engraver::stop_translation_timestep ()
 {
   rest_collision_ = 0;
-  note_columns_.clear ();
-  rest_count_ = 0;
 }
 
 #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 */
+                "busyGrobs ",
+
+                /* write */
+                ""
+               );