Merge commit 'origin' into includes

[lilypond.git] / input / new / suppressing-warnings-for-clashing-note-columns.ly

diff --git a/input/new/suppressing-warnings-for-clashing-note-columns.ly b/input/new/suppressing-warnings-for-clashing-note-columns.ly
index ed3b97f1c9bb801c5f05a07001b07868da3e5dd6..5dbf28df0d15eddc30a0fd7e6a788212d3207cf1 100644 (file)
--- a/input/new/suppressing-warnings-for-clashing-note-columns.ly
+++ b/input/new/suppressing-warnings-for-clashing-note-columns.ly
@@ -1,4 +1,4 @@
-\version "2.11.49"
+\version "2.12.0"
 \header {
   lsrtags = "simultaneous-notes,tweaks-and-overrides"
   texidoc = "
@@ -13,9 +13,13 @@ to @code{#t}.
   doctitle = "Suppressing warnings for clashing note columns"
 }
 
-ignore = \once \override NoteColumn #'ignore-collision = ##t
+ignore = \override NoteColumn #'ignore-collision = ##t
 
-\relative c' <<
-  { \oneVoice \stemDown f2\glissando \stemNeutral a } \\
-  { \oneVoice \ignore c2\glissando \ignore d, }
->>
+\relative c' {
+  <<
+    \ignore
+    { \stemDown f2 g }
+    \\
+    { c2 c, }
+  >>
+}