The grand \paper -> \layout, \bookpaper -> \paper renaming.

[lilypond.git] / input / test / staff-bracket.ly

diff --git a/input/test/staff-bracket.ly b/input/test/staff-bracket.ly
index 8b57de1966bb24a47720fc3d9c980fefbdb7e245..9c6a256088c65f4a9130dd8bd8e2954245bc8885 100644 (file)
--- a/input/test/staff-bracket.ly
+++ b/input/test/staff-bracket.ly
@@ -1,27 +1,45 @@
-#(ly:set-option 'old-relative)
-\version "1.9.1"
+\version "2.3.22" 
 
-\header{texidoc = "@cindex Staff Bracket
-Here's an example of staff brackets. "
+\header{ texidoc="@cindex Nested Staff Groups
+Staffs can be nested in various combinations. Here, @code{StaffGroup}
+and @code{ChoirStaff} produce similar straight brackets, whereas 
+@code{GrandStaff} produces curly brackets. In @code{InnerStaffGroup} 
+and @code{InnerChoirStaff}, the brackets are shifted leftwards.
+
+"
 }
 
-\score
-{
-  \context StaffGroup = "a" \notes \relative c'' <
-      \context Staff = "a" {  b1 }
-    \context PianoStaff = "b" <
-      \context Staff = "c" \notes { b1 }
-      \context Staff = "d" \notes { b1 }
-    > 
-  >
+\score { 
+<<
+  \new StaffGroup << 
+  \new Staff {c' d' e' f'}
+  \new InnerStaffGroup <<
+   \new Staff {c' d' e' f'}
+   \new GrandStaff <<
+     \new Staff {c' d' e' f'}
+     \new Staff {c' d' e' f'}
+   >>
+  \new Staff {c' d' e' f'}
+  >>
+  \new ChoirStaff <<
+   \new Staff {c' d' e' f'}
+    \new InnerStaffGroup <<
+     \new Staff {c' d' e' f'}
+    >>
+   \new Staff {c' d' e' f'}
+  >>
+  >>
+  \new ChoirStaff << 
+   \new Staff {c' d' e' f'}
+   \new InnerChoirStaff <<
+    \new Staff {c' d' e' f'}
+    \new Staff {c' d' e' f'}
+   >>
+   \new Staff {c' d' e' f'}
+  >>
+
+>>
 
-  \paper {
-    \translator
-    {
-      \StaffContext
-      \consists Instrument_name_engraver
-    }
-    raggedright=##t
-  }
+ \layout { raggedright = ##t}
 }