Merge branch 'cvs-head' of ssh+git://hanwen@repo.or.cz/srv/git/lilypond into master...

[lilypond.git] / input / regression / instrument-name-markup.ly

diff --git a/input/regression/instrument-name-markup.ly b/input/regression/instrument-name-markup.ly
index 02c88df0893177f69bde98308381ce3281e9cdd2..f85066b599abe0b0cd28becef039aafb459edfe1 100644 (file)
--- a/input/regression/instrument-name-markup.ly
+++ b/input/regression/instrument-name-markup.ly
@@ -1,27 +1,23 @@
 \header {
 
   texidoc = "Instrument names are set with @code{Staff.instrument} and
-
-\layout { raggedright = ##t }
-
 @code{Staff.instr}. You can enter markup texts to create more funky names,
 including alterations. "
 
 }
 
 
-\version "2.6.0"
+\layout { ragged-right = ##t }
 
+\version "2.9.13"
 
 textFlat = \markup {\smaller \flat}
 
-
 \new Staff {
-  \set Staff.instrument = \markup { \column { "Clarinetti" \line { "in B" \textFlat } } }
-  \set Staff.instr = \markup { \smaller  { "Cl(B" \textFlat ")" } }
+  \set Staff.instrumentName = \markup { \column { "Clarinetti" \line { "in B" \textFlat } } }
+  \set Staff.shortInstrumentName = \markup { \smaller  { "Cl(B" \textFlat ")" } }
 
   { c''1 \break c'' }
-
 }