X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frest-collision-engraver.cc;h=47e2d71f11d00b0c2c978807c61af21dead1582b;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=af3d0ecc8903c03a8a1d5e05e7c009abe2981e5f;hpb=67b894e5352976437c9db5d7b15fd51326bab56a;p=lilypond.git

diff --git a/lily/rest-collision-engraver.cc b/lily/rest-collision-engraver.cc
index af3d0ecc89..47e2d71f11 100644
--- a/lily/rest-collision-engraver.cc
+++ b/lily/rest-collision-engraver.cc
@@ -1,80 +1,109 @@
 /*
-  rest-collision-reg.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--2004 Han-Wen Nienhuys <hanwen@cs.uu.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 "rest-collision.hh"
+#include <set>
+
+#include "duration.hh"
 #include "engraver.hh"
-#include "note-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:
-  virtual void acknowledge_grob (Grob_info);
-  virtual void process_acknowledged_grobs ();
-  virtual void stop_translation_timestep ();
+  Grob *rest_collision_;
+
+  void process_acknowledged ();
+  void stop_translation_timestep ();
 public:
-  TRANSLATOR_DECLARATIONS(Rest_collision_engraver);  
+  TRANSLATOR_DECLARATIONS (Rest_collision_engraver);
 };
 
-
-
 Rest_collision_engraver::Rest_collision_engraver ()
 {
-  rest_collision_ =0;
-  rest_count_ = 0;
+  rest_collision_ = 0;
 }
 
 void
-Rest_collision_engraver::process_acknowledged_grobs ()
+Rest_collision_engraver::process_acknowledged ()
 {
-  if (rest_collision_
-      || note_columns_.is_empty ()
-      || !rest_count_)
-    return;
+  vsize rest_count = 0;
+  set<Grob *> columns;
+  Moment now = now_mom ();
+
+  for (SCM s = get_property ("busyGrobs"); scm_is_pair (s); s = scm_cdr (s))
+    {
+      Grob *g = Grob::unsmob (scm_cdar (s));
+      Moment *m = Moment::unsmob (scm_caar (s));
+      if (!g || !m)
+        continue;
 
-  rest_collision_ = make_item ("RestCollision");
+      if (Rhythmic_head::has_interface (g) && (*m) > now)
+        {
+          Grob *column = g->get_parent (X_AXIS);
+          if (!column)
+              continue;
 
-  announce_grob(rest_collision_, SCM_EOL);
-  for (int i=0; i < note_columns_.size (); i++)
-    Rest_collision::add_column (rest_collision_,note_columns_[i]);
-}
+          // 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);
+            }
+        }
+    }
 
-void
-Rest_collision_engraver::acknowledge_grob (Grob_info i)
-{
-  if (Note_column::has_interface (i.grob_))
+  if (!rest_collision_ && rest_count && columns.size () > 1)
     {
-      note_columns_.push (i.grob_);
-      if (Note_column::has_rests (i.grob_))
-	rest_count_ ++;
+      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 ()
 {
-  if (rest_collision_) 
-    {
-      typeset_grob (rest_collision_);
-      rest_collision_ = 0;
-    }
-  note_columns_.clear ();
-  rest_count_ = 0;
+  rest_collision_ = 0;
 }
 
-ENTER_DESCRIPTION(Rest_collision_engraver,
-/* descr */       "Handles collisions of rests.",
-/* creats*/       "RestCollision",
-/* accepts */     "",
-/* acks  */      "note-column-interface",
-/* reads */       "",
-/* write */       "");
+#include "translator.icc"
+
+ADD_TRANSLATOR (Rest_collision_engraver,
+                /* doc */
+                "Handle collisions of rests.",
+
+                /* create */
+                "RestCollision ",
+
+                /* read */
+                "busyGrobs ",
+
+                /* write */
+                ""
+               );