/*
- rest-collision-reg.cc -- implement Rest_collision_engraver
+ rest-collision-engraver.cc -- implement Rest_collision_engraver
source file of the GNU LilyPond music typesetter
- (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
-#include "warn.hh"
+#include <list>
+
+#include "duration.hh"
#include "engraver.hh"
-#include "rest-collision.hh"
+#include "item.hh"
+#include "moment.hh"
#include "note-column.hh"
+#include "rest-collision.hh"
+#include "stream-event.hh"
+#include "warn.hh"
class Rest_collision_engraver : public Engraver
{
- Item* rest_collision_;
- int rest_count_;
- Link_array<Grob> note_columns_;
+ Item *rest_collision_;
+ vsize rest_count_;
+ list<pair<Grob*, Moment> > 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 ();
+ void start_translation_timestep ();
public:
- TRANSLATOR_DECLARATIONS (Rest_collision_engraver);
+ TRANSLATOR_DECLARATIONS (Rest_collision_engraver);
};
Rest_collision_engraver::Rest_collision_engraver ()
}
void
-Rest_collision_engraver::process_acknowledged_grobs ()
+Rest_collision_engraver::process_acknowledged ()
{
if (rest_collision_
- || note_columns_.is_empty ()
- || !rest_count_
+ || note_columns_.empty ()
+ || !rest_count_
|| (note_columns_.size () == rest_count_
- && rest_count_ < 2))
+ && rest_count_ < 2))
return;
rest_collision_ = make_item ("RestCollision", SCM_EOL);
-
- for (int i= 0; i < note_columns_.size (); i++)
- Rest_collision::add_column (rest_collision_,note_columns_[i]);
+ list<pair<Grob*, Moment> >::iterator i;
+ for (i = note_columns_.begin (); i != note_columns_.end (); i++)
+ Rest_collision::add_column (rest_collision_, i->first);
}
void
-Rest_collision_engraver::acknowledge_grob (Grob_info i)
+Rest_collision_engraver::acknowledge_note_column (Grob_info i)
{
- if (Note_column::has_interface (i.grob_))
+ Moment end = now_mom ();
+ if (Note_column::has_rests (i.grob ()))
+ rest_count_++;
+ else
{
- note_columns_.push (i.grob_);
- if (Note_column::has_rests (i.grob_))
- rest_count_ ++;
+ // We only keep track of ending moments for columns with notes.
+ // It is safe to add a column with notes to multiple RestCollisions, but
+ // it might not be safe to add a column with rests to multiple RestCollisions.
+ Grob *stem = Note_column::get_stem (i.grob ());
+ Stream_event *ev = stem ? stem->event_cause () : 0;
+ Duration *dur_ptr = ev ? unsmob_duration (ev->get_property ("duration")) : 0;
+ if (dur_ptr)
+ {
+ if (end.grace_part_)
+ end.grace_part_ += dur_ptr->get_length ();
+ else
+ end.main_part_ += dur_ptr->get_length ();
+ }
}
+ note_columns_.push_back (pair<Grob*, Moment> (i.grob (), end));
}
void
Rest_collision_engraver::stop_translation_timestep ()
{
rest_collision_ = 0;
- note_columns_.clear ();
rest_count_ = 0;
}
-ENTER_DESCRIPTION (Rest_collision_engraver,
-/* descr */ "Handles collisions of rests.",
-/* creats*/ "RestCollision",
-/* accepts */ "",
-/* acks */ "note-column-interface",
-/* reads */ "",
-/* write */ "");
+void
+Rest_collision_engraver::start_translation_timestep ()
+{
+ list<pair<Grob*, Moment> >::iterator i = note_columns_.begin ();
+ while (i != note_columns_.end ())
+ {
+ if (i->second <= now_mom ())
+ i = note_columns_.erase (i);
+ else
+ i++;
+ }
+}
+
+#include "translator.icc"
+
+ADD_ACKNOWLEDGER (Rest_collision_engraver, note_column);
+ADD_TRANSLATOR (Rest_collision_engraver,
+ /* doc */
+ "Handle collisions of rests.",
+
+ /* create */
+ "RestCollision ",
+
+ /* read */
+ "",
+
+ /* write */
+ ""
+ );