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

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

diff --git a/input/regression/script-collision.ly b/input/regression/script-collision.ly
index b1f5d4ae01c944cfe249c1f6906fdd9279b697ad..3277be73ef7745fb04af3300042ba1ae318f809e 100644 (file)
--- a/input/regression/script-collision.ly
+++ b/input/regression/script-collision.ly
@@ -1,18 +1,20 @@
-\version "1.7.18"
+\version "2.12.0"
 
 \header {
 
-    texidoc = "Scripts are put on the utmost head, so they are
+  texidoc = "Scripts are put on the utmost head, so they are
       positioned correctly when there are collisions."
 }
 
-\score  {
-\notes \relative c'' {
+\layout { ragged-right = ##t}
+
+
+\relative c'' {
   c4
-  <<c d c'>>-\marcato
-  < \context Voice = VA { \voiceOne c4^^ }
-    \context Voice = VB { \voiceTwo d4_^} >
-    }
-\paper { raggedright = ##t}
-    }
+  <c d c'>\marcato
+  <<  { c4^^ }\\
+      { d4_^ } >>
+}
+
+