X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fcollision-engraver.cc;h=d3eba9978dad3fdb5ac7d671f18428dd351b167e;hb=e24df7c27635dc996c466295eacf2981bddccaf7;hp=2a0b1dea2fd4f1cffbdaa34be3f2d9f032665246;hpb=947454c5cc430a9627262de4f25274a64789d3c2;p=lilypond.git diff --git a/lily/collision-engraver.cc b/lily/collision-engraver.cc index 2a0b1dea2f..d3eba9978d 100644 --- a/lily/collision-engraver.cc +++ b/lily/collision-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2004 Han-Wen Nienhuys + (c) 1997--2005 Han-Wen Nienhuys */ #include "note-column.hh" @@ -12,9 +12,6 @@ #include "engraver.hh" #include "axis-group-interface.hh" -/* - collect Note_column, and as soon as there are 2 or more, put them in - a collision object. */ class Collision_engraver : public Engraver { Item * col_; @@ -36,11 +33,11 @@ Collision_engraver::process_acknowledged_grobs () return ; if (!col_) { - col_ = make_item ("NoteCollision"); - announce_grob (col_, SCM_EOL); + col_ = make_item ("NoteCollision", SCM_EOL); + } - for (int i=0; i< note_columns_.size (); i++) + for (int i = 0; i< note_columns_.size (); i++) Note_collision_interface::add_column (col_,note_columns_[i]); } @@ -60,24 +57,20 @@ Collision_engraver::acknowledge_grob (Grob_info i) void Collision_engraver::stop_translation_timestep () { - if (col_) - { - typeset_grob (col_); - col_ =0; - } + col_ = 0; note_columns_.clear (); } Collision_engraver::Collision_engraver () { - col_ =0; + col_ = 0; } -ENTER_DESCRIPTION (Collision_engraver, -/* descr */ "", +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",