X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fregression%2Flyrics-bar.ly;h=c559bedebea0c8ad18ddd607af5c9ba9a11da9c3;hb=26a079ca2393d053315ef8dbef626c897dc9645a;hp=8465b9017a34dbe4f7e01704e902b4dd7c4e1472;hpb=641486a1a5522a9e66b470d8c762a1f789219573;p=lilypond.git

diff --git a/input/regression/lyrics-bar.ly b/input/regression/lyrics-bar.ly
index 8465b9017a..c559bedebe 100644
--- a/input/regression/lyrics-bar.ly
+++ b/input/regression/lyrics-bar.ly
@@ -1,4 +1,4 @@
-\version "2.4.0"
+\version "2.16.0"
 
 \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)
+  }
+}