Fix define-markup error messages

[lilypond.git] / lily / rest-collision-engraver.cc

diff --git a/lily/rest-collision-engraver.cc b/lily/rest-collision-engraver.cc
index a1d4d7f0bba5d4858dcd37dfb747ba0bae0ad2ed..4720368c909c3fd5da2a5838c2288e0bce675289 100644 (file)
--- a/lily/rest-collision-engraver.cc
+++ b/lily/rest-collision-engraver.cc
@@ -1,70 +1,101 @@
 /*
-  rest-collision-reg.cc -- implement Rest_collision_engraver
+  rest-collision-engraver.cc -- implement Rest_collision_engraver
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-#include "debug.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_p_;
-
-  Link_array<Grob> note_column_l_arr_;
 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_p_ =0;
+  rest_collision_ = 0;
 }
 
 void
-Rest_collision_engraver::process_acknowledged_grobs ()
+Rest_collision_engraver::process_acknowledged ()
 {
-  if (rest_collision_p_ || note_column_l_arr_.size () < 2)
-    return;
+  vsize rest_count = 0;
+  set<Grob*> columns;
+  Moment now = now_mom ();
 
-  rest_collision_p_ = new Item (get_property ("RestCollision"));
+  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;
 
-  announce_grob(rest_collision_p_, SCM_EOL);
-  for (int i=0; i< note_column_l_arr_.size (); i++)
-    Rest_collision::add_column (rest_collision_p_,note_column_l_arr_[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_grob (Grob_info i)
-{
-  if (Note_column::has_interface (i.grob_l_))
-    note_column_l_arr_.push (i.grob_l_);
+         // 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 ()
 {
-  if (rest_collision_p_) 
-    {
-      typeset_grob (rest_collision_p_);
-      rest_collision_p_ = 0;
-    }
-  note_column_l_arr_.clear ();
+  rest_collision_ = 0;
 }
-ENTER_DESCRIPTION(Rest_collision_engraver,
-/* descr */       "Handles collisions of rests.",
-/* creats*/       "RestCollision",
-/* acks  */       "note-column-interface",
-/* reads */       "",
-/* write */       "");
+
+#include "translator.icc"
+
+ADD_TRANSLATOR (Rest_collision_engraver,
+               /* doc */
+               "Handle collisions of rests.",
+
+               /* create */
+               "RestCollision ",
+
+               /* read */
+               "busyGrobs ",
+
+               /* write */
+               ""
+               );