* scripts/convert-ly.py (FatalConversionError.subst_in_trans):

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

diff --git a/input/regression/lyric-combine.ly b/input/regression/lyric-combine.ly
index b53f3fc587ed706223d97e35f287694c84bb3638..67866164bd5d42dc7288b4b365418be0ccd7d928 100644 (file)
--- a/input/regression/lyric-combine.ly
+++ b/input/regression/lyric-combine.ly
@@ -1,4 +1,5 @@
-\version "1.7.18"
+
+\version "2.1.22"
 
 \header{
 texidoc= "Lyrics can be set to a melody automatically.  Excess lyrics will be
@@ -17,9 +18,8 @@ to work."
 
 
 m = \notes  \relative c'' {
-       \property Staff.automaticMelismata = ##t
        \autoBeamOff
-       g8-( a-)  r8 \times 2/3 { g'8-( f e-) } r8 \grace {  d16-[ c b] } e4
+       g8( a)  r8 \times 2/3 { g'8( f e) } r8 \grace {  d16[ c b] } e4
        \emptyText
        d8.^"melisma"   \melisma c16
        \melismaEnd
@@ -27,11 +27,11 @@ m = \notes  \relative c'' {
 
 noise = \repeat unfold 6 \notes \relative c'' { g16 g g g }
 
- textI = \context LyricsVoice = "middle-1" \lyrics { la2 __ la -- la __ la la la la la  }
-textII = \context LyricsVoice = "middle-1" \lyrics { da -- da __ da -- da da da da da  }
+ textI = \context Lyrics = "middle-1" \lyrics { la2 __ la -- la __ la la la la la  }
+textII = \context Lyrics = "middle-1" \lyrics { da -- da __ da -- da da da da da  }
 
 \score {
-    \notes < \context Staff = SA \noise
+    \notes << \context Staff = SA \noise
       \context Lyrics = LA { s1 }
       \context Staff = SB { s1 }
       \context Lyrics = LB { s1 }
@@ -39,11 +39,11 @@ textII = \context LyricsVoice = "middle-1" \lyrics { da -- da __ da -- da da da
       
       \addlyrics
          \context Staff = SB \context Voice="middle" \m
-         < \context Lyrics = LA \textI
+         << \context Lyrics = LA \textI
            \context Lyrics = LB \textII
-         >
+         >>
          
-    >
+    >>
 }