X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fregression%2Fmulti-measure-rest-instr-name.ly;h=498da491619a8ea098771de4d94e46ec3fc0677f;hb=38d60f8d090d915c34f5d4e6361bf86e75858f0d;hp=a5f42865e32a26533fd5e38c3ed77ed731684bf7;hpb=3684e949054183e4a31e17f5e7ab0bf30da0123e;p=lilypond.git

diff --git a/input/regression/multi-measure-rest-instr-name.ly b/input/regression/multi-measure-rest-instr-name.ly
index a5f42865e3..498da49161 100644
--- a/input/regression/multi-measure-rest-instr-name.ly
+++ b/input/regression/multi-measure-rest-instr-name.ly
@@ -1,27 +1,24 @@
-\version "2.2.0"
+\version "2.16.0"
 \header {
 
-    texidoc = "There are both long and short instrument names.
+  texidoc = "There are both long and short instrument names.
 Engraving instrument names should not be confused by the
 multimeasure rests. "
 
 }
 
-\score{
-    \context Staff <<
-	\set Staff.instrument = "instrument"
-	\set Staff.instr = "instr"
-	\notes{c''1 \break R1 }
-    >>
-    \paper {
-	raggedright = ##t
-	\context {
-	    \StaffContext
-	    \consists Instrument_name_engraver
+\layout {
+  ragged-right = ##t
+  \context {
+    \Staff
+    \consists "Instrument_name_engraver"
 
-	}
-    }
+  }
 }
 
 
-
+\context Staff <<
+  \set Staff.instrumentName = "instrument"
+  \set Staff.shortInstrumentName = "instr"
+  {c''1 \break R1 }
+>>