r5176: *** empty log message ***

diff --git a/htmlgen.lisp b/htmlgen.lisp
index fdb76f1c35b1a5745ca8da79ff638592e75b1566..d773748cb71c329a258c43db01777881dd32df88 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.2 2003/06/23 20:08:06 kevin Exp $
 ;;
 ;; copyright (c) 1986-2000 Franz Inc, Berkeley, CA 
 ;; copyright (c) 2003 Kevin Rosenberg
@@ -727,12 +727,18 @@
       (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)))))

diff --git a/stdsite.lisp b/stdsite.lisp
index 49610e0eaa849a3504943ae72d729003e80104f7..0870163a98806610741d9e6200d079b0ba9c13be 100644 (file)
--- a/stdsite.lisp
+++ b/stdsite.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Aug 2002
 ;;;;
-;;;; $Id: stdsite.lisp,v 1.2 2003/06/20 04:46:54 kevin Exp $
+;;;; $Id: stdsite.lisp,v 1.3 2003/06/23 20:08:06 kevin Exp $
 ;;;;
 ;;;; This file, part of LML2, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -45,8 +45,7 @@
        (html
         ((:div :class "lastmod")
          (lml-format  "Last modified: ~A" (date-string (file-write-date src-file)))))))
-    (when (probe-file "footer.lml_")
-      (lml-load "footer.lml_")))))
+    (lml-load "footer.lml_"))))
 
 
 (defmacro std-body (file &body body)