* lily/book.cc:

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

diff --git a/input/regression/collision-heads.ly b/input/regression/collision-heads.ly
index 3f295d71d28901cdc864a01b2877e6fcde141473..1196af6019b475a55280028284be446224156922 100644 (file)
--- a/input/regression/collision-heads.ly
+++ b/input/regression/collision-heads.ly
@@ -1,34 +1,31 @@
-#(ly:set-option 'old-relative)
-\version "1.9.8"
+\version "2.4.0"
 \header {
     texidoc =
 
-    "If @code{merge-differently-headed}, then
+    "If @code{merge-differently-headed} is enabled, then
 open note heads may be merged with black noteheads, but only
 if the black note heads are from 8th or shorter notes.
 "
     
 }
-    \paper { raggedright= ##t }
 
+\layout { raggedright= ##t }
 
-\score { \notes \context Staff\relative c''<<
-\new Voice {
-    \voiceOne
-    c2 c8 c4.
-    
-    \property Staff.NoteCollision \override #'merge-differently-headed = ##t
-    c2
-    c8 c4.
-    c2
-}
-\new Voice {
-    \voiceTwo
-    c8 c4.
-    c2
-    c8 c4.
-    c2
-    c4
-}
+
+\score {
+    \context Staff  \relative c'' <<
+       {
+           c2 c8 c4.
+           
+           \override Staff.NoteCollision  #'merge-differently-headed = ##t
+           c2 c8 c4.
+           c2
+       }\\
+       {
+           c8 c4. c2
+           
+           c8 c4. c2
+           c4
+       }
     >>
-        }
+}