r5182: *** empty log message ***

[lml2.git] / htmlgen.lisp

diff --git a/htmlgen.lisp b/htmlgen.lisp
index fdb76f1c35b1a5745ca8da79ff638592e75b1566..e315b270368f24f7907d58372b851bce5dd39a4f 100644 (file)
--- a/htmlgen.lisp
+++ b/htmlgen.lisp
@@ -1,6 +1,6 @@
 ;; -*- mode: common-lisp; package: lml2 -*-
 ;;
-;; $Id: htmlgen.lisp,v 1.1 2003/06/20 04:12:29 kevin Exp $
+;; $Id: htmlgen.lisp,v 1.3 2003/06/24 01:12:17 kevin Exp $
 ;;
 ;; copyright (c) 1986-2000 Franz Inc, Berkeley, CA 
 ;; copyright (c) 2003 Kevin Rosenberg
@@ -727,12 +727,33 @@
       (lambda (ent args argsp body)
        ;; must use <!--   --> syntax
        (declare (ignore ent args argsp))
-       `(progn (write-string "<script language=\"JavasSript\" type=\"text/javascript\">"
-                *html-stream*)
-               (html ,@body)
-               (write-string "</script>" *html-stream*))))
+       `(progn
+         (write-string "<script language=\"JavasSript\" type=\"text/javascript\">" *html-stream*)
+         (write-char #\newline *html-stream*)
+         (write-string "//![CDATA[" *html-stream*)
+         (write-char #\newline *html-stream*)
+         (html ,@body)
+         (write-char #\newline *html-stream*)
+         (write-string "//]]>" *html-stream*)
+         (write-char #\newline *html-stream*)
+         (write-string "</script>" *html-stream*))))
   (named-function html-comment-print-function
     (lambda (ent cmd args form subst unknown stream)
       (declare (ignore ent cmd args subst unknown))
-      (format stream "<script language=\"JavaScript\" type=\"text/javascript\">~A</script>"
+      (format stream "<script language=\"JavaScript\" type=\"text/javascript\">~%//![CDATA[~%~A~%//]]>~%</script>"
              (cadr form)))))
+
+(def-special-html :nbsp 
+    (named-function html-nbsp-function
+      (lambda (ent args argsp body)
+       (declare (ignore ent args argsp))
+       (when body
+         (error "can't have a body with :nbsp -- body is ~s" body))
+       `(write-string "&nbsp;" *html-stream*)))
+  
+  (named-function html-nbsp-print-function
+    (lambda (ent cmd args form subst unknown stream)
+      (declare (ignore args ent unknown subst))
+      (if* (eq cmd :set)
+        then (write-string "&nbsp;" stream)
+        else (error ":nbsp in an illegal place: ~s" form)))))