Merge commit 'origin/dev/jneeman' into systems-per-page

[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 872b87a72c40d939a6025fe90c8c819b6b9ab54a..1420c43521591258f8a7e00472a2170404b8f61c 100644 (file)
--- a/input/regression/lyric-combine-polyphonic.ly
+++ b/input/regression/lyric-combine-polyphonic.ly
@@ -1,34 +1,40 @@
-\version "2.2.0"
+\version "2.12.0"
 \header {
 
-texidoc ="Polyphonic rhythms and rests do not disturb
+  texidoc ="Polyphonic rhythms and rests do not disturb
 @code{\lyricsto}."
 
 }
 
-\score {
-    \notes {
-       \clef violin
-       \time 8/8
-       \key des \major
-       <<
-          \context Voice = one {
-              \voiceOne
-              bes'4 bes'4
-              bes'4 bes'4
-          }
-         \context Voice = two {
-             \voiceTwo
-             ees'8 r8 r8 r8 ees' r8 r8 r8 
-          }
-          \lyricsto "two" \new Lyrics \lyrics {
-             Do na
-         }
-        \lyricsto "one" \new Lyrics \lyrics {
-            Do mi nus ex
-        }
-       >>
-    }
-    \paper { raggedright = ##t}
+\layout { ragged-right = ##t}
+
+{
+  \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
+      }
+    >>
+  }
+  >>
 }
 
+
+