X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fregression%2Flyric-combine-polyphonic.ly;h=7a39f689dfa8caf2e6bb6fe88ab712e7c6060d92;hb=7b3a9b122d7ef1eb70fdabaac466b7b0c23a1df2;hp=85ad22deaec051d546356802082e9120c7d41adc;hpb=7e8d660df15820c540b74a4ab74d175284cd9008;p=lilypond.git diff --git a/input/regression/lyric-combine-polyphonic.ly b/input/regression/lyric-combine-polyphonic.ly index 85ad22deae..7a39f689df 100644 --- a/input/regression/lyric-combine-polyphonic.ly +++ b/input/regression/lyric-combine-polyphonic.ly @@ -1,35 +1,40 @@ -\version "2.1.30" +\version "2.12.0" \header { -texidoc ="Polyphonic rhythms and rests do not disturb -@code{\lyricsto}." + 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 + } + >> + } + >> } + +