* lily/context.cc (where_defined): also assign value in

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

diff --git a/lily/rest-collision-engraver.cc b/lily/rest-collision-engraver.cc
index 3c5b2632c6d51d99d80c6a5cabd1913a1514ed3a..60bb70f6a4d7e6c94405d22bdc93cf8e8fa9881f 100644 (file)
--- a/lily/rest-collision-engraver.cc
+++ b/lily/rest-collision-engraver.cc
@@ -13,15 +13,15 @@
 
 class Rest_collision_engraver : public Engraver
 {
-  Item* rest_collision_;
-  int rest_count_; 
+  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 ();
+  DECLARE_ACKNOWLEDGER(note_column);
+  PRECOMPUTED_VIRTUAL void process_acknowledged ();
+  PRECOMPUTED_VIRTUAL void stop_translation_timestep ();
 public:
-  TRANSLATOR_DECLARATIONS (Rest_collision_engraver);  
+  TRANSLATOR_DECLARATIONS (Rest_collision_engraver);
 };
 
 Rest_collision_engraver::Rest_collision_engraver ()
@@ -31,31 +31,27 @@ Rest_collision_engraver::Rest_collision_engraver ()
 }
 
 void
-Rest_collision_engraver::process_acknowledged_grobs ()
+Rest_collision_engraver::process_acknowledged ()
 {
   if (rest_collision_
       || note_columns_.is_empty ()
-      || !rest_count_ 
+      || !rest_count_
       || (note_columns_.size () == rest_count_
-         && rest_count_  < 2))
+         && rest_count_ < 2))
     return;
 
   rest_collision_ = make_item ("RestCollision", SCM_EOL);
 
-  
   for (int i = 0; i < note_columns_.size (); i++)
     Rest_collision::add_column (rest_collision_, note_columns_[i]);
 }
 
 void
-Rest_collision_engraver::acknowledge_grob (Grob_info i)
+Rest_collision_engraver::acknowledge_note_column (Grob_info i)
 {
-  if (Note_column::has_interface (i.grob_))
-    {
-      note_columns_.push (i.grob_);
-      if (Note_column::has_rests (i.grob_))
-       rest_count_ ++;
-    }
+  note_columns_.push (i.grob ());
+  if (Note_column::has_rests (i.grob ()))
+    rest_count_++;
 }
 
 void
@@ -66,10 +62,12 @@ Rest_collision_engraver::stop_translation_timestep ()
   rest_count_ = 0;
 }
 
+#include "translator.icc"
+
+ADD_ACKNOWLEDGER(Rest_collision_engraver, note_column);
 ADD_TRANSLATOR (Rest_collision_engraver,
-/* descr */       "Handles collisions of rests.",
-/* creats*/       "RestCollision",
-/* accepts */     "",
-/* acks  */      "note-column-interface",
-/* reads */       "",
-/* write */       "");
+               /* descr */ "Handles collisions of rests.",
+               /* creats*/ "RestCollision",
+               /* accepts */ "",
+               /* reads */ "",
+               /* write */ "");