Merge branch 'master' into dev/texi2html

[lilypond.git] / input / regression / grace-staff-length.ly

diff --git a/input/regression/grace-staff-length.ly b/input/regression/grace-staff-length.ly
index 9c7890f21bb7d8d337ab7960c10748fab162ae2c..1b85382075e70c31d20f232e5f148948bd9db2d7 100644 (file)
--- a/input/regression/grace-staff-length.ly
+++ b/input/regression/grace-staff-length.ly
@@ -1,24 +1,24 @@
-\version "1.7.18"
+\version "2.11.51"
 \header{
-texidoc = "Stripped version of trip.ly.  Staffs should be of correct length."
+  texidoc = "Stripped version of trip.ly.  Staves should be of correct length."
 }
 
-    \paper { raggedright= ##t }
+\layout { ragged-right= ##t }
 
-\score{
-  \context PianoStaff \notes \relative c'' <
-    \context Staff = treble {
-       r1
-       r1
-       \bar "|."
-    }
-    \context Staff = bass {
-      r1
-      \context Staff {
-       \grace { c16 } c1
-      }
+
+\context PianoStaff  \relative c'' <<
+  \new Staff {
+    r1
+    r1
+    \bar "|."
+  }
+  \new Staff {
+    r1
+    \context Staff {
+      \grace { c16 } c1
     }
-  > 
-  \paper { }
-}
+  }
+>> 
+\layout { }
+