(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 59680f0328c399e4eeff0d82fc119df9ca5a22b7..b59481a3a783796a92367d17e5382b51be362574 100644 (file)
--- 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 86d2f2e0ddd5a509acc3e900ed40ac46e511225d..141bd02150fa678e2f4213c87cc07a7d94ed0cad 100644 (file)
--- 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