patch::: 1.3.96.jcn9

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

diff --git a/lily/include/collision.hh b/lily/include/collision.hh
index 4cb199385686502cff424b420d957762860d50f8..483ad4bff1244eed306c57f0edf9a4c1c087c993 100644 (file)
--- a/lily/include/collision.hh
+++ b/lily/include/collision.hh
@@ -9,8 +9,9 @@
 
 #ifndef COLLISION_HH
 #define COLLISION_HH
+
 #include "lily-proto.hh"
-#include "item.hh"
+#include "lily-guile.hh"
 
 
 /**
@@ -23,28 +24,14 @@
 
   * Make interface of this, similar to align-interface.
   
-  Properties:
-
-  elements -- (see Axis_group_interface)
-
-  merge-differently-dotted -- merge black noteheads with differing dot count.
-
-  horizontal-shift -- integer that identifies ranking of note-column for horizontal shifting.
-  
-  force-hshift -- amount of collision_note_width that overides automatic collision settings.
-  Read and removed from elements.
-  
 */
-class Collision : public Item
+class Collision                        // interface
 {
-protected:
-  SCM automatic_shift ();
-  SCM forced_shift ();
-  void do_shifts ();  
-  virtual void before_line_breaking ();
 public:
-    
-  void add_column (Note_column*ncol_l);
-  Collision(SCM);
+  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