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 dd79f0ab47a26efee5fb1a494dab80d583a76ac7..1f41177f9b1e8368b01d2044572c083aec0dfd3e 100644 (file)
--- a/input/regression/lyrics-bar.ly
+++ b/input/regression/lyrics-bar.ly
@@ -1,4 +1,4 @@
-\version "2.1.26"
+\version "2.17.5"
 
 \header{
 texidoc="
@@ -7,33 +7,33 @@ lyrics do not collide with barlines.
 "
 }
 
-\score {
-       \context StaffGroup <<
-       \notes \context Staff {
-               b1 \bar "|:" b1 \bar ":|"
-       }
-       \lyrics <<
-               \context LyricsWithBars {
-%                      thisContextHasBarEngraver1  added
-                       ThisContextCertainlyHasBarEngraverAddedButThereHasBeenSomethingFunnyBefore1.  Here.
-               }
-               \context Lyrics {
-                       this4 one has no BarEngraverAddedToContext1
-               }
-       >>
-       \notes \new Staff { b1 b1 }
-       >>
-       \paper {
-               raggedright = ##t
-               \translator {
-                       \ScoreContext
-                       \accepts "LyricsWithBars"
-               }
-               \translator {
-                       \LyricsContext
-                       \consists "Bar_engraver"
-                       \name "LyricsWithBars"
-               }
-       }
+\layout {
+    ragged-right = ##t
+}
+
+\relative c'' <<
+    \new Voice = "a"{
+       b1 \bar ".|:" b1 \bar ":|." b1 \bar "|."
+    }
+    \new Lyrics \with {
+       \consists "Bar_engraver"
+       \consists "Separating_line_group_engraver"
+    } \lyricsto "a" {
+         bars lengthened if
+      }
+    \new Lyrics \lyricsto "a" {
+       required for noncollision
+    }
+    \new Staff {
+       b1 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)
+  }
 }