Merge with git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond.git

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

diff --git a/input/regression/script-collision.ly b/input/regression/script-collision.ly
index 8149ba0d8f6e0caa9af94419629bf6908f3959b5..e73e03b7330ac1727d61761f51a8a166a007ad52 100644 (file)
--- a/input/regression/script-collision.ly
+++ b/input/regression/script-collision.ly
@@ -1,17 +1,20 @@
-\version "1.5.68"
+\version "2.10.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 { linewidth = -1. }
-    }
+  <c d c'>\marcato
+  <<  { c4^^ }\\
+      { d4_^ } >>
+}
+
+
+