X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fregression%2Flyrics-bar.ly;h=1a827522743b1c7bd8d59112494ee920555c3ba9;hb=2941f9718947990dc9c2eefa1f842d54766c0561;hp=0c34ee3d2395d35da2f7b2f349913d8ab836f00b;hpb=899be51b6aec294310ca4c868f67ec23dd26042c;p=lilypond.git

diff --git a/input/regression/lyrics-bar.ly b/input/regression/lyrics-bar.ly
index 0c34ee3d23..1a82752274 100644
--- a/input/regression/lyrics-bar.ly
+++ b/input/regression/lyrics-bar.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.14.0"
 
 \header{
 texidoc="
@@ -8,30 +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"
 	\consists "Separating_line_group_engraver"
- 	\override BarLine #'bar-size = #4 
-    } \lyricmode {
-	  looooooooooooooooooooooooooooooooooong1 syllable
+    } \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)
+  }
+}