release: 1.0.1

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

diff --git a/lily/include/collision.hh b/lily/include/collision.hh
index 3891a5a0c16c0943e3897ccd540a306f96fecb9a..9a7505163bc38867a7cdf46d852e71fb3bbb3c8b 100644 (file)
--- a/lily/include/collision.hh
+++ b/lily/include/collision.hh
@@ -3,29 +3,31 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 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_elem*,Score_elem*);
+    virtual void do_substitute_dependency (Score_element*,Score_element*);
     virtual void do_pre_processing();
 public:
     Link_array<Note_column> clash_l_arr_;
     DECLARE_MY_RUNTIME_TYPEINFO;
-    void add (Note_column*ncol_l);
+    void add_column (Note_column*ncol_l);
     Collision();
-    
 };
 #endif // COLLISION_HH