Fixed test (no more "can't find context `one'" error).

diff --git a/ChangeLog b/ChangeLog
index 82bcc20690b6d1e379798e2157cbfbaae7b4fdb4..c3417bc5189c39b5e460f829ff575d61d7549451 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-26  Graham Percival  <gpermus@gmail.com>
+
+       * input/regression/lyric-combine-polyphonic.ly: fixed test
+       (no more "can't find context `one'" error).
+
 2006-04-25  Joe Neeman <joeneeman@gmail.com>
 
        * lily/stem-tremolo.cc (print): fix whole note tremolo placement

diff --git a/input/regression/lyric-combine-polyphonic.ly b/input/regression/lyric-combine-polyphonic.ly
index 94db06a4865a8862570e92d05be407abdb15bec3..606041cbff0323748c6b3e67c89169abd3829cb3 100644 (file)
--- a/input/regression/lyric-combine-polyphonic.ly
+++ b/input/regression/lyric-combine-polyphonic.ly
@@ -9,25 +9,30 @@
 \layout { ragged-right = ##t}
 
 {
-  \clef violin
-  \time 8/8
-  \key des \major
-  <<
-    \lyricsto "one"  \new Lyrics  {
-      Do mi nus ex
-    }
-    \new Voice = "one" {
-      \voiceOne
-      bes'4 bes'4
-      bes'4 bes'4
-    }
-    \new Voice = "two" {
-      \voiceTwo
-      ees'8 r8 r8 r8 ees' r8 r8 r8 
-    }
-    \lyricsto "two"  \new Lyrics  {
-      Do na
-    }
+  \new ChoirStaff <<
+    \context Lyrics = sop { s1 }
+    \new Staff {
+      \clef violin
+      \time 8/8
+      \key des \major
+      <<
+        \new Voice = "one" {
+        \voiceOne
+        bes'4 bes'4
+        bes'4 bes'4
+      }
+      \lyricsto "one"  \context Lyrics = sop {
+        Do mi nus ex
+      }
+      \new Voice = "two" {
+        \voiceTwo
+        ees'8 r8 r8 r8 ees' r8 r8 r8 
+      }
+      \lyricsto "two"  \new Lyrics  {
+        Do na
+      }
+    >>
+  }
   >>
 }