X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fregression%2Flyrics-bar.ly;h=633e041bb6fb1e14404a847fdb2d8b0a6b59e638;hb=904268628ec839b3b8265c7cbee3cac475c7c5a2;hp=f8c7f9ba44431c9d1dc8636a2a159aaa05b7fe06;hpb=70048d99398924e7ca0eb481925145ec243700c5;p=lilypond.git

diff --git a/input/regression/lyrics-bar.ly b/input/regression/lyrics-bar.ly
index f8c7f9ba44..633e041bb6 100644
--- a/input/regression/lyrics-bar.ly
+++ b/input/regression/lyrics-bar.ly
@@ -1,42 +1,39 @@
-\version "1.9.4"
+\version "2.17.6"
 
 \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 \new Staff { 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)
+  }
 }