From: gpercival <gpercival>
Date: Thu, 27 Apr 2006 06:38:37 +0000 (+0000)
Subject: Fixed test (no more "can't find context `one'" error).
X-Git-Tag: release/2.8.2~9^2~68
X-Git-Url: https://git.donarmstrong.com/lilypond.git?a=commitdiff_plain;h=84d32d24eb4b94ab19eba062c254976f9bcbaaf1;p=lilypond.git

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

diff --git a/ChangeLog b/ChangeLog
index 82bcc20690..c3417bc518 100644
--- 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 94db06a486..606041cbff 100644
--- 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
+      }
+    >>
+  }
   >>
 }