Merge branch 'master' into translation

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

diff --git a/input/regression/lyric-extender.ly b/input/regression/lyric-extender.ly
index e98329bd570cd6196b6d8ffa920c421d25814cda..6df2a92b3a30324e2f532708ce440a0679a1a84d 100644 (file)
--- a/input/regression/lyric-extender.ly
+++ b/input/regression/lyric-extender.ly
@@ -1,13 +1,20 @@
-\version "1.7.18"
-\header { texidoc= "Tests lyric extenders. "}
-
-    \paper { raggedright= ##t }
-\score{
-\notes \relative c'    <
-       \context Staff { c (c-) (c-) c }
-       \context Lyrics \lyrics { bla __ alb xxx __ yyy }
-       >
+\version "2.16.0"
+
+\header {
+
+    texidoc= "A LyricExtender may span several notes.  A LyricExtender
+does not extend past a rest, or past the next lyric syllable."
+
+}
+
+\layout { ragged-right = ##t }
+
+\relative c''{
+    d8( e f) r4. 
+    f4
+    d8[( e)] f
 }
+\addlyrics { ah __ ha a __ haaaaaaaaaaaa }