From dfc85537dbdebfd84d037b517905df8598d9833f Mon Sep 17 00:00:00 2001 From: nsceaux Date: Mon, 18 Apr 2005 21:20:10 +0000 Subject: [PATCH] (markup-expression->make-markup): fix bug with cons arguments of markup commands. --- ChangeLog | 5 +++++ scm/music-functions.scm | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index cb368afd3d..c56e1b001d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-04-18 Nicolas Sceaux + + * scm/music-functions.scm (markup-expression->make-markup): fix + bug with cons arguments of markup commands. + 2005-04-18 Jan Nieuwenhuizen * SCons updates. diff --git a/scm/music-functions.scm b/scm/music-functions.scm index 53570933db..18a083a681 100644 --- 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))) -- 2.39.5