small fixes.

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

diff --git a/input/regression/lyrics-bar.ly b/input/regression/lyrics-bar.ly
index fc41662525ee34c5746d1531f029fd6bb40ad4ea..dac707f6f97aca765abb5532ab848b907bbaa88f 100644 (file)
--- a/input/regression/lyrics-bar.ly
+++ b/input/regression/lyrics-bar.ly
@@ -1,41 +1,39 @@
-\version "1.5.68"
+\version "2.2.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 <
+       \context StaffGroup <<
        \notes \context Staff {
                b1 \bar "|:" b1 \bar ":|"
        }
-       \lyrics\context Lyrics <
-               \context LyricsVoiceWithBars {
+       \lyrics <<
+               \context LyricsWithBars {
 %                      thisContextHasBarEngraver1  added
                        ThisContextCertainlyHasBarEngraverAddedButThereHasBeenSomethingFunnyBefore1.  Here.
                }
-               \context LyricsVoice {
+               \context Lyrics {
                        this4 one has no BarEngraverAddedToContext1
                }
-       >
-       \notes \context Staff = SB { b1 b1 }
-       >
+       >>
+       \notes \new Staff { b1 b1 }
+       >>
        \paper {
-               linewidth = -1.0\cm
-               \translator {
-                       \LyricsContext
-                       \accepts "LyricsVoiceWithBars"
+               raggedright = ##t
+               \context {
+                       \ScoreContext
+                       \accepts "LyricsWithBars"
                }
-               \translator {
-                       \LyricsVoiceContext
+               \context {
+                       \LyricsContext
                        \consists "Bar_engraver"
-                       \name "LyricsVoiceWithBars"
-               }
-               \translator {
-                       \LyricsVoiceContext
+                       \name "LyricsWithBars"
                }
        }
 }
+