From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Mon, 18 Dec 2006 11:27:20 +0000 (+0100)
Subject: support ignore-collision to suppress clashing notecolumns message.
X-Git-Tag: release/2.11.3-1~13
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=56c81607f1ab4ad3d0392387054ce87918d42c67;p=lilypond.git

support ignore-collision to suppress clashing notecolumns message.
---

diff --git a/lily/collision-engraver.cc b/lily/collision-engraver.cc
index 32dddc1d7a..43974170de 100644
--- 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 2fa8ce4881..ec79a41e3c 100644
--- 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 d0364bf495..7fe48c14c5 100644
--- 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,