X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fregression%2Flyric-combine-new.ly;h=045f7ff2be7d19e309899cddf5cdca666814b49c;hb=8d36de6e924066f07aa043bea971806c771b2786;hp=52519e010dd9fbe9e5667473f66632347c60a2d9;hpb=7b22eeeee2505be517e58c3f922ddc53f1b7b0bd;p=lilypond.git

diff --git a/input/regression/lyric-combine-new.ly b/input/regression/lyric-combine-new.ly
index 52519e010d..045f7ff2be 100644
--- a/input/regression/lyric-combine-new.ly
+++ b/input/regression/lyric-combine-new.ly
@@ -1,33 +1,33 @@
-\version "2.1.21"
+\version "2.10.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 
 
-	\property Lyrics . 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.
-	\property Lyrics . ignoreMelismata \unset
-	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
+  }
+>>
+