Merge branch 'HEAD' of git://git.sv.gnu.org/lilypond.git

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

diff --git a/input/regression/lyrics-bar.ly b/input/regression/lyrics-bar.ly
index a5973203238034ce4a85d94137a620d994c3c087..a6a1afab9e7ee30ac314b948a524ac9ec3de8443 100644 (file)
--- a/input/regression/lyrics-bar.ly
+++ b/input/regression/lyrics-bar.ly
@@ -1,4 +1,4 @@
-\version "2.6.0"
+\version "2.10.0"
 
 \header{
 texidoc="
@@ -8,11 +8,11 @@ lyrics do not collide with barlines.
 }
 
 \layout {
-    raggedright = ##t
+    ragged-right = ##t
 }
 
 <<
-    \context Staff = "foo" \with
+    \new Staff \with
     {
 %      \remove "Bar_engraver"  
        }
@@ -21,14 +21,15 @@ lyrics do not collide with barlines.
     }
     \context Lyrics \with {
        \consists "Bar_engraver"
-       \override BarLine #'bar-size = #4 
+       \consists "Separating_line_group_engraver"
+       \override BarLine #'bar-size = #4 
     } \lyricmode {
          looooooooooooooooooooooooooooooooooong1 syllable
       }
     \lyrics {
        no Bar_Engraver_Bar_Engraver_Bar_Engraver 
     }
-    \context Staff = "bar" \with {
+    \new Staff \with {
 %              \remove "Bar_engraver"  
     } { b1 b1 }
 >>