release: 0.1.31

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

diff --git a/lily/rest-collision-grav.cc b/lily/rest-collision-grav.cc
index 296f856a8a47f54b498f88a06ce3ddeaaba43690..4aa0607aca38811ad2f24ab4935904fd1c117325 100644 (file)
--- a/lily/rest-collision-grav.cc
+++ b/lily/rest-collision-grav.cc
@@ -10,52 +10,38 @@
 #include "rest-collision.hh"
 #include "rest-collision-grav.hh"
 #include "collision.hh"
-#include "rest-column.hh"
 #include "note-column.hh"
 
-IMPLEMENT_STATIC_NAME(Rest_collision_engraver);
+
 IMPLEMENT_IS_TYPE_B1(Rest_collision_engraver, Engraver);
-ADD_THIS_ENGRAVER(Rest_collision_engraver);
+ADD_THIS_TRANSLATOR(Rest_collision_engraver);
 
 Rest_collision_engraver::Rest_collision_engraver()
 {
-    rest_collision_p_ =0;
+  rest_collision_p_ =0;
 }
 
 void
-Rest_collision_engraver::acknowledge_element(Score_elem_info i)
+Rest_collision_engraver::acknowledge_element (Score_elem_info i)
 {
-    char const * nC = i.elem_l_->name();
-    if (nC == Collision::static_name()) {
-       collision_l_arr_.push((Collision*)i.elem_l_->item());
-    } 
-    else if (nC == Note_column::static_name()) {
-       // what should i do, what should _engraver 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());
+  if (i.elem_l_->name()== Note_column::static_name()) 
+    {
+      // what should i do, what should _engraver do?
+      if (!rest_collision_p_) 
+       {
+         rest_collision_p_ = new Rest_collision;
+         announce_element (Score_elem_info (rest_collision_p_, 0));
+       }
+      rest_collision_p_->add ((Note_column*)i.elem_l_->item());
     }
 }
 
 void
 Rest_collision_engraver::do_pre_move_processing()
 {
-    if (rest_collision_p_) {
-       typeset_element(rest_collision_p_);
-       rest_collision_p_ = 0;
+  if (rest_collision_p_) 
+    {
+      typeset_element (rest_collision_p_);
+      rest_collision_p_ = 0;
     }
 }
-
-void
-Rest_collision_engraver::do_print() const
-{
-#ifndef NPRINT
-    if ( rest_collision_p_ )
-       rest_collision_p_->print();
-#endif
-}