Merge branch 'translation' into staging

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

diff --git a/input/regression/lyrics-bar.ly b/input/regression/lyrics-bar.ly
index 8465b9017a34dbe4f7e01704e902b4dd7c4e1472..1f41177f9b1e8368b01d2044572c083aec0dfd3e 100644 (file)
--- a/input/regression/lyrics-bar.ly
+++ b/input/regression/lyrics-bar.ly
@@ -1,4 +1,4 @@
-\version "2.4.0"
+\version "2.17.5"
 
 \header{
 texidoc="
@@ -8,29 +8,32 @@ lyrics do not collide with barlines.
 }
 
 \layout {
-    raggedright = ##t
+    ragged-right = ##t
 }
 
-<<
-    \context Staff = "foo" \with
-    {
-%      \remove "Bar_engraver"  
-       }
-    {
-       b1 \bar "|:" b1 \bar ":|"
+\relative c'' <<
+    \new Voice = "a"{
+       b1 \bar ".|:" b1 \bar ":|." b1 \bar "|."
     }
-    \context Lyrics \with {
+    \new Lyrics \with {
        \consists "Bar_engraver"
-       \override BarLine #'bar-size = #4 
-    } \lyricmode {
-         looooooooooooooooooooooooooooooooooong1 syllable
+       \consists "Separating_line_group_engraver"
+    } \lyricsto "a" {
+         bars lengthened if
       }
-    \lyrics {
-       no Bar_Engraver_Bar_Engraver_Bar_Engraver 
+    \new Lyrics \lyricsto "a" {
+       required for noncollision
+    }
+    \new Staff {
+       b1 b1 b1
     }
-    \context Staff = "bar" \with {
-%              \remove "Bar_engraver"  
-    } { b1 b1 }
 >>
-       
+\layout {
+  \context {
+    \Lyrics
+      \override VerticalAxisGroup #'nonstaff-nonstaff-spacing #'minimum-distance = #4.2
+      \override LyricText #'Y-offset = #-0.7
+      \override BarLine #'bar-extent = #'(-2 . 2)
+  }
+}