X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fregression%2Flyric-combine-polyphonic.ly;h=1420c43521591258f8a7e00472a2170404b8f61c;hb=68cf70682a542701a918f8bfff50f2b8b85f84e2;hp=2c3d8d783a41eccf72300ba285a796f1fe83ffb0;hpb=d2e7425b88e579fe53989106965fa13eab551c92;p=lilypond.git diff --git a/input/regression/lyric-combine-polyphonic.ly b/input/regression/lyric-combine-polyphonic.ly index 2c3d8d783a..1420c43521 100644 --- a/input/regression/lyric-combine-polyphonic.ly +++ b/input/regression/lyric-combine-polyphonic.ly @@ -1,41 +1,40 @@ -\version "1.9.8" +\version "2.12.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 + } + >> + } + >> } + +