Merge branch 'master' of /home/jcharles/GIT/Lily/. into translation

[lilypond.git] / input / regression / lyric-combine.ly

diff --git a/input/regression/lyric-combine.ly b/input/regression/lyric-combine.ly
index 424653ee48d3530eb2aa88b142b1ec8f1494c4ed..cedcb39d2d2e5fc2350fa3455384630f238ff459 100644 (file)
--- a/input/regression/lyric-combine.ly
+++ b/input/regression/lyric-combine.ly
@@ -1,5 +1,5 @@
 
-\version "2.12.0"
+\version "2.17.11"
 
 \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."
 
 }
@@ -19,7 +19,7 @@ lyrics ignore any other rhythms in the piece."
 
 m = \relative c'' {
     \autoBeamOff
-    g8( a)  r8 \times 2/3 { g'8( f e) } r8 \grace {  d16[ c b] } e4
+    g8( a)  r8 \tuplet 3/2 { g'8( f e) } r8 \grace {  d16[ c b] } e4
     \textLengthOff
     d8.^"melisma"      \melisma c16
     \melismaEnd