X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fregression%2Flyric-combine-polyphonic.ly;h=16285dd6cffa6acce21d423995e5c163170b5c43;hb=1759b13a95aea208761c6651d760a967da3d44c3;hp=e4d029bf7d796e3543325aa627db812587987ce4;hpb=c203c51a1740bad64a298c6556be643164e4b7ef;p=lilypond.git

diff --git a/input/regression/lyric-combine-polyphonic.ly b/input/regression/lyric-combine-polyphonic.ly
index e4d029bf7d..16285dd6cf 100644
--- a/input/regression/lyric-combine-polyphonic.ly
+++ b/input/regression/lyric-combine-polyphonic.ly
@@ -1,35 +1,40 @@
-\version "2.1.7"
+\version "2.16.0"
 \header {
 
-texidoc ="Polyphonic rhythms and rests don't disturb
-@code{\newaddlyrics}."
+  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 
-          }
-          \newaddlyrics "two" \lyrics \new LyricsVoice {
-             Do na
-         }
-	 \lyrics  \newaddlyrics "one" \new LyricsVoice
-	   {
-	       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
+      }
+    >>
+  }
+  >>
 }
 
+
+