patch::: 1.3.96.jcn9

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

diff --git a/lily/include/collision.hh b/lily/include/collision.hh
index 844496a855546467bb8db9f9fbb21a6860da6fd8..483ad4bff1244eed306c57f0edf9a4c1c087c993 100644 (file)
--- a/lily/include/collision.hh
+++ b/lily/include/collision.hh
@@ -1,25 +1,37 @@
 /*
   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--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
 #ifndef COLLISION_HH
 #define COLLISION_HH
+
 #include "lily-proto.hh"
-#include "item.hh"
+#include "lily-guile.hh"
+
+
+/**
+  Resolve conflicts between various Note_columns (chords).
+  
+  TODO 
 
-class Collision : public Item {
-    Array<Note_column*> clash_l_arr_;
-protected:
-    virtual void do_pre_processing();
+  * multistaff support (see Chlapik: equal noteheads should be on the
+  same hpos.)  
+
+  * Make interface of this, similar to align-interface.
+  
+*/
+class Collision                        // interface
+{
 public:
-    NAME_MEMBERS(Collision);
-    void add (Note_column*ncol_l);
-    Collision();
-    
+  static SCM automatic_shift (Score_element*);
+  static SCM forced_shift (Score_element*);
+  DECLARE_SCHEME_CALLBACK(force_shift_callback, (SCM element, SCM axis));
+  static void do_shifts (Score_element*);
+  static void add_column (Score_element*me,Score_element*ncol_l);
 };
 #endif // COLLISION_HH