r5373: Auto commit for Debian build

[lml2.git] / htmlgen.lisp

diff --git a/htmlgen.lisp b/htmlgen.lisp
index b920ec0e8baf953b19b96db5fe83c3ccd9831b01..39f979f7c7c832ba067aa59cd39ec58e8f4f7d17 100644 (file)
--- a/htmlgen.lisp
+++ b/htmlgen.lisp
@@ -1,6 +1,6 @@
 ;; -*- mode: common-lisp; package: lml2 -*-
 ;;
-;; $Id: htmlgen.lisp,v 1.18 2003/07/21 16:36:22 kevin Exp $
+;; $Id: htmlgen.lisp,v 1.19 2003/07/21 18:10:00 kevin Exp $
 ;;
 ;; copyright (c) 1986-2000 Franz Inc, Berkeley, CA 
 ;; copyright (c) 2003 Kevin Rosenberg
@@ -64,23 +64,21 @@
          ((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
-          (cond
-            ((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 form res)))))))))
+          (flush-strings)
+          (push (post-process-html-forms form) res)))))))
   
 
 (defmacro html-out-stream-check (stream)