Merge master into nested-bookparts

[lilypond.git] / input / new / volta-multi-staff.ly

diff --git a/input/new/volta-multi-staff.ly b/input/new/volta-multi-staff.ly
index e04c46fd0db55abac32b4b489d8ae2f881616655..4b0f121a268c8a95c3e21bc3afbb3ced7aee93e2 100644 (file)
--- a/input/new/volta-multi-staff.ly
+++ b/input/new/volta-multi-staff.ly
@@ -1,24 +1,30 @@
-\version "2.11.36"
-\layout { ragged-right= ##t }
+\version "2.11.61"
 \header {
   lsrtags = "repeats,staff-notation"
-  texidoc = "By adding @code{Volta_engraver}, repeat brackets
-can be put over staves other than the topmost one in a score."
+  texidoc = "By adding the @code{Volta_engraver} to the relevant
+staff, volte can be put over staves other than the topmost
+one in a score."
   doctitle = "Volta multi-staff"
 }
 
-vmus = \relative c'' {
-  \repeat volta 2 c1 \alternative { d e } 
-} 
+voltaMusic = \relative c'' {
+  \repeat volta 2 {
+    c1
+  }
+  \alternative {
+    d1
+    e
+  }
+}
 
 <<
   \new StaffGroup <<
-    \context Staff \vmus
-    \new Staff \vmus
+    \new Staff \voltaMusic
+    \new Staff \voltaMusic
   >>
   \new StaffGroup <<
-    \new Staff \with { \consists Volta_engraver }
-      \vmus
-    \new Staff \vmus
+    \new Staff \with { \consists "Volta_engraver" }
+      \voltaMusic
+    \new Staff \voltaMusic
   >>
 >>