patch::: 1.3.96.jcn9

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

diff --git a/lily/include/collision.hh b/lily/include/collision.hh
index 3e88c982b2cdfbdfd28502e38cae09f40aa65993..483ad4bff1244eed306c57f0edf9a4c1c087c993 100644 (file)
--- a/lily/include/collision.hh
+++ b/lily/include/collision.hh
@@ -24,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                        // interface
 {
 public:
-  Score_element*  elt_l_;
   static SCM automatic_shift (Score_element*);
   static SCM forced_shift (Score_element*);
-  static Real force_shift_callback (Score_element *, Axis);
+  DECLARE_SCHEME_CALLBACK(force_shift_callback, (SCM element, SCM axis));
   static void do_shifts (Score_element*);
-
-  void add_column (Note_column*ncol_l);
-  Collision(Score_element*);
+  static void add_column (Score_element*me,Score_element*ncol_l);
 };
 #endif // COLLISION_HH