Merge with git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond.git

[lilypond.git] / input / regression / lyric-combine-polyphonic.ly

diff --git a/input/regression/lyric-combine-polyphonic.ly b/input/regression/lyric-combine-polyphonic.ly
index 94db06a4865a8862570e92d05be407abdb15bec3..8151b58b7941541b7d4960b3330f1f5b9a8cf43d 100644 (file)
--- a/input/regression/lyric-combine-polyphonic.ly
+++ b/input/regression/lyric-combine-polyphonic.ly
@@ -1,4 +1,4 @@
-\version "2.7.39"
+\version "2.10.0"
 \header {
 
   texidoc ="Polyphonic rhythms and rests do not disturb
@@ -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
+      }
+    >>
+  }
   >>
 }