release: 1.3.51

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

diff --git a/lily/include/collision.hh b/lily/include/collision.hh
index be8d6bd506d05b6e3242f49cde47cf4dffbad917..4cb7b615ec8d8cec906e466999c0f6260881055c 100644 (file)
--- a/lily/include/collision.hh
+++ b/lily/include/collision.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -12,20 +12,39 @@
 #include "lily-proto.hh"
 #include "item.hh"
 
-/** TODO 
 
-  multistaff support (see Chlapik: equal noteheads should be on the
+/**
+  Resolve conflicts between various Note_columns (chords).
+  
+  TODO 
+
+  * 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 {
+class Collision : public Item
+{
 protected:
-    virtual void do_substitute_dependency(Score_elem*,Score_elem*);
-    virtual void do_pre_processing();
+  SCM automatic_shift ();
+  SCM forced_shift ();
+  void do_shifts ();  
+  virtual void before_line_breaking ();
 public:
-    Link_array<Note_column> clash_l_arr_;
-    NAME_MEMBERS(Collision);
-    void add (Note_column*ncol_l);
-    Collision();
     
+  void add_column (Note_column*ncol_l);
+  Collision();
 };
 #endif // COLLISION_HH