* lily/parser.yy (Prefix_composite_music):

[lilypond.git] / input / regression / lyrics-bar.ly

diff --git a/input/regression/lyrics-bar.ly b/input/regression/lyrics-bar.ly
index 9a3c359c38252e4c6649edfbb67469178ba2e94c..28601d76ae0f2c2b64d46770da86b274a706b083 100644 (file)
--- a/input/regression/lyrics-bar.ly
+++ b/input/regression/lyrics-bar.ly
@@ -1,41 +1,37 @@
-\version "1.3.146"
+\version "2.3.22"
 
 \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 {
+       \context StaffGroup <<
+        \context Staff=foo {
                b1 \bar "|:" b1 \bar ":|"
        }
-       \lyrics\context Lyrics <
-               \context LyricsVoiceWithBars {
+               \context LyricsWithBars \lyricmode {
 %                      thisContextHasBarEngraver1  added
-                       ThisContextCertainlyHasBarEngraverAddedButThereHasBeenSomethingFunnyBefore1.  Here.
+                       ThisContextCertainlyHasBarEngraverAddedButThereHasBeenSomethingFunnyBefore1.  HereThereWhere.
                }
-               \context LyricsVoice {
+               \context Lyrics \lyricmode {
                        this4 one has no BarEngraverAddedToContext1
                }
-       >
-       \notes \context Staff = SB { b1 b1 }
-       >
-       \paper {
-               linewidth = -1.0\cm
-               \translator {
-                       \LyricsContext
-                       \accepts "LyricsVoiceWithBars"
+        \context Staff=bar { b1 b1 }
+       >>
+       \layout {
+               raggedright = ##t
+               \context {
+                       \StaffGroup
+                       \accepts "LyricsWithBars"
                }
-               \translator {
-                       \LyricsVoiceContext
+               \context {
+                       \Lyrics
                        \consists "Bar_engraver"
-                       \name "LyricsVoiceWithBars"
-               }
-               \translator {
-                       \LyricsVoiceContext
+                       \name "LyricsWithBars"
                }
        }
 }
+