Merge commit 'origin' into includes

[lilypond.git] / input / regression / instrument-name.ly

diff --git a/input/regression/instrument-name.ly b/input/regression/instrument-name.ly
index 102ff1f26a91e71330192fbefbd9d6c3e5b9fd30..121dd420878248034059a6a4659e0daaeb804111 100644 (file)
--- a/input/regression/instrument-name.ly
+++ b/input/regression/instrument-name.ly
@@ -1,6 +1,6 @@
-\version "2.4.0"
+\version "2.12.0"
 \header{
-texidoc="
+  texidoc="
 Staff margins are also markings attached to barlines.  They should be
 left of the staff, and be centered vertically with respect to the staff.  
 They may be on normal staves, but also on compound staves, like the 
@@ -8,19 +8,29 @@ PianoStaff.
 "
 }
 
-       
+\layout {
+  ragged-right = ##t
+}
+
 
 
-\score {
 
-   \context PianoStaff <<
-    \context Staff = "treble"    {
-      \set PianoStaff.instrument = "Piano "
-      \set Staff.instrument = "Right " { c''4 }}
-    \context Staff = "bass" { \set Staff.instrument = "Left " \clef bass c4 }>>
 
-\layout {
-raggedright = ##t
-}}
 
+\new StaffGroup <<
+  \context PianoStaff <<
+    \new Staff    {
+      \set PianoStaff.instrumentName = "Piano"
+      \set Staff.instrumentName = "Right" { c''4 }}
+    \new Staff {
+      \set Staff.instrumentName = "Left"
+      \clef bass c4
+    }
+  >>
 
+  \lyrics {
+    \set vocalName = "bert"
+    blah
+  }
+  \new Staff { c''4 } 
+>>