From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Wed, 27 Feb 2008 03:36:15 +0000 (-0300)
Subject: move ignore-collision to note-column-interface
X-Git-Tag: release/2.11.42-1~14
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=2f395cc996e1aa8903d4285a63a02f26d9fe7966;p=lilypond.git

move ignore-collision to note-column-interface
---

diff --git a/lily/note-collision.cc b/lily/note-collision.cc
index 8ee404cb06..5ba8fe4872 100644
--- a/lily/note-collision.cc
+++ b/lily/note-collision.cc
@@ -575,7 +575,6 @@ 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/lily/note-column.cc b/lily/note-column.cc
index 68075fc250..e1a8e695fd 100644
--- a/lily/note-column.cc
+++ b/lily/note-column.cc
@@ -216,6 +216,7 @@ ADD_INTERFACE (Note_column,
 	       "arpeggio "
 	       "force-hshift "
 	       "horizontal-shift "
+	       "ignore-collision "
 	       "note-heads "
 	       "rest "
 	       "rest-collision "