Merge commit 'origin/dev/jneeman' into systems-per-page

[lilypond.git] / input / regression / collision-heads.ly

diff --git a/input/regression/collision-heads.ly b/input/regression/collision-heads.ly
index 5cad99b20249e49b6e23c237e38edd1e290b58a3..11387aecf33893a8366b58a039097f31e54cf444 100644 (file)
--- a/input/regression/collision-heads.ly
+++ b/input/regression/collision-heads.ly
@@ -1,31 +1,18 @@
-\version "2.1.7"
+\version "2.12.0"
 \header {
-    texidoc =
-
-    "If @code{merge-differently-headed}, then
-open note heads may be merged with black noteheads, but only
-if the black note heads are from 8th or shorter notes.
-"
-    
+  texidoc =
+  "Open and black note heads are not merged by default."
+  
 }
-    \paper { raggedright= ##t }
+
+\layout { ragged-right= ##t }
 
 
-\score { \notes \context Staff\relative c''<<
- {
+\context Staff  \relative c'' <<
+  {
     c2 c8 c4.
-    
-    \property Staff.NoteCollision \override #'merge-differently-headed = ##t
-    c2
-    c8 c4.
-    c2
-}\\
- {
-    c8 c4.
-    c2
-    c8 c4.
-    c2
-    c4
-}
-    >>
-        }
+  }\\
+  {
+    c8 c4. c2
+  }
+>>