Merge branch 'master' into dev/texi2html

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

diff --git a/input/regression/slur-cross-staff.ly b/input/regression/slur-cross-staff.ly
index bb0e95d7b35cf4543a730846d8b0df5b2ab1955d..76088ea6341735de7805d729baab56f776ae8bae 100644 (file)
--- a/input/regression/slur-cross-staff.ly
+++ b/input/regression/slur-cross-staff.ly
@@ -1,50 +1,50 @@
 
-\version "2.4.0"
+\version "2.11.51"
 \header{
-texidoc="
+  texidoc="
 Slurs behave decently when broken across a linebreak.
 "
 }
 
-       
-\score{
-       \context PianoStaff <<
-       \context Staff = "one" \relative c'{
-               \stemUp \slurUp
-                c4( c \change Staff=two c  c) |
-               \change Staff=one
-               \stemUp \slurUp
-                c4( c \change Staff=two c  c) |
-               \stemUp \slurUp
-                c4( c \change Staff=one c  c) |
-               \change Staff=two
-               \stemUp \slurUp
-                c4( c \change Staff=one c  c) |
-               \change Staff=two
-               \stemUp \slurUp
-                c4( \change Staff=one c c  c) |
-               r2
-               \change Staff=two
-               \stemUp \slurUp
-                c4( \change Staff=one c
-                  \break
-               c  c)
-               r2
-%              \stemDown \slurDown
-%               c4( \change Staff=two c c \change Staff=one  c)
-               \stemDown \slurDown
-                d4( \change Staff=two c c \change Staff=one  d)
-               \change Staff=two
-               \stemUp \slurUp
-                c4( \change Staff=one c c \change Staff=two  c)
-               r1
-       }
-       \context Staff = "two" \relative c'{
-               \clef bass
-               s1 s1 s1 s1 s1 s1 s1 s1 s1 s1
-       }
-       >>
-}
+
+
+\context PianoStaff <<
+  \new Staff = "one" \relative c'{
+    \stemUp \slurUp
+    c4( c \change Staff=two c  c) |
+    \change Staff=one
+    \stemUp \slurUp
+    c4( c \change Staff=two c  c) |
+    \stemUp \slurUp
+    c4( c \change Staff=one c  c) |
+    \change Staff=two
+    \stemUp \slurUp
+    c4( c \change Staff=one c  c) |
+    \change Staff=two
+    \stemUp \slurUp
+    c4( \change Staff=one c c  c) |
+    r2
+    \change Staff=two
+    \stemUp \slurUp
+    c4( \change Staff=one c
+    \break
+    c  c)
+    r2
+    %%         \stemDown \slurDown
+    %%          c4( \change Staff=two c c \change Staff=one  c)
+    \stemDown \slurDown
+    d4( \change Staff=two c c \change Staff=one  d)
+    \change Staff=two
+    \stemUp \slurUp
+    c4( \change Staff=one c c \change Staff=two  c)
+    r1
+  }
+  \new Staff = "two" \relative c'{
+    \clef bass
+    s1 s1 s1 s1 s1 s1 s1 s1 s1 s1
+  }
+>>
+