X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Flily-library.scm;h=b70af4ec535b52dee47c6682da497ebf03e12d4d;hb=c934a840cc7e7f24b7ae624b85133b41f1b5b4c7;hp=58c8720d84421e8693b8b8e42c49b82a46d1d5dd;hpb=e94023d1eda0a28353d75718d685bffb0134f347;p=lilypond.git

diff --git a/scm/lily-library.scm b/scm/lily-library.scm
index 58c8720d84..b70af4ec53 100644
--- a/scm/lily-library.scm
+++ b/scm/lily-library.scm
@@ -3,7 +3,7 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 1998--2007 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; (c) 1998--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 ;;;; Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -586,11 +586,19 @@ possibly turned off."
 ;; don't confuse users with #<procedure .. > syntax. 
 ;; 
 (define-public (scm->string val)
-  (if (and (procedure? val) (symbol? (procedure-name val)))
+  (if (and (procedure? val)
+	   (symbol? (procedure-name val)))
       (symbol->string (procedure-name val))
       (string-append
-       (if (self-evaluating? val) "" "'")
-       (call-with-output-string (lambda (port) (display val port))))))
+       (if (self-evaluating? val)
+	   (if (string? val)
+	       "\""
+	       "")
+	   "'")
+       (call-with-output-string (lambda (port) (display val port)))
+       (if (string? val)
+	   "\""
+	   ""))))
 
 (define-public (!= lst r)
   (not (= lst r)))
@@ -629,16 +637,16 @@ possibly turned off."
 
 (define-public (version-not-seen-message input-file-name)
   (ly:message
-   "~a:0: ~a: ~a" 
+   "~a:0: ~a ~a" 
     input-file-name
-    (_ "warning: ")
+    (_ "warning:")
     (format #f
 	    (_ "no \\version statement found, please add~afor future compatibility")
 	    (format #f "\n\n\\version ~s\n\n" (lilypond-version)))))
 
 (define-public (old-relative-not-used-message input-file-name)
   (ly:message
-   "~a:0: ~a: ~a" 
+   "~a:0: ~a ~a" 
     input-file-name
-    (_ "warning: ")
+    (_ "warning:")
     (_ "old relative compatibility not used")))