X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fregression%2Flyrics-bar.ly;h=a6a1afab9e7ee30ac314b948a524ac9ec3de8443;hb=ce14f918fb0cdd880e567dd67e5ef277d8f7dee5;hp=8363e775e5ff22894654cd091343b36b32acbb5d;hpb=72972afb27cf99f5ae432f4a1463d4f6de6107a0;p=lilypond.git

diff --git a/input/regression/lyrics-bar.ly b/input/regression/lyrics-bar.ly
index 8363e775e5..a6a1afab9e 100644
--- a/input/regression/lyrics-bar.ly
+++ b/input/regression/lyrics-bar.ly
@@ -1,42 +1,37 @@
-\version "1.7.16"
+\version "2.10.0"
 
 \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
 }
-%% new-chords-done %%
+
+<<
+    \new Staff \with
+    {
+%	\remove "Bar_engraver"	
+	}
+    {
+	b1 \bar "|:" b1 \bar ":|"
+    }
+    \context Lyrics \with {
+	\consists "Bar_engraver"
+	\consists "Separating_line_group_engraver"
+ 	\override BarLine #'bar-size = #4 
+    } \lyricmode {
+	  looooooooooooooooooooooooooooooooooong1 syllable
+      }
+    \lyrics {
+	no Bar_Engraver_Bar_Engraver_Bar_Engraver 
+    }
+    \new Staff \with {
+%		\remove "Bar_engraver"	
+    } { b1 b1 }
+>>
+	
+