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 e29ff5e6c6fdceb496f1879f685bc9a3542ed648..1f41177f9b1e8368b01d2044572c083aec0dfd3e 100644 (file)
--- a/input/regression/lyrics-bar.ly
+++ b/input/regression/lyrics-bar.ly
@@ -1,42 +1,39 @@
-\version "1.9.1"
+\version "2.17.5"
 
 \header{
 texidoc="
-Adding a @code{Bar_engraver} to the LyricsVoice context makes sure that
-lyrics don't collide with barlines.
+Adding a @code{Bar_engraver} to the Lyrics context makes sure that
+lyrics do not collide with barlines.
 "
 }
 
-\score {
-       \context StaffGroup <
-       \notes \context Staff {
-               b1 \bar "|:" b1 \bar ":|"
-       }
-       \lyrics\context Lyrics <
-               \context LyricsVoiceWithBars {
-%                      thisContextHasBarEngraver1  added
-                       ThisContextCertainlyHasBarEngraverAddedButThereHasBeenSomethingFunnyBefore1.  Here.
-               }
-               \context LyricsVoice {
-                       this4 one has no BarEngraverAddedToContext1
-               }
-       >
-       \notes \context Staff = SB { b1 b1 }
-       >
-       \paper {
-               raggedright = ##t
-               \translator {
-                       \LyricsContext
-                       \accepts "LyricsVoiceWithBars"
-               }
-               \translator {
-                       \LyricsVoiceContext
-                       \consists "Bar_engraver"
-                       \name "LyricsVoiceWithBars"
-               }
-               \translator {
-                       \LyricsVoiceContext
-               }
-       }
+\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)
+  }
 }