Merge branch 'master' into dev/texi2html

[lilypond.git] / input / regression / multi-measure-rest-instr-name.ly

diff --git a/input/regression/multi-measure-rest-instr-name.ly b/input/regression/multi-measure-rest-instr-name.ly
index bb526c52e52b321ce8f5a2f516f2ea29c750c246..0def9abbd27c3c9398702e40bb756a014ad0e8cf 100644 (file)
--- a/input/regression/multi-measure-rest-instr-name.ly
+++ b/input/regression/multi-measure-rest-instr-name.ly
@@ -1,4 +1,4 @@
-\version "2.6.0"
+\version "2.11.51"
 \header {
 
   texidoc = "There are both long and short instrument names.
@@ -8,7 +8,7 @@ multimeasure rests. "
 }
 
 \layout {
-  raggedright = ##t
+  ragged-right = ##t
   \context {
     \Staff
     \consists Instrument_name_engraver
@@ -18,7 +18,7 @@ multimeasure rests. "
 
 
 \context Staff <<
-  \set Staff.instrument = "instrument"
-  \set Staff.instr = "instr"
+  \set Staff.instrumentName = "instrument"
+  \set Staff.shortInstrumentName = "instr"
   {c''1 \break R1 }
 >>