source file of the GNU LilyPond music typesetter
- (c) 1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#ifndef COLLISION_HH
#define COLLISION_HH
#include "lily-proto.hh"
-#include "axis-group-item.hh"
-#include "tuple.hh"
+#include "item.hh"
-typedef Tuple<Note_column*, 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 ();
-
- virtual void do_substitute_element_pointer (Score_element*,Score_element*);
- 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_;
void add_column (Note_column*ncol_l);
Collision();