source file of the GNU LilyPond music typesetter
- (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
+#include "engraver.hh"
#include "note-column.hh"
#include "note-collision.hh"
-
-#include "engraver.hh"
#include "axis-group-interface.hh"
+#include "item.hh"
class Collision_engraver : public Engraver
{
Item *col_;
- Link_array<Grob> note_columns_;
+ vector<Grob*> note_columns_;
protected:
- DECLARE_ACKNOWLEDGER(note_column);
+ DECLARE_ACKNOWLEDGER (note_column);
void process_acknowledged ();
void stop_translation_timestep ();
public:
if (col_ || note_columns_.size () < 2)
return;
if (!col_)
- {
- col_ = make_item ("NoteCollision", SCM_EOL);
- }
+ col_ = make_item ("NoteCollision", SCM_EOL);
- for (int i = 0; i < note_columns_.size (); i++)
+ for (vsize i = 0; i < note_columns_.size (); i++)
Note_collision_interface::add_column (col_, note_columns_[i]);
}
if (Note_column::has_rests (i.grob ()) || i.grob ()->get_parent (X_AXIS))
return;
- note_columns_.push (i.grob ());
+ if (to_boolean (i.grob ()->get_property ("ignore-collision")))
+ return;
+
+ note_columns_.push_back (i.grob ());
}
}
#include "translator.icc"
-ADD_ACKNOWLEDGER(Collision_engraver, note_column);
+ADD_ACKNOWLEDGER (Collision_engraver, note_column);
ADD_TRANSLATOR (Collision_engraver,
- /* descr */ "Collect NoteColumns, and as soon as there are two or more, put them in a NoteCollision object.",
- /* creats*/ "NoteCollision",
- /* accepts */ "",
- /* reads */ "",
- /* write */ "");
+ /* doc */
+ "Collect @code{NoteColumns}, and as soon as there are two or"
+ " more, put them in a @code{NoteCollision} object.",
+
+ /* create */
+ "NoteCollision ",
+
+ /* read */
+ "",
+
+ /* write */
+ ""
+ );