r8596: lml2 rework

[lml2.git] / htmlgen.lisp

diff --git a/htmlgen.lisp b/htmlgen.lisp
index 6a3650d69c84ca434533bcf6ab7c08ae179ed88a..97287b2a4062a1da57c4128cdc02d52e1e6b1f09 100644 (file)
--- a/htmlgen.lisp
+++ b/htmlgen.lisp
@@ -1,6 +1,6 @@
 ;; -*- mode: common-lisp; package: lml2 -*-
 ;;
-;; $Id: htmlgen.lisp,v 1.16 2003/07/15 21:49:36 kevin Exp $
+;; $Id$
 ;;
 ;; copyright (c) 1986-2000 Franz Inc, Berkeley, CA 
 ;; copyright (c) 2003 Kevin Rosenberg
@@ -44,8 +44,42 @@
   )
 
 (defmacro html (&rest forms &environment env)
-  ;; just emit html to the current stream
-  (process-html-forms forms env))
+  (post-process-html-forms
+   (process-html-forms forms env)))
+
+(defun post-process-html-forms (input-forms)
+  "KMR: Walk through forms and combine write-strings"
+  (let (res strs last-stream)
+    (flet ((flush-strings ()
+            (when strs
+              (push `(write-string ,strs ,last-stream) res)
+              (setq strs nil)
+              (setq last-stream nil))))             
+      (do* ((forms input-forms (cdr forms))
+           (form (car forms) (car forms)))
+          ((null forms)
+           (flush-strings)
+           (nreverse res))
+       (cond
+         ((atom form)
+          (flush-strings)
+          (push form res))
+         ((and (eq (car form) 'cl:write-string)
+               (stringp (cadr form)))
+          (if strs
+              (if (eq last-stream (third form))
+                  (setq strs (concatenate 'string strs (second form)))
+                  (progn
+                    (flush-strings)
+                    (setq strs (second form))
+                    (setq last-stream (third form))))
+              (progn
+                (setq strs (second form))
+                (setq last-stream (third form)))))
+         (t
+          (flush-strings)
+          (push (post-process-html-forms form) res)))))))
+  
 
 (defmacro html-out-stream-check (stream)
   ;; ensure that a real stream is passed to this function
@@ -779,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 
@@ -850,9 +886,11 @@
     (named-function html-write-string-function
       (lambda (ent args argsp body)
        (declare (ignore ent args argsp))
-       `(progn ,@(mapcar #'(lambda (bod)
-                             `(write-string ,bod *html-stream*))
-                         body))))
+       (if (= (length body) 1)
+           `(write-string ,(car body) *html-stream*)
+         `(progn ,@(mapcar #'(lambda (bod)
+                               `(write-string ,bod *html-stream*))
+                           body)))))
   
   (named-function html-write-string-print-function
     (lambda (ent cmd args form subst unknown stream)
@@ -878,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")))))
+