Merge branch 'stable/2.16' into staging

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

diff --git a/input/regression/markup-user.ly b/input/regression/markup-user.ly
index 63b1450af00a8f8e29348595fef7a37be6f335d1..698e13bce155b8872085c141437d1ffd4d7ef3fa 100644 (file)
--- a/input/regression/markup-user.ly
+++ b/input/regression/markup-user.ly
@@ -1,15 +1,11 @@
-
 \header {
   texidoc = "Users may define non-standard markup commands using
 the @code{define-markup-command} scheme macro."
 }
 
-
 \layout { ragged-right = ##t }
-  
 
-
-\version "2.12.0"
+\version "2.16.0"
 
 #(define-markup-command (upcase paper props str) (string?)
   "Upcase the string characters. Syntax: \\upcase #\"string\""
@@ -17,8 +13,7 @@ the @code{define-markup-command} scheme macro."
 
 \score{
   {
-    c''-\markup \upcase #"hello world"
-                               % produces a "HELLO WORLD" markup
+    c''-\markup \upcase #"hello world in upper case"
   }
 
   \layout {
@@ -27,5 +22,4 @@ the @code{define-markup-command} scheme macro."
       \override PaperColumn #'keep-inside-line = ##f
     }
   }
-
 }