patch::: 0.0.68pre.jcn1: Re: patsen?

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

diff --git a/lily/rest-collision-reg.cc b/lily/rest-collision-reg.cc
index 81b27a417a795a4273cf81338bc189913c261613..259e33c94937a7eff81e819c6a1b2f76bc5e23a4 100644 (file)
--- a/lily/rest-collision-reg.cc
+++ b/lily/rest-collision-reg.cc
@@ -6,12 +6,22 @@
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */
 
+#include "debug.hh"
 #include "rest-collision.hh"
 #include "rest-collision-reg.hh"
 #include "collision.hh"
 #include "rest-column.hh"
 #include "note-column.hh"
 
+IMPLEMENT_STATIC_NAME(Rest_collision_register);
+IMPLEMENT_IS_TYPE_B1(Rest_collision_register, Request_register);
+ADD_THIS_REGISTER(Rest_collision_register);
+
+Rest_collision_register::Rest_collision_register()
+{
+    rest_collision_p_ =0;
+}
+
 void
 Rest_collision_register::acknowledge_element(Score_elem_info i)
 {
@@ -19,7 +29,13 @@ Rest_collision_register::acknowledge_element(Score_elem_info i)
     if (nC == Collision::static_name()) {
        collision_l_arr_.push((Collision*)i.elem_l_->item());
     } 
-    else if (nC == Rest_column ::static_name()) {
+    else if (nC == Note_column::static_name()) {
+       // what should i do, what should _register do?
+       if (!rest_collision_p_)
+           rest_collision_p_ = new Rest_collision;
+       rest_collision_p_->add((Note_column*)i.elem_l_->item());
+    }
+    else if (nC == Rest_column::static_name()) {
        if (!rest_collision_p_)
            rest_collision_p_ = new Rest_collision;
        rest_collision_p_->add((Rest_column*)i.elem_l_->item());
@@ -35,11 +51,12 @@ Rest_collision_register::do_pre_move_processing()
     }
 }
 
-Rest_collision_register::Rest_collision_register()
+void
+Rest_collision_register::do_print() const
 {
-    rest_collision_p_ =0;
+#ifndef NPRINT
+    mtor << "collisions: " << collision_l_arr_.size();
+    if ( rest_collision_p_ )
+       rest_collision_p_->print();
+#endif
 }
-
-IMPLEMENT_STATIC_NAME(Rest_collision_register);
-IMPLEMENT_IS_TYPE_B1(Rest_collision_register, Request_register);
-ADD_THIS_REGISTER(Rest_collision_register);