Merge branch 'master' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond

[lilypond.git] / input / regression / score-text.ly

diff --git a/input/regression/score-text.ly b/input/regression/score-text.ly
index a86f06ef180b912591df4f32b47fb789cb3ed112..ed0a02a17a26795f2a2bb1a893cab843908dbcae 100644 (file)
--- a/input/regression/score-text.ly
+++ b/input/regression/score-text.ly
@@ -1,25 +1,33 @@
-\version "2.5.14"
+\version "2.10.0"
 
 \header {
 
-    texidoc = "Markup texts are set beneath a score."
+    texidoc = "Markup texts are rendered above or below a score."
 
 }
 
 \paper {
-    linewidth = #110
+    line-width = #110
 }
-<<
-    \relative {
-       \clef bass
-       d,2 d c4 bes a2 \break
-       c2 c d4 f g2
+
+%% using Book and Score to get text in lilypond-book 
+\book {
+    \markup {
+       \fill-line { "High up above" }
     }
-    \addlyrics {
-       My first Li -- ly song,
-       Not much can go wrong!
+    \score {
+       <<
+           \relative {
+               \clef bass
+               d,2 d c4 bes a2 \break
+               c2 c d4 f g2
+           }
+           \addlyrics {
+               My first Li -- ly song,
+               Not much can go wrong!
+           }
+       >>
     }
->>
     \markup {
        %%TODO: make \verse markup.
        \fill-line {
@@ -43,3 +51,4 @@
            }
        }
     }
+}
\ No newline at end of file