*** empty log message ***

diff --git a/ly/music-functions-init.ly b/ly/music-functions-init.ly
index d9993e2fb1768529c1b1335be5e7da5017d87621..5ab7907bcfde10e6d11f1b4a9dd05e975d7ce497 100644 (file)
--- a/ly/music-functions-init.ly
+++ b/ly/music-functions-init.ly
@@ -27,7 +27,7 @@ applycontext = #(def-music-function (parser location proc) (procedure?)
                    'procedure proc))
 
 displayMusic = #(def-music-function (parser location music) (ly:music?)
-                (display-music music)
+                (display-scheme-music music)
                 music)
 applyoutput = #(def-music-function (parser location proc) (procedure?)
                 (make-music 'ApplyOutputEvent 

diff --git a/scm/music-functions.scm b/scm/music-functions.scm
index e02dc62d9ef587d6e4ddd23e87fd24dafa835ca4..a71e8705695a1a21fd5644e3e880a9bf8a4a28b8 100644 (file)
--- a/scm/music-functions.scm
+++ b/scm/music-functions.scm
@@ -87,7 +87,7 @@ First it recurses over the children, then the function is applied to MUSIC.
 (define (markup-expression->make-markup markup-expression)
   "Transform `markup-expression' into an equivalent, hopefuly readable, scheme expression.
 For instance, 
-  \markup \bold \italic hello
+  \\markup \\bold \\italic hello
 ==>
   (markup #:line (#:bold (#:italic (#:simple \"hello\"))))"
   (define (proc->command-keyword proc)
@@ -109,15 +109,15 @@ For instance,
   ;; body:
   `(markup ,@(inner-markup->make-markup markup-expression)))
 
+(define (music-expression? obj)
+  (ly:music? obj))
+
 (define*-public (music-pretty-string obj #:optional (depth 0))
   "Return a string describing `obj', in particular music expression
 will be printed as: (make-music 'MusicType 'property ...)"
-  (define (markup-expression? obj)
-    (and (list? obj) (markup-function? (car obj))))
-  (define (music-expression? obj)
-    (ly:music? obj))
+  
   (cond (;; markup expression
-        (markup-expression? obj)
+        (markup? obj)
         (format #f "~a" (markup-expression->make-markup obj)))
        (;; music expression
         (music-expression? obj)
@@ -128,7 +128,7 @@ will be printed as: (make-music 'MusicType 'property ...)"
                                (+ 2 (* 13 depth))
                                (car prop)
                                (cond (;; property is a markup expression
-                                      (markup-expression? (cdr prop))
+                                      (markup? (cdr prop))
                                       (music-pretty-string (cdr prop) (1+ depth)))
                                      (;; property is a list
                                       (list? (cdr prop))