r8596: lml2 rework

[lml2.git] / htmlgen.lisp

diff --git a/htmlgen.lisp b/htmlgen.lisp
index 8f84664ed95e0723f6a87f9ff2d3a08702c087f4..97287b2a4062a1da57c4128cdc02d52e1e6b1f09 100644 (file)
--- a/htmlgen.lisp
+++ b/htmlgen.lisp
@@ -1,6 +1,6 @@
 ;; -*- mode: common-lisp; package: lml2 -*-
 ;;
-;; $Id: htmlgen.lisp,v 1.20 2003/08/02 10:02:51 kevin Exp $
+;; $Id$
 ;;
 ;; copyright (c) 1986-2000 Franz Inc, Berkeley, CA 
 ;; copyright (c) 2003 Kevin Rosenberg
@@ -817,17 +817,17 @@
          (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 
@@ -916,26 +916,5 @@
          (write-char (cadr form) stream)
          (error ":write-char must be given an argument")))))
 
-;; fast formatter
-(def-special-html :fformat
-    (named-function html-write-char-function
-      (lambda (ent args argsp body)
-       (declare (ignore ent args argsp))
-       `(progn ,@(mapcar #'(lambda (bod)
-                             `(progn
-                               (format *html-stream* " ~(~A~)=\"" (car ,bod))
-                               (apply #'format *html-stream* (cdr ,bod))
-                               (write-char #\" *html-stream*)))
-                         body))))
-  
-  (named-function html-write-char-print-function
-    (lambda (ent cmd args form subst unknown stream)
-      (declare (ignore args ent unknown subst))
-      (assert (eql 2 (length form)))
-      (if (eq cmd :full)
-         (progn
-           (format stream " ~(~A~)=\"" (car form))
-           (apply #'format stream (cdr form))
-           (write-char #\" stream))
-         (error ":fformat must be given an argument")))))
+