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

[lilypond.git] / input / regression / bar-scripts.ly

diff --git a/input/regression/bar-scripts.ly b/input/regression/bar-scripts.ly
index 07e29185a480afb2eb5a3eef8cb880d52880d9d1..20878be02ee7437515e9de4292d7fe36e2a7efe6 100644 (file)
--- a/input/regression/bar-scripts.ly
+++ b/input/regression/bar-scripts.ly
@@ -1,4 +1,4 @@
-\version "2.6.0"
+\version "2.10.0"
 \header{
 texidoc="
 
@@ -6,11 +6,11 @@ Markings can be attached to (invisible) barlines.
 "
 }
 
-\layout { raggedright = ##t }
+\layout { ragged-right = ##t }
 
 onestaff = \new Staff\relative c''  {
-       \set Staff.instr = instr
-       \set Staff.instrument = instrument \mark "B"
+       \set Staff.shortInstrumentName = instr
+       \set Staff.instrumentName = instrument \mark "B"
         c1 \mark "A" \break c2  c2 \break
 }
 
@@ -18,7 +18,7 @@ grstaff =  \relative c''
 \context GrandStaff <<
        \new Staff {
 
-       \set Staff.instr = instr
+       \set Staff.shortInstrumentName = instr
        
         \mark "B" \break c1 \mark "A" c2  }
        \new Staff { c1 c2  }