safer quoting

js.scm

@@ -23,14 +23,23 @@
    (string-join (hash-map scheme-hash (lambda (k v) (format "~A:~A" (js-quote k) v)))
                 ", ")
    "}"))
-
+  
 (define (js-quote thing)
   (cond ((number? thing) (number->string thing))
-        ((or (string? thing) (symbol? thing)) (format "'~A'" thing))
+        ((or (string? thing) (symbol? thing))
+         (format "\"~A\"" (careful-string-quote (if (string? thing)
+                                                    thing
+                                                    (symbol->string thing)))))
         ((eq? thing #t) "true")
         ((eq? thing #f) "false")
         (else (e "Don't know how to js-quote ~A." thing))))
 
+(define (careful-string-quote scm-str)
+  (pregexp-replace-many scm-str
+                        ("\n" => "  ")
+                        ("\r" => "  ")
+                        ("\"" => "'")))
+
 (define (js-call-on-load fn-name #:quote-all (quote-all #f) . args)
   (format "$(document).ready(function() { ~A })"
           (apply js-call fn-name #:quote-all quote-all args)))