Merge branch 'master' into dev/texi2html

[lilypond.git] / input / regression / hara-kiri-pianostaff.ly

diff --git a/input/regression/hara-kiri-pianostaff.ly b/input/regression/hara-kiri-pianostaff.ly
index 6ac1a71b430843ca7de527e2f7f11c99dc074045..ebc783ee24bf1e47237f02379a507fa31e30040d 100644 (file)
--- a/input/regression/hara-kiri-pianostaff.ly
+++ b/input/regression/hara-kiri-pianostaff.ly
@@ -1,13 +1,13 @@
-\version "1.7.19"
+\version "2.11.51"
 
 \header { texidoc =
 
-         " Hara kiri staves kill themselves if they are empty.  This
+         " Hara-kiri staves kill themselves if they are empty.  This
 example really contains three staves, but as they progress, empty ones
 are removed: this example has three staves, but some of them
 disappear: note how the 2nd line only has the bar number 2. (That the
 bar number is printed might be considered a bug, however, the scenario
-of all staves disappearing doesn't happen in practice.)
+of all staves disappearing does not happen in practice.)
 
 Any staff brackets and braces are removed, both in the single staff
 and no staff case.
@@ -18,20 +18,19 @@ alignment; this should not confuse the mechanism.
          
 }
 
-\paper { raggedright= ##t }
-
-       
-\score { \notes \transpose c c''
- \context PianoStaff <
-   \context Staff = up {  c4 c c c \break  s1 \break c4 c c c \break c c c c}
-   \context Staff = mid {  d4 d d d s1 s1 s1 s1 }
-   \context Staff = down {  e4 e e e s1 e4 e e e s1 }
- >
- \paper {
-  \translator {
-   \RemoveEmptyStaffContext
+\layout {
+  ragged-right= ##t
+  \context {
+    \RemoveEmptyStaffContext
   }
- }
 }
 
+\transpose c c''
+\context PianoStaff <<
+  \new Staff {  c4 c c c \break s1 \break c4 c c c \break c c c c}
+  \new Staff {  d4 d d d        s1        s1              s1 }
+  \new Staff {  e4 e e e        s1        e4 e e e        s1 }
+>>
+
+