support ignore-collision to suppress clashing notecolumns message.

diff --git a/lily/collision-engraver.cc b/lily/collision-engraver.cc
index 32dddc1d7ae36c91e3079b7c840856307c6e6b64..43974170de67bc891f073feb2b46ff7fd3e6745f 100644 (file)
--- a/lily/collision-engraver.cc
+++ b/lily/collision-engraver.cc
@@ -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 ());
     }
 }

diff --git a/lily/note-collision.cc b/lily/note-collision.cc
index 2fa8ce48814fb6ab00249a53213a7c2bead23a55..ec79a41e3c67b49bf854f77c764d7755f928e762 100644 (file)
--- a/lily/note-collision.cc
+++ b/lily/note-collision.cc
@@ -553,6 +553,7 @@ ADD_INTERFACE (Note_collision_interface,
               "@code{force-hshift} and @code{horizontal-shift}.",
 
               /* properties */
+              "ignore-collision "
               "merge-differently-dotted "
               "merge-differently-headed "
               "positioning-done ");

diff --git a/scm/define-grob-properties.scm b/scm/define-grob-properties.scm
index d0364bf4959f2284b2d0cad5d829ecba4e441443..7fe48c14c5326fd71c76722d2fe33a611f092d13 100644 (file)
--- a/scm/define-grob-properties.scm
+++ b/scm/define-grob-properties.scm
@@ -201,6 +201,7 @@ of note-column for horizontal shifting. This is used by
      (avoid-slur ,symbol? "Method of handling slur collisions.
 Choices are @code{around}, @code{inside}, @code{outside}.  If unset, script
 and slur ignore eachother.")
+     (ignore-collision ,boolean? "If set, don't do note collision resolution on this NoteColumn.")
      (inspect-quants ,number-pair? "If debugging is set,
 set beam/slur quant to this position, and print the respective scores.")
      (inspect-index ,integer? "If debugging is set,