X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fregression%2Flyric-combine.ly;h=1f635e638ce388b1b159a0e3540f3b2db0ce3abd;hb=ad898bf610c35b07f67ae97fd6e445dc530998fc;hp=0b5bf4db9cdc541c05ea93176834c1a585bb7fae;hpb=2940cdd12c135ef94e4c95ac815e76014eef9c79;p=lilypond.git diff --git a/input/regression/lyric-combine.ly b/input/regression/lyric-combine.ly index 0b5bf4db9c..1f635e638c 100644 --- a/input/regression/lyric-combine.ly +++ b/input/regression/lyric-combine.ly @@ -1,5 +1,5 @@ -\version "2.14.0" +\version "2.19.21" \header{ @@ -8,7 +8,7 @@ lyrics will be discarded. Lyrics will not be set over rests. You can have melismata either by setting a property melismaBusy, or by setting automaticMelismas (which will set melismas during slurs and ties). If you want a different order than first Music, then Lyrics, you must -precook a chord of staves/lyrics and label those. Of course, the +precook a chord of staves/@/lyrics and label those. Of course, the lyrics ignore any other rhythms in the piece." } @@ -17,16 +17,16 @@ lyrics ignore any other rhythms in the piece." -m = \relative c'' { +m = \relative { \autoBeamOff - g8( a) r8 \times 2/3 { g'8( f e) } r8 \grace { d16[ c b] } e4 + g'8( a) r8 \tuplet 3/2 { g'8( f e) } r8 \grace { d16[ c b] } e4 \textLengthOff d8.^"melisma" \melisma c16 \melismaEnd b } -noise = \repeat unfold 6 \relative c'' { g16 g g g } +noise = \repeat unfold 6 \relative { g'16 g g g } textI = \lyricmode { la2 __ la -- la __ la la la la la