resolve merge

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

diff --git a/input/regression/hara-kiri-percent-repeat.ly b/input/regression/hara-kiri-percent-repeat.ly
index d1ce10f1cddbc3ceb737057f354c877e961d38c5..e0975e1e2cd76dfce45b9e1340444b1f8366b9c0 100644 (file)
--- a/input/regression/hara-kiri-percent-repeat.ly
+++ b/input/regression/hara-kiri-percent-repeat.ly
@@ -1,16 +1,21 @@
+\version "2.14.0"
+
 \header {
-  texidoc = "Staves with percent repeats are not killed."
+  texidoc = "Staves, RhythmicStaves, TabStaves and DrumStaves
+  with percent repeats are not suppressed."
 }
 
-\version "2.12.0"
-
 <<
- \new Staff { c''1 c'' \break c'' c'' }
- \new Staff \repeat percent 4 { c'1 }
->>                          
+  \new Staff { c''1 c'' \break c'' c'' }
+  \new Staff \repeat percent 4 { c'1 }
+  \new TabStaff \repeat  percent 4 { c1 }
+  \new DrumStaff \drummode { \repeat percent 4 { hh1 } }
+  \new RhythmicStaff \repeat percent 4 { c'1 }
+>>
 
 \layout {
- \context {
-   \RemoveEmptyStaffContext
- }
+  \context { \Staff \RemoveEmptyStaves }
+  \context { \RhythmicStaff \RemoveEmptyStaves }
+  \context { \DrumStaff \RemoveEmptyStaves }
+  \context { \TabStaff \RemoveEmptyStaves }
 }