X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fregression%2Finstrument-name.ly;h=313b37c01c205ef3ed498c15a54671ff721a0cde;hb=f5b3d5c2d4181615c3e50671e9827c712ca3ccb8;hp=fcc76cf287721a451a0d743cd156ea471b3aa793;hpb=e9bd265943d37689b1a6892217cb6f67bbe69f73;p=lilypond.git

diff --git a/input/regression/instrument-name.ly b/input/regression/instrument-name.ly
index fcc76cf287..313b37c01c 100644
--- a/input/regression/instrument-name.ly
+++ b/input/regression/instrument-name.ly
@@ -1,25 +1,36 @@
-\version "1.9.1"
+\version "2.10.0"
 \header{
-texidoc="
+  texidoc="
 Staff margins are also markings attached to barlines.  They should be
-left of the staff, and be centered vertically wrt the staff.  They may
-be on normal staves, but also on compound staves, like the PianoStaff.
+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 
+PianoStaff.
 "
 }
 
-	
+\layout {
+  ragged-right = ##t
+}
+
 
 
-\score {
 
-  \notes \context PianoStaff <
-    \context Staff = treble    {
-      \property PianoStaff.instrument = "Piano "
-      \property Staff.instrument = "Right " { c''4 }}
-    \context Staff = bass { \property 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 } 
+>>