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 3590326fde50197360665195b105f886dc23ae6f..121dd420878248034059a6a4659e0daaeb804111 100644 (file)
--- a/input/regression/instrument-name.ly
+++ b/input/regression/instrument-name.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.12.0"
 \header{
   texidoc="
 Staff margins are also markings attached to barlines.  They should be
@@ -9,7 +9,7 @@ PianoStaff.
 }
 
 \layout {
-  raggedright = ##t
+  ragged-right = ##t
 }
 
 
@@ -17,17 +17,20 @@ PianoStaff.
 
 
 
+\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
+    }
+  >>
 
-\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
+  \lyrics {
+    \set vocalName = "bert"
+    blah
   }
+  \new Staff { c''4 } 
 >>
-
-
-
-