Merge commit 'origin' into includes

[lilypond.git] / input / regression / music-function.ly

diff --git a/input/regression/music-function.ly b/input/regression/music-function.ly
index c904f6166c6b6c3e3b96cc6055c207fa17cd4ebe..6a6ade9ce35b842a038be5f02268c6b58c6b8942 100644 (file)
--- a/input/regression/music-function.ly
+++ b/input/regression/music-function.ly
@@ -1,22 +1,22 @@
 \header
 {
     
-texidoc = "Music function are generic music transformation functions,
+texidoc = "Music functions are generic music transformation functions,
 which can be used to extend music syntax seamlessly.  Here we
 demonstrate a @code{\myBar} function, which works similar to
 @code{\bar}, but is implemented completely in Scheme."
 
 }
-\version "2.4.0"
+\version "2.12.0"
 
-myBar = #(def-music-function (parser location bar-type) (string?)
+myBar = #(define-music-function (parser location bar-type) (string?)
           (context-spec-music
            (context-spec-music (make-property-set 'whichBar bar-type) 'Timing)
            'Score))
 
-\layout { raggedright = ##t }
+\layout { ragged-right = ##t }
 
 {
-    d4 \myBar #"|:" d4
+    d4 \myBar "|:" d4
 }