X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fregression%2Finstrument-name.ly;h=0ecb8be56798a4fb0b4dd6e0d87734ef733a08a8;hb=74daefdc62920b729061cb8711b63890de1f0c17;hp=456da021753181a2ed148b25a2986ecee71a9b2f;hpb=d2e7425b88e579fe53989106965fa13eab551c92;p=lilypond.git

diff --git a/input/regression/instrument-name.ly b/input/regression/instrument-name.ly
index 456da02175..0ecb8be567 100644
--- a/input/regression/instrument-name.ly
+++ b/input/regression/instrument-name.ly
@@ -1,25 +1,36 @@
-\version "1.9.8"
+\version "2.16.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 } 
+>>