release: 0.0.67

[lilypond.git] / lily / include / collision.hh

diff --git a/lily/include/collision.hh b/lily/include/collision.hh
index 4d25f93c058c60bf3161ca680328af097b2bdbf8..62cee06041d52a641664141ef1250eb34335a5ab 100644 (file)
--- a/lily/include/collision.hh
+++ b/lily/include/collision.hh
@@ -1,7 +1,7 @@
 /*
   collision.hh -- declare Collision
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */
@@ -12,12 +12,18 @@
 #include "lily-proto.hh"
 #include "item.hh"
 
+/** TODO 
+
+  multistaff support (see Chlapik: equal noteheads should be on the
+  same hpos.)  
+*/
 class Collision : public Item {
 protected:
+    virtual void do_substitute_dependency(Score_elem*,Score_elem*);
     virtual void do_pre_processing();
 public:
-    Array<Note_column*> clash_l_arr_;
-    NAME_MEMBERS(Collision);
+    Link_array<Note_column> clash_l_arr_;
+    NAME_MEMBERS();
     void add (Note_column*ncol_l);
     Collision();