X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fregression%2Flyric-combine-polyphonic.ly;h=1420c43521591258f8a7e00472a2170404b8f61c;hb=38d7d319eabc906e82fb42002678c6d42a23b6f7;hp=46fa21f2bbd8b8d467587b3b3b45f4e33b459969;hpb=39dd20959c8b3a143cfe41138a5c62749da54079;p=lilypond.git

diff --git a/input/regression/lyric-combine-polyphonic.ly b/input/regression/lyric-combine-polyphonic.ly
index 46fa21f2bb..1420c43521 100644
--- a/input/regression/lyric-combine-polyphonic.ly
+++ b/input/regression/lyric-combine-polyphonic.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.12.0"
 \header {
 
   texidoc ="Polyphonic rhythms and rests do not disturb
@@ -6,28 +6,33 @@
 
 }
 
-\layout { raggedright = ##t}
+\layout { ragged-right = ##t}
 
 {
-  \clef violin
-  \time 8/8
-  \key des \major
-  <<
-    \lyricsto "one"  \new Lyrics  {
-      Do mi nus ex
-    }
-    \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  {
-      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
+      }
+    >>
+  }
   >>
 }