release: 0.1.61

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

diff --git a/lily/rest-collision-grav.cc b/lily/rest-collision-grav.cc
index 86a4030bdfcd5ffdcca1d5d8d7ebfb32462903ba..3729f28e7e1a680866736fe8f8c67d2d1f221355 100644 (file)
--- a/lily/rest-collision-grav.cc
+++ b/lily/rest-collision-grav.cc
@@ -3,48 +3,36 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>
 */
 
 #include "debug.hh"
 #include "rest-collision.hh"
 #include "rest-collision-grav.hh"
 #include "collision.hh"
-#include "rest-column.hh"
 #include "note-column.hh"
 
 
 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;
 }
 
-void
-Rest_collision_engraver::make_collision()
-{
-  if (!rest_collision_p_) 
-    {
-           rest_collision_p_ = new Rest_collision;
-           announce_element (Score_elem_info (rest_collision_p_, 0));
-    }
-}
 void
 Rest_collision_engraver::acknowledge_element (Score_elem_info i)
 {
-  char const * nC = i.elem_l_->name();
-  if (nC == Note_column::static_name()) 
+  if (i.elem_l_->is_type_b (Note_column::static_name())) 
     {
-       // what should i do, what should _engraver do?
-       make_collision();
-       rest_collision_p_->add ((Note_column*)i.elem_l_->item());
-    }
-  else if (nC == Rest_column::static_name()) 
-    {
-       make_collision();
-       rest_collision_p_->add ((Rest_column*)i.elem_l_->item());
+      // 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());
     }
 }
 
@@ -53,16 +41,7 @@ Rest_collision_engraver::do_pre_move_processing()
 {
   if (rest_collision_p_) 
     {
-       typeset_element (rest_collision_p_);
-       rest_collision_p_ = 0;
+      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
-}