release: 1.3.51

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

diff --git a/lily/include/collision.hh b/lily/include/collision.hh
index f64db66504f06871fd42884481852415bcb219cc..4cb7b615ec8d8cec906e466999c0f6260881055c 100644 (file)
--- a/lily/include/collision.hh
+++ b/lily/include/collision.hh
@@ -10,25 +10,37 @@
 #ifndef COLLISION_HH
 #define COLLISION_HH
 #include "lily-proto.hh"
-#include "axis-group-item.hh"
-#include "tuple.hh"
+#include "item.hh"
 
-//junkme, use SCM conses.
-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.)  
+
+  * 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 Axis_group_item {
+class Collision : public Item
+{
 protected:
-  Array<Shift_tup> automatic_shift ();
-  Array<Shift_tup> forced_shift ();
-  
+  SCM automatic_shift ();
+  SCM forced_shift ();
+  void do_shifts ();  
   virtual void before_line_breaking ();
 public: