Merge branch 'master' into dev/texi2html

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

diff --git a/input/regression/markup-user.ly b/input/regression/markup-user.ly
index 7afff8e9fcc2fee5e78f758d575210600291e19c..2619982d28945ff1f9a80042824888da947eaff5 100644 (file)
--- a/input/regression/markup-user.ly
+++ b/input/regression/markup-user.ly
@@ -1,22 +1,24 @@
 
 \header {
+  texidoc = "Users may define non-standard markup commands using
+the @code{define-markup-command} scheme macro."
+}
 
-    texidoc = "Own markup commands may be defined by using the
-    @code{def-markup-command} scheme macro."
 
+\layout { ragged-right = ##t }
+  
 
-      }
 
-\version "2.1.28" % to be updated
+\version "2.11.51"
 
-#(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))))
-
-\score { 
-    \notes { 
-        c''-\markup \upcase #"hello world"
-        % produces a "HELLO WORLD" markup
-    }
-    \paper { raggedright = ##t }
+  (interpret-markup paper props (make-simple-markup (string-upcase str))))
+
+
+{ 
+  c''-\markup \upcase #"hello world"
+                               % produces a "HELLO WORLD" markup
 }
+
+