(music_property_def): oops. SCM_UNDEFINED

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

diff --git a/lily/collision-engraver.cc b/lily/collision-engraver.cc
index 41399bbeca594b9ce7bd509453dedfcb19ceb24e..0110973933c889ffddbe7b3653c5b500e6056444 100644 (file)
--- a/lily/collision-engraver.cc
+++ b/lily/collision-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2002 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_;
 
@@ -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_);
@@ -78,7 +79,7 @@ Collision_engraver::Collision_engraver ()
 ENTER_DESCRIPTION(Collision_engraver,
 /* descr */       "",
 /* creats*/       "NoteCollision",
-/* accepts */     "general-music",
+/* accepts */     "",
 /* acks  */      "note-column-interface",
 /* reads */       "",
 /* write */       "");