X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fregression%2Fmulti-measure-rest-instr-name.ly;h=498da491619a8ea098771de4d94e46ec3fc0677f;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=7e75fccaff48a9f6eb2b477d8e72c8b4d257f0b4;hpb=4c8187e65dd9708d7733692842acc696da121bf1;p=lilypond.git

diff --git a/input/regression/multi-measure-rest-instr-name.ly b/input/regression/multi-measure-rest-instr-name.ly
index 7e75fccaff..498da49161 100644
--- a/input/regression/multi-measure-rest-instr-name.ly
+++ b/input/regression/multi-measure-rest-instr-name.ly
@@ -1,20 +1,24 @@
-\version "2.1.7"
-\header { texidoc = "This combines instrument names and multimeasure rests (there was an
-interesting bug in 1.3.98). " }
+\version "2.16.0"
+\header {
 
-\score{
-	\context Staff <<
-	      \property Staff.instrument = "instrument"
-	      \property Staff.instr = "instr"
-	      \notes{c''1 \break R1 }
-	    >>
-	 \paper {
-	    \translator { \StaffContext
-	    \consists Instrument_name_engraver
+  texidoc = "There are both long and short instrument names.
+Engraving instrument names should not be confused by the
+multimeasure rests. "
 
-	    }
-	  }
-	\paper { raggedright =  ##t }
-	}
+}
 
+\layout {
+  ragged-right = ##t
+  \context {
+    \Staff
+    \consists "Instrument_name_engraver"
 
+  }
+}
+
+
+\context Staff <<
+  \set Staff.instrumentName = "instrument"
+  \set Staff.shortInstrumentName = "instr"
+  {c''1 \break R1 }
+>>