Merge branch 'lilypond/translation' of ssh://git.sv.gnu.org/srv/git/lilypond into...

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

diff --git a/input/regression/markup-user.ly b/input/regression/markup-user.ly
index 586e7cb0c1123b8ea4bbebcb55da3b12f254079a..8c4afdf6acc504826de2e4a1b121bf98998b491b 100644 (file)
--- a/input/regression/markup-user.ly
+++ b/input/regression/markup-user.ly
@@ -1,10 +1,7 @@
 
 \header {
-
-  texidoc = "Own markup commands may be defined by using the
-    @code{def-markup-command} scheme macro."
-
-
+  texidoc = "Users may define non-standard markup commands using
+the @code{define-markup-command} scheme macro."
 }
 
 
@@ -12,16 +9,23 @@
   
 
 
-\version "2.7.32" % to be updated
+\version "2.14.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))))
 
-
-{ 
-  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
+    }
+  }
 
+}