(music-pretty-string): fix bug with string argument.

diff --git a/ChangeLog b/ChangeLog
index ba81e0c8fc6dc7137f1166370d7d5d333eaea778..d8d14f5bdc1aff07c4d101ddffe5c533456832da 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-06  Nicolas Sceaux  <nicolas.sceaux@free.fr>
+
+       * scm/music-functions.scm (music-pretty-string): fix bug with
+       string argument.
+
 2005-04-06  Jan Nieuwenhuizen  <jan.nieuwenhuizen@aspiratie.nl>
 
        * stepmake/bin/add-html-footer.py (i18n): Bugfix.

diff --git a/scm/music-functions.scm b/scm/music-functions.scm
index a71e8705695a1a21fd5644e3e880a9bf8a4a28b8..04975f577470ab6ea3b34b33391eecb9aa46a99a 100644 (file)
--- a/scm/music-functions.scm
+++ b/scm/music-functions.scm
@@ -107,7 +107,9 @@ For instance,
          (args (map transform-arg (cdr mrkup))))
       `(,cmd ,@args)))
   ;; body:
-  `(markup ,@(inner-markup->make-markup markup-expression)))
+  (if (string? markup-expression)
+      markup-expression
+      `(markup ,@(inner-markup->make-markup markup-expression))))
 
 (define (music-expression? obj)
   (ly:music? obj))
@@ -116,7 +118,9 @@ For instance,
   "Return a string describing `obj', in particular music expression
 will be printed as: (make-music 'MusicType 'property ...)"
   
-  (cond (;; markup expression
+  (cond (;; string 
+        (string? obj) (format #f "~s" obj))
+        (;; markup expression
         (markup? obj)
         (format #f "~a" (markup-expression->make-markup obj)))
        (;; music expression
@@ -146,8 +150,6 @@ will be printed as: (make-music 'MusicType 'property ...)"
                      (remove (lambda (prop)
                                (eqv? (car prop) 'origin))
                              (ly:music-mutable-properties obj)))))
-       (;; string 
-        (string? obj) (format #f "~s" obj))
        (;; symbol
         (symbol? obj) (format #f "'~a" obj))
        (;; note duration