Merge branch 'master' of ssh+git://gpercival@git.sv.gnu.org/srv/git/lilypond

[lilypond.git] / input / test / instrument-name-grandstaff.ly

diff --git a/input/test/instrument-name-grandstaff.ly b/input/test/instrument-name-grandstaff.ly
index f5cafed39e182a02fd243b8c87349f31b6339c4a..ee6d86b56a10c2dbb91c34140f0bf6a4c3edde5a 100644 (file)
--- a/input/test/instrument-name-grandstaff.ly
+++ b/input/test/instrument-name-grandstaff.ly
@@ -1,19 +1,19 @@
-\version "2.3.17"
+\version "2.10.0"
 \header { texidoc = "@cindex Instrument Name Grandstaff
 You can have a name for the whole @code{GrandStaff} in addition to 
 individual @code{Staff}s. " }
 
 \score {
   
-   \context GrandStaff <<
-    \context Staff = treble    {
-      \set GrandStaff.instrument = "Violini  "
-      \set Staff.instrument = " vn I" { c''4 }}
-    \context Staff = bass { \set Staff.instrument = " vn II" c''4 }>>
+   \new GrandStaff <<
+    \new Staff =  "treble"    {
+      \set GrandStaff.instrumentName = "Violini  "
+      \set Staff.instrumentName = " vn I" { c''4 }}
+    \new Staff =  "bass" { \set Staff.instrumentName = " vn II" c''4 }>>
 
 
-\paper {
-raggedright = ##t
+\layout {
+ragged-right = ##t
 \context { \GrandStaff \consists "Instrument_name_engraver" }
 }}