resolve merge

[lilypond.git] / input / regression / markup-user.ly

diff --git a/input/regression/markup-user.ly b/input/regression/markup-user.ly
index 637734706063cfddee3c1efa8055dd108ae1e425..8c4afdf6acc504826de2e4a1b121bf98998b491b 100644 (file)
--- a/input/regression/markup-user.ly
+++ b/input/regression/markup-user.ly
@@ -9,16 +9,23 @@ the @code{define-markup-command} scheme macro."
   
 
 
-\version "2.12.0"
+\version "2.14.0"
 
 #(define-markup-command (upcase paper props str) (string?)
   "Upcase the string characters. Syntax: \\upcase #\"string\""
   (interpret-markup paper props (make-simple-markup (string-upcase str))))
 
-
-{ 
-  c''-\markup \upcase #"hello world"
+\score{
+  {
+    c''-\markup \upcase #"hello world"
                                % produces a "HELLO WORLD" markup
-}
+  }
 
+  \layout {
+    \context {
+      \Score
+      \override PaperColumn #'keep-inside-line = ##f
+    }
+  }
 
+}