Merge remote-tracking branch 'origin/master' into translation

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

diff --git a/input/regression/music-function.ly b/input/regression/music-function.ly
index 19cb5a887cf267d49ef9d94091e7c04e0bb2c9e2..8f4da124fa0d81f6864b40a96f1b5adb7d9e897d 100644 (file)
--- a/input/regression/music-function.ly
+++ b/input/regression/music-function.ly
@@ -1,26 +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."
+demonstrate a @code{\\myBar} function, which works similar to
+@code{\\bar}, but is implemented completely in Scheme."
 
 }
-\version "2.3.22"
+\version "2.17.5"
 
-#(define myBar
-  (ly:make-music-function
-   (list string?)
-   (lambda (where type)
-    (context-spec-music
-     (context-spec-music (make-property-set 'whichBar type) 'Timing)
-     'Score))
-    ))
+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
 }