X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fregression%2Flyric-combine-polyphonic.ly;h=eced3eae5ecade2648ed92228017b08068e5b0e8;hb=f417a6007e951fda4f1fb5fd3da0ecd1d25cec2f;hp=0b8b2be7f5c90c7a68f8b52a91fe0bf3631d4361;hpb=3db08de4502e30616808fc348b054d32822e5cc4;p=lilypond.git diff --git a/input/regression/lyric-combine-polyphonic.ly b/input/regression/lyric-combine-polyphonic.ly index 0b8b2be7f5..eced3eae5e 100644 --- a/input/regression/lyric-combine-polyphonic.ly +++ b/input/regression/lyric-combine-polyphonic.ly @@ -1,41 +1,40 @@ -\version "1.7.18" +\version "2.14.0" \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 + } + \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 + } + >> + } + >> } + +