(markup-expression->make-markup): fix bug with cons arguments of

markup commands.

diff --git a/ChangeLog b/ChangeLog
index cb368afd3d5ce02e09f377db9723c17950b5532e..c56e1b001d7936693297047cdbcc26e66b32f5a9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-18  Nicolas Sceaux  <nicolas.sceaux@free.fr>
+
+       * scm/music-functions.scm (markup-expression->make-markup): fix
+       bug with cons arguments of markup commands.
+
 2005-04-18  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * SCons updates.

diff --git a/scm/music-functions.scm b/scm/music-functions.scm
index 53570933dbd76fd4668fdf08ac2809dc820e6cd2..18a083a681d5d4bb81c5529156364bdcf4504492 100644 (file)
--- a/scm/music-functions.scm
+++ b/scm/music-functions.scm
@@ -96,11 +96,11 @@ For instance,
       (symbol->keyword (string->symbol (substring cmd-markup 0 (- (string-length cmd-markup)
                                                                  (string-length "-markup")))))))
   (define (transform-arg arg)
-    (cond ((and (pair? arg) (pair? (car arg))) ;; a markup list
+    (cond ((and (pair? arg) (markup? (car arg))) ;; a markup list
           (apply append (map inner-markup->make-markup arg)))
-         ((pair? arg)                         ;; a markup
+         ((and (not (string? arg)) (markup? arg)) ;; a markup
           (inner-markup->make-markup arg))
-         (else                                ;; scheme arg
+         (else                                  ;; scheme arg
           arg)))
   (define (inner-markup->make-markup mrkup)
     (let ((cmd (proc->command-keyword (car mrkup)))