X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fregression%2Finstrument-name.ly;h=7f31123fc9f7b2d3e839df5afc775d29203a34e6;hb=95795b10a644627068df3f1ca668e6ddb3007a30;hp=1529624e7ef3363ff6da3218d1ecc011ddb35996;hpb=3db08de4502e30616808fc348b054d32822e5cc4;p=lilypond.git

diff --git a/input/regression/instrument-name.ly b/input/regression/instrument-name.ly
index 1529624e7e..7f31123fc9 100644
--- a/input/regression/instrument-name.ly
+++ b/input/regression/instrument-name.ly
@@ -1,25 +1,36 @@
-\version "1.7.18"
+\version "2.14.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 } 
+>>