Make StaffGroup accept the new

Lyrics context.

diff --git a/ChangeLog b/ChangeLog
index f54592be3aa78f0cbdcda29fe87d1398dcf97a0b..9c776957fbc73c22174f64cf9d8653bb81010e5f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-26  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * input/regression/lyrics-bar.ly: Make StaffGroup accept the new
+       Lyrics context.
+
 2004-10-25  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
        * python/lilylib.py (make_ps_images): return list of output files.

diff --git a/input/regression/lyrics-bar.ly b/input/regression/lyrics-bar.ly
index 1ba196fff72bc38303e98da73c4434b78a87458d..28601d76ae0f2c2b64d46770da86b274a706b083 100644 (file)
--- a/input/regression/lyrics-bar.ly
+++ b/input/regression/lyrics-bar.ly
@@ -9,24 +9,22 @@ lyrics do not collide with barlines.
 
 \score {
        \context StaffGroup <<
-        \context Staff {
+        \context Staff=foo {
                b1 \bar "|:" b1 \bar ":|"
        }
-       \lyricmode <<
-               \context LyricsWithBars {
+               \context LyricsWithBars \lyricmode {
 %                      thisContextHasBarEngraver1  added
-                       ThisContextCertainlyHasBarEngraverAddedButThereHasBeenSomethingFunnyBefore1.  Here.
+                       ThisContextCertainlyHasBarEngraverAddedButThereHasBeenSomethingFunnyBefore1.  HereThereWhere.
                }
-               \context Lyrics {
+               \context Lyrics \lyricmode {
                        this4 one has no BarEngraverAddedToContext1
                }
-       >>
-        \new Staff { b1 b1 }
+        \context Staff=bar { b1 b1 }
        >>
        \layout {
                raggedright = ##t
                \context {
-                       \Score
+                       \StaffGroup
                        \accepts "LyricsWithBars"
                }
                \context {