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 d1563e6d8f3c34620a69011c7abb3dea420aff2b..698e13bce155b8872085c141437d1ffd4d7ef3fa 100644 (file)
--- a/input/regression/markup-user.ly
+++ b/input/regression/markup-user.ly
@@ -1,22 +1,25 @@
-
 \header {
+  texidoc = "Users may define non-standard markup commands using
+the @code{define-markup-command} scheme macro."
+}
 
-    texidoc = "Users may define their own markup commands using the
-    @code{def-markup-command} scheme macro."
-
-
-      }
+\layout { ragged-right = ##t }
 
-\version "2.1.14" % to be updated
+\version "2.16.0"
 
-#(def-markup-command (upcase paper props str) (string?)
+#(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))))
+  (interpret-markup paper props (make-simple-markup (string-upcase str))))
+
+\score{
+  {
+    c''-\markup \upcase #"hello world in upper case"
+  }
 
-\score { 
-    \notes { 
-        c''-\markup \upcase #"hello world"
-        % produces a "HELLO WORLD" markup
+  \layout {
+    \context {
+      \Score
+      \override PaperColumn #'keep-inside-line = ##f
     }
-    \paper { raggedright = ##t }
+  }
 }