*** empty log message ***

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

diff --git a/input/regression/collision-heads.ly b/input/regression/collision-heads.ly
index 545a31a978b2777fe25efba975fc5697db6b19fe..adb25053642eff1198a7bcbc4331c4c2c304c759 100644 (file)
--- a/input/regression/collision-heads.ly
+++ b/input/regression/collision-heads.ly
@@ -1,34 +1,29 @@
-#(ly:set-option 'old-relative)
-\version "1.9.4"
+\version "2.7.39"
 \header {
-    texidoc =
+  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 { ragged-right= ##t }
 
 
-\score { \notes \context Staff\relative c''<<
-\new Voice {
-    \voiceOne
+\context Staff  \relative c'' <<
+  {
     c2 c8 c4.
     
-    \property Staff.NoteCollision \override #'merge-differently-headed = ##t
-    c2
-    c8 c4.
-    c2
-}
-\new Voice {
-    \voiceTwo
-    c8 c4.
-    c2
-    c8 c4.
+    \override Staff.NoteCollision  #'merge-differently-headed = ##t
+    c2 c8 c4.
     c2
+  }\\
+  {
+    c8 c4. c2
+    
+    c8 c4. c2
     c4
-}
-    >>
-        }
+  }
+>>