/*
- collision-reg.cc -- implement Collision_engraver
+ collision-engraver.cc -- implement Collision_engraver
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_;
+ Item *col_;
+ vector<Grob*> note_columns_;
protected:
- virtual void acknowledge_grob (Grob_info);
- virtual void process_acknowledged_grobs ();
- virtual void stop_translation_timestep ();
+ DECLARE_ACKNOWLEDGER (note_column);
+ void process_acknowledged ();
+ void stop_translation_timestep ();
public:
TRANSLATOR_DECLARATIONS (Collision_engraver);
};
-
void
-Collision_engraver::process_acknowledged_grobs ()
+Collision_engraver::process_acknowledged ()
{
if (col_ || note_columns_.size () < 2)
- return ;
- if (!col_)
- {
- col_ = make_item ("NoteCollision", SCM_EOL);
-
- }
-
- for (int i = 0; i< note_columns_.size (); i++)
+ return;
+ if (!col_)
+ col_ = make_item ("NoteCollision", SCM_EOL);
+
+ for (vsize i = 0; i < note_columns_.size (); i++)
Note_collision_interface::add_column (col_, note_columns_[i]);
}
void
-Collision_engraver::acknowledge_grob (Grob_info i)
+Collision_engraver::acknowledge_note_column (Grob_info i)
{
- if (Note_column::has_interface (i.grob_))
+ if (Note_column::has_interface (i.grob ()))
{
/*should check Y axis? */
- if (Note_column::has_rests (i.grob_) || i.grob_->get_parent (X_AXIS))
- return ;
+ 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 ());
}
}
col_ = 0;
}
+#include "translator.icc"
-
+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 */ "",
-/* acks */ "note-column-interface",
-/* 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 */
+ ""
+ );