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 99255c3710c269922844731623bbd48cbb3ac27e..6a6ade9ce35b842a038be5f02268c6b58c6b8942 100644 (file)
--- a/input/regression/music-function.ly
+++ b/input/regression/music-function.ly
@@ -1,25 +1,22 @@
 \header
 {
-texidoc = "Music function are generic music transformation functions,
-which can be used to extend music syntax seamlessly."
+    
+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.3.22"
+\version "2.12.0"
 
-#(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))
 
-\score{
-     {
-       d4 \myBar #"|:" d4
-       
-    }
+\layout { ragged-right = ##t }
+
+{
+    d4 \myBar "|:" d4
 }