Merge commit 'origin' into includes

[lilypond.git] / input / regression / beam-cross-staff.ly

diff --git a/input/regression/beam-cross-staff.ly b/input/regression/beam-cross-staff.ly
index 00a13bb8a7eeba4fa181ecc9d8867db47d86ea4a..0b711c7453f0f103f6b1d5af8f9a9f6f6216d36e 100644 (file)
--- a/input/regression/beam-cross-staff.ly
+++ b/input/regression/beam-cross-staff.ly
@@ -1,34 +1,33 @@
-#(ly:set-option 'old-relative)
-\version "1.9.1"
+
+\version "2.12.0"
 \header{
 texidoc="
 Beams can be typeset over fixed distance aligned staves, beam
-beautification doesn't really work, but knees do. Beams should be
+beautification does not really work, but knees do. Beams should be
 behave well, wherever the switching point is.
 "
 }
-\score{
-       \context PianoStaff <
-       \context Staff=one \notes\relative c'{
-               \stemUp  c8[ c \translator Staff=two \stemUp c c]
-                c[ c c c]
-               \translator Staff=one
-               \stemDown  c8[ c \translator Staff=two \stemUp c c]
-               r2
-               \stemDown  c8[ c \translator Staff=one \stemDown c c]
-               r2
-               \translator Staff=two
-               \stemUp  c8[ c \translator Staff=one \stemDown c c]
-               r2
-       }
-       \context Staff=two \notes\relative c'{
-               \clef bass
-               s1
-               s1
-               s1
-               s1
-       }
-       >
-}
+
+\context PianoStaff <<
+  \new Staff = "one" \relative c'{
+    \stemUp  c8[ c \change Staff=two \stemUp c c]
+    c[ c c c]
+    \change Staff=one
+    \stemDown  c8[ c \change Staff=two \stemUp c c]
+    r2
+    \stemDown  c8[ c \change Staff=one \stemDown c c]
+    r2
+    \change Staff=two
+    \stemUp  c8[ c \change Staff=one \stemDown c c]
+    r2
+  }
+  \new Staff = "two" \relative c'{
+    \clef bass
+    s1
+    s1
+    s1
+    s1
+  }
+>>