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 574917e51cd963c73c2747c72c6f46ef4450f631..ebc783ee24bf1e47237f02379a507fa31e30040d 100644 (file)
--- a/input/regression/hara-kiri-pianostaff.ly
+++ b/input/regression/hara-kiri-pianostaff.ly
@@ -1,21 +1,36 @@
-\version "1.7.19"
-\header {
-texidoc = "Hara kiri should not upset fixed distance alignment like in pianostaff. In this example the middle of 3 staves is harakiried."
+\version "2.11.51"
+
+\header { texidoc =
+
+         " 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 does not happen in practice.)
+
+Any staff brackets and braces are removed, both in the single staff
+and no staff case.
+
+This example was done with a pianostaff, which has fixed distance
+alignment; this should not confuse the mechanism.
+"
+         
 }
-    \paper { raggedright= ##t }
-
-       
-\score { \notes \transpose c c''
- \context PianoStaff <
-   \context Staff = up {  c c c c \break }
-   \context Staff = mid {  s1 \break }
-   \context Staff = down {  c4 c c c \break }
- >
- \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 }
+>>
+
+