Merge remote branch 'origin/master' into release/unstable

[lilypond.git] / input / regression / page-spacing-nonstaff-lines-and-markup.ly

diff --git a/input/regression/page-spacing-nonstaff-lines-and-markup.ly b/input/regression/page-spacing-nonstaff-lines-and-markup.ly
index c86dd501711e0bab0b4231cb4ca3f2a5ba19a649..1f7f6ef3508a80bdbac9657498788dad82258d37 100644 (file)
--- a/input/regression/page-spacing-nonstaff-lines-and-markup.ly
+++ b/input/regression/page-spacing-nonstaff-lines-and-markup.ly
@@ -1,4 +1,4 @@
-\version "2.14.0"
+\version "2.16.0"
 
 \header {
   texidoc = "Having markup after a non-staff line doesn't confuse
@@ -16,6 +16,12 @@ the page layout engine."
      \new Lyrics \lyricsto "asdf" \lyricmode { a b c d }
   >>
   }
-  \markup "blah blah blah"
+  \markup "next song"
+  \score {
+    <<
+      \new Lyrics \lyricmode {la1 la }
+      \new Staff \new Voice { a'1 a'1 }
+  >>
+  }
 }