From: Nicolas Sceaux <nicolas.sceaux@free.fr>
Date: Wed, 6 Apr 2005 19:47:57 +0000 (+0000)
Subject: (music-pretty-string): fix bug with string argument.
X-Git-Tag: release/2.5.19~37
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=c7f9ff0920291af6600970116c289add61e3a852;p=lilypond.git

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

diff --git a/ChangeLog b/ChangeLog
index ba81e0c8fc..d8d14f5bdc 100644
--- 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 a71e870569..04975f5774 100644
--- 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