Merge branch 'master' into dev/texi2html

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

diff --git a/input/regression/instrument-name.ly b/input/regression/instrument-name.ly
index fbe6310d1e962d6056401ca9b3b7cd8b1e3f3d7c..c48478f877146414837078abe4e096b10c6b79d8 100644 (file)
--- a/input/regression/instrument-name.ly
+++ b/input/regression/instrument-name.ly
@@ -1,6 +1,6 @@
-\version "2.1.22"
+\version "2.11.51"
 \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 {
 
-  \notes \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 }>>
 
-\paper {
-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 } 
+>>