X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fregression%2Flyric-combine-polyphonic.ly;h=8151b58b7941541b7d4960b3330f1f5b9a8cf43d;hb=ce14f918fb0cdd880e567dd67e5ef277d8f7dee5;hp=aeed986bfc1bb6eb427f234ca8e9c7c47c0fc5de;hpb=197f00037dc4c9e7bd17368f50d11dd8cde7a994;p=lilypond.git diff --git a/input/regression/lyric-combine-polyphonic.ly b/input/regression/lyric-combine-polyphonic.ly index aeed986bfc..8151b58b79 100644 --- a/input/regression/lyric-combine-polyphonic.ly +++ b/input/regression/lyric-combine-polyphonic.ly @@ -1,35 +1,40 @@ -\version "2.1.22" +\version "2.10.0" \header { -texidoc ="Polyphonic rhythms and rests don't 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" \lyrics \new Lyrics { - Do na - } - \lyrics \lyricsto "one" \new 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 + } + >> + } + >> } + +