X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fcollision-engraver.cc;h=a645f36f7efc70df4701790d5882172693b85de0;hb=5532801f30af2000fa4085e2e3853efe2f6b095b;hp=32dddc1d7ae36c91e3079b7c840856307c6e6b64;hpb=9e69cb84d6ee5b0a861cd97869b10e3bdf0c833c;p=lilypond.git diff --git a/lily/collision-engraver.cc b/lily/collision-engraver.cc index 32dddc1d7a..a645f36f7e 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--2006 Han-Wen Nienhuys + (c) 1997--2009 Han-Wen Nienhuys */ #include "engraver.hh" @@ -46,6 +46,9 @@ Collision_engraver::acknowledge_note_column (Grob_info i) if (Note_column::has_rests (i.grob ()) || i.grob ()->get_parent (X_AXIS)) return; + if (to_boolean (i.grob ()->get_property ("ignore-collision"))) + return; + note_columns_.push_back (i.grob ()); } } @@ -67,7 +70,16 @@ Collision_engraver::Collision_engraver () ADD_ACKNOWLEDGER (Collision_engraver, note_column); ADD_TRANSLATOR (Collision_engraver, - /* doc */ "Collect NoteColumns, and as soon as there are two or more, put them in a NoteCollision object.", - /* create */ "NoteCollision", - /* read */ "", - /* 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 */ + "" + );