r8226: update to new dtd writing functions

[lml2.git] / htmlgen.lisp

diff --git a/htmlgen.lisp b/htmlgen.lisp
index 39f979f7c7c832ba067aa59cd39ec58e8f4f7d17..7ec4756dab2f877729d03b794d7849d330d04045 100644 (file)
--- a/htmlgen.lisp
+++ b/htmlgen.lisp
@@ -1,6 +1,6 @@
 ;; -*- mode: common-lisp; package: lml2 -*-
 ;;
-;; $Id: htmlgen.lisp,v 1.19 2003/07/21 18:10:00 kevin Exp $
+;; $Id$
 ;;
 ;; copyright (c) 1986-2000 Franz Inc, Berkeley, CA 
 ;; copyright (c) 2003 Kevin Rosenberg
@@ -813,19 +813,21 @@
        ;; must use <!--   --> syntax
        (declare (ignore ent args argsp))
        `(progn
+         #+ignore
          (write-string "<script language=\"JavaScript\" type=\"text/javascript\">" *html-stream*)
+         (write-string "<script type=\"text/javascript\">" *html-stream*)
          (write-char #\newline *html-stream*)
-         (write-string "//![CDATA[" *html-stream*)
+         (write-string "// <![CDATA[" *html-stream*)
          (write-char #\newline *html-stream*)
          (html ,@body)
          (write-char #\newline *html-stream*)
-         (write-string "//]]>" *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\">~%//![CDATA[~%~A~%//]]>~%</script>"
+      (format stream "<script language=\"JavaScript\" type=\"text/javascript\">~%// <![CDATA[~%~A~%// ]]>~%</script>"
              (cadr form)))))
 
 (def-special-html :nbsp