X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fcollision-engraver.cc;h=2a0b1dea2fd4f1cffbdaa34be3f2d9f032665246;hb=3e07faa176c300184b2e41d0dcfa779360519359;hp=c1c08fd3bdc0affecde7e3843d50bedfed98837d;hpb=7aabfb20c46e0a1de41698ddc6859ccd3a6dea85;p=lilypond.git

diff --git a/lily/collision-engraver.cc b/lily/collision-engraver.cc
index c1c08fd3bd..2a0b1dea2f 100644
--- a/lily/collision-engraver.cc
+++ b/lily/collision-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "note-column.hh"
@@ -15,7 +15,8 @@
 /*
   collect Note_column, and as soon as there are 2 or more, put them in
   a collision object.  */
-class Collision_engraver : public Engraver {
+class Collision_engraver : public Engraver
+{
   Item * col_;
   Link_array<Grob> note_columns_;
 
@@ -24,7 +25,7 @@ protected:
   virtual void process_acknowledged_grobs ();
   virtual void stop_translation_timestep ();
 public:
-  TRANSLATOR_DECLARATIONS(Collision_engraver);
+  TRANSLATOR_DECLARATIONS (Collision_engraver);
 };
 
 
@@ -35,7 +36,7 @@ Collision_engraver::process_acknowledged_grobs ()
     return ;
   if (!col_) 
     {
-      col_ = new Item (get_property ("NoteCollision"));
+      col_ = make_item ("NoteCollision");
       announce_grob (col_, SCM_EOL);
     }
   
@@ -49,7 +50,7 @@ Collision_engraver::acknowledge_grob (Grob_info i)
   if (Note_column::has_interface (i.grob_))
     {
       /*should check Y axis? */
-      if (Note_column::rest_b (i.grob_) || i.grob_->get_parent (X_AXIS))
+      if (Note_column::has_rests (i.grob_) || i.grob_->get_parent (X_AXIS))
 	return ;
 
       note_columns_.push (i.grob_);
@@ -75,7 +76,7 @@ Collision_engraver::Collision_engraver ()
 
 
 
-ENTER_DESCRIPTION(Collision_engraver,
+ENTER_DESCRIPTION (Collision_engraver,
 /* descr */       "",
 /* creats*/       "NoteCollision",
 /* accepts */     "",