From: Nicolas Sceaux <nicolas.sceaux@free.fr>
Date: Mon, 6 Nov 2006 20:55:37 +0000 (+0000)
Subject: (markup-expression->make-markup): fix
X-Git-Tag: release/2.10.0-2~26^2~4
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=cdcafc06490dcf4affcba8a1e9fecdfc6c573d0f;p=lilypond.git

(markup-expression->make-markup): fix
the case when a markup found in a markup list is a simple
string (Issue #147).
---

diff --git a/ChangeLog b/ChangeLog
index 59680f0328..b59481a3a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-11-06  Nicolas Sceaux  <nicolas.sceaux@free.fr>
+
+	* scm/music-functions.scm (markup-expression->make-markup): fix
+	the case when a markup found in a markup list is a simple
+	string (Issue #147).
+
 2006-11-05  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
 	* lily/instrument-name-engraver.cc: 
diff --git a/scm/music-functions.scm b/scm/music-functions.scm
index 86d2f2e0dd..141bd02150 100644
--- a/scm/music-functions.scm
+++ b/scm/music-functions.scm
@@ -112,9 +112,11 @@ For instance,
 	  (else					 ;; scheme arg
 	   arg)))
   (define (inner-markup->make-markup mrkup)
-    (let ((cmd (proc->command-keyword (car mrkup)))
-	  (args (map transform-arg (cdr mrkup))))
-      `(,cmd ,@args)))
+    (if (string? mrkup)
+	`(#:simple ,mrkup)
+	(let ((cmd (proc->command-keyword (car mrkup)))
+	      (args (map transform-arg (cdr mrkup))))
+	  `(,cmd ,@args))))
   ;; body:
   (if (string? markup-expression)
       markup-expression