Merge remote-tracking branch 'origin/translation' into staging

[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 9d942f75492bee2d7b17078baf721bf3ba8019f8..0f979840da14b9296e547077acea0df284d506c3 100644 (file)
--- a/input/regression/lyric-combine-polyphonic.ly
+++ b/input/regression/lyric-combine-polyphonic.ly
@@ -1,41 +1,40 @@
-\version "1.9.0"
+\version "2.19.2"
 \header {
 
-texidoc ="Polyphonic rhythms and rests don't disturb
-@code{\addlyrics}."
+  texidoc ="Polyphonic rhythms and rests do not disturb
+@code{\\lyricsto}."
 
 }
 
-\score {
-    \notes {
-       \clef violin
-       \time 8/8
-       \key des \major
-       < \context Voice = one {
-          \voiceOne
-          \addlyrics
-          \notes {
-             bes'4 bes'4
-             bes'4 bes'4
-          }
-          \context Lyrics \lyrics
-          {
-             Do __ mi __ nus ex
-          }
-         }
-         \context Voice = two {
-          \voiceTwo
-          \addlyrics
-          \notes {
-             ees'8 r8 r8 r8 ees' r8 r8 r8 
-          }
-          \context Lyrics \lyrics
-         {
-             Do __ na
-          }
-         }
-       >
-    }
-    \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
+      }
+      \context Lyrics = sop \lyricsto "one"  {
+        Do mi nus ex
+      }
+      \new Voice = "two" {
+        \voiceTwo
+        ees'8 r8 r8 r8 ees' r8 r8 r8 
+      }
+      \new Lyrics  \lyricsto "two"  {
+        Do na
+      }
+    >>
+  }
+  >>
 }
 
+
+