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 c72b9482bcf8821aaf9a5cbf52d4d175b5f847f6..20878be02ee7437515e9de4292d7fe36e2a7efe6 100644 (file)
--- a/input/regression/bar-scripts.ly
+++ b/input/regression/bar-scripts.ly
@@ -1,25 +1,24 @@
-#(ly:set-option 'old-relative)
-\version "1.9.8"
+\version "2.10.0"
 \header{
 texidoc="
 
-Markings that are attached to (invisible) barlines are 
-delicate: the are attached to the rest of the score without the score
-knowing it.  Consequently, they fall over  often.
+Markings can be attached to (invisible) barlines.
 "
 }
 
+\layout { ragged-right = ##t }
 
-onestaff =  \new Staff\notes\relative c''  {
-       \property Staff.instr = instr
-       \property Staff.instrument = instrument \mark "B"
+onestaff = \new Staff\relative c''  {
+       \set Staff.shortInstrumentName = instr
+       \set Staff.instrumentName = instrument \mark "B"
         c1 \mark "A" \break c2  c2 \break
 }
 
-grstaff =  \notes \relative c'' \context GrandStaff <<
+grstaff =  \relative c''
+\context GrandStaff <<
        \new Staff {
 
-       \property Staff.instr = instr
+       \set Staff.shortInstrumentName = instr
        
         \mark "B" \break c1 \mark "A" c2  }
        \new Staff { c1 c2  }