release: 1.3.51

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

diff --git a/lily/include/collision.hh b/lily/include/collision.hh
index 7a7b5379f2a74d9b59ba4cafdbbe20747c966e99..4cb7b615ec8d8cec906e466999c0f6260881055c 100644 (file)
--- a/lily/include/collision.hh
+++ b/lily/include/collision.hh
@@ -18,15 +18,29 @@
   
   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 Item
 {
 protected:
   SCM automatic_shift ();
   SCM forced_shift ();
-  
+  void do_shifts ();  
   virtual void before_line_breaking ();
 public: