From: Nicolas Sceaux <nicolas.sceaux@free.fr>
Date: Mon, 18 Apr 2005 21:20:10 +0000 (+0000)
Subject: (markup-expression->make-markup): fix bug with cons arguments of
X-Git-Tag: release/2.5.21~43
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=8598d35d30cd02eeab9257c64f12113c6251640e;p=lilypond.git

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

diff --git a/ChangeLog b/ChangeLog
index cb368afd3d..c56e1b001d 100644
--- 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 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)))