*/
#include "warn.hh"
-#include "rest-collision.hh"
#include "engraver.hh"
-#include "note-collision.hh"
+#include "rest-collision.hh"
#include "note-column.hh"
class Rest_collision_engraver : public Engraver
virtual void process_acknowledged_grobs ();
virtual void stop_translation_timestep ();
public:
- TRANSLATOR_DECLARATIONS(Rest_collision_engraver);
+ TRANSLATOR_DECLARATIONS (Rest_collision_engraver);
};
-
-
Rest_collision_engraver::Rest_collision_engraver ()
{
rest_collision_ =0;
{
if (rest_collision_
|| note_columns_.is_empty ()
- || !rest_count_)
+ || !rest_count_
+ || (note_columns_.size () == rest_count_
+ && rest_count_ < 2))
return;
- rest_collision_ = make_item ("RestCollision");
+ rest_collision_ = make_item ("RestCollision", SCM_EOL);
- announce_grob(rest_collision_, SCM_EOL);
+
for (int i=0; i < note_columns_.size (); i++)
Rest_collision::add_column (rest_collision_,note_columns_[i]);
}
rest_count_ = 0;
}
-ENTER_DESCRIPTION(Rest_collision_engraver,
+ENTER_DESCRIPTION (Rest_collision_engraver,
/* descr */ "Handles collisions of rests.",
/* creats*/ "RestCollision",
/* accepts */ "",