* scripts/convert-ly.py (FatalConversionError.subst_in_trans):

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

diff --git a/input/regression/collision-heads.ly b/input/regression/collision-heads.ly
index 2b01470640f804974a94b8dc29cbd2df901ed261..8da3ef2c255de7789ad1860cc7ccf23f798f0aad 100644 (file)
--- a/input/regression/collision-heads.ly
+++ b/input/regression/collision-heads.ly
@@ -1,4 +1,4 @@
-\version "1.7.18"
+\version "2.1.22"
 \header {
     texidoc =
 
@@ -8,26 +8,24 @@ if the black note heads are from 8th or shorter notes.
 "
     
 }
-    \paper { raggedright= ##t }
 
+\paper { raggedright= ##t }
 
-\score { \notes \context Staff\relative c''<
-\context Voice = VA {
-    \voiceOne
-    c2 c8 c4.
-    
-    \property Staff.NoteCollision \override #'merge-differently-headed = ##t
-    c2
-    c8 c4.
-    c2
-}
-\context Voice = VB {
-    \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
+       }
+    >>
 }
-    >
-        }