X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=input%2Fregression%2Flyric-combine-new.ly;h=16cc40bf18b55a55a4cd6a1848d277928497103f;hb=0a0274a3bf5792dfb7ce3719f5dfaef36059affe;hp=378543c61df7cc8030fdc130802c95461d2006d2;hpb=197f00037dc4c9e7bd17368f50d11dd8cde7a994;p=lilypond.git diff --git a/input/regression/lyric-combine-new.ly b/input/regression/lyric-combine-new.ly index 378543c61d..16cc40bf18 100644 --- a/input/regression/lyric-combine-new.ly +++ b/input/regression/lyric-combine-new.ly @@ -1,33 +1,33 @@ -\version "2.1.22" +\version "2.14.0" \header { - - texidoc = "With the @code{\\lyricsto} mechanism, individual lyric - lines can be associated with one melody line. For each lyric line, - can be tuned whether to follow melismata or not." - + texidoc = "With the @code{\\lyricsto} mechanism, individual lyric + lines can be associated with one melody line. Each lyric line +can be tuned to either follow or ignore melismata." } -\score { -<< - \notes \context Voice = "bla" \relative c'' { - \autoBeamOff - c2( d4) e8[ c b c] f4 - } - \lyricsto "bla" \lyrics \new Lyrics { bla ab blob blob } - \lyricsto "bla" \lyrics \new Lyrics { - bla - \set ignoreMelismata = ##t - - blob +<< + \new Voice = "bla" \relative c'' { + \autoBeamOff + c2( d4) e8[ c b c] f4 + } + \lyricsto "bla" \new Lyrics { bla ab blob blob } + \lyricsto "bla" \new Lyrics { + bla - %% note: effect of ignoreMelismata delayed one time step. - \unset ignoreMelismata - blob - - blob - } + \set ignoreMelismata = ##t - \lyricsto "bla" \lyrics \new Lyrics { nes ted lyrics voice with more words than no tes } >> + blob - } + %% note: effect of ignoreMelismata delayed one time step. + \unset ignoreMelismata + blob + + blob + } + + \lyricsto "bla" \new Lyrics { + nes ted lyrics voice with more words than no tes + } +>> +