summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGraham Percival <graham@percival-music.ca>2006-04-27 06:38:37 +0000
committerGraham Percival <graham@percival-music.ca>2006-04-27 06:38:37 +0000
commitec611dc4e001eaaab7e3583e44074b0ef0ec70bc (patch)
treebb329677fd9bff21ac1144ec0348aeb56d7b568f
parentfded70fbd4c4c22081a495f6dec53cc7a2263061 (diff)
Fixed test (no more "can't find context `one'" error).
-rw-r--r--ChangeLog5
-rw-r--r--input/regression/lyric-combine-polyphonic.ly43
2 files changed, 29 insertions, 19 deletions
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
+ }
+ >>
+ }
>>
}