X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fcollision.hh;h=4f6ef42da82edea17ff5d7b0273275c9fd3fc4e6;hb=8aad615ea7bb31f49a0c2afc21eea5ff5de20437;hp=9f28738e21b7652208e56e2c55a6da7a1fee57bc;hpb=7c9b553acad88d5cd62461989f0f20652dc04dda;p=lilypond.git

diff --git a/lily/include/collision.hh b/lily/include/collision.hh
index 9f28738e21..4f6ef42da8 100644
--- a/lily/include/collision.hh
+++ b/lily/include/collision.hh
@@ -1,30 +1,33 @@
 /*
   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>
+  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
 #ifndef COLLISION_HH
 #define COLLISION_HH
 #include "lily-proto.hh"
-#include "item.hh"
+#include "horizontal-vertical-group-item.hh"
 
-/** TODO 
+/**
+  Resolve conflicts between various Note_columns (chords).
+  
+  TODO 
 
   multistaff support (see Chlapik: equal noteheads should be on the
   same hpos.)  
 */
-class Collision : public Item {
+class Collision : public Horizontal_vertical_group_item {
 protected:
+    virtual void do_substitute_dependency (Score_element*,Score_element*);
     virtual void do_pre_processing();
 public:
-    Array<Note_column*> clash_l_arr_;
-    NAME_MEMBERS(Collision);
-    void add (Note_column*ncol_l);
-    Collision();
+    Link_array<Note_column> clash_l_arr_;
     
+    void add_column (Note_column*ncol_l);
+    Collision();
 };
 #endif // COLLISION_HH