*** 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 0db80feee4123dfc8a19fc91de371b0014cf80f5..6f882df22169c44a88d5b5cfe8ec440fe4443509 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.2"
+\version "2.1.28"
 \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 }
 
+\paper { 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 \notes \relative c'' <<
+       {
+           c2 c8 c4.
+           
+           \override Staff.NoteCollision  #'merge-differently-headed = ##t
+           c2 c8 c4.
+           c2
+       }\\
+       {
+           c8 c4. c2
+           
+           c8 c4. c2
+           c4
+       }
+    >>
 }
-    >
-        }