patch::: 1.3.96.jcn9

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

diff --git a/lily/include/collision.hh b/lily/include/collision.hh
index a1ee164ff0f007d8f93450bcde79ae9991233fbe..483ad4bff1244eed306c57f0edf9a4c1c087c993 100644 (file)
--- a/lily/include/collision.hh
+++ b/lily/include/collision.hh
@@ -3,36 +3,35 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
 #ifndef COLLISION_HH
 #define COLLISION_HH
-#include "lily-proto.hh"
-#include "axis-group-item.hh"
-#include "tuple.hh"
 
+#include "lily-proto.hh"
+#include "lily-guile.hh"
 
-typedef Tuple<Score_element*, Real> Shift_tup;
 
 /**
   Resolve conflicts between various Note_columns (chords).
   
   TODO 
 
-  multistaff support (see Chlapik: equal noteheads should be on the
+  * multistaff support (see Chlapik: equal noteheads should be on the
   same hpos.)  
-*/
-class Collision : public Axis_group_item {
-protected:
-  Array<Shift_tup> automatic_shift ();
-  Array<Shift_tup> forced_shift ();
+
+  * Make interface of this, similar to align-interface.
   
-  virtual void do_pre_processing();
+*/
+class Collision                        // interface
+{
 public:
-    
-  void add_column (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