X-Git-Url: http://git.kpe.io/?p=lml2.git;a=blobdiff_plain;f=htmlgen.lisp;h=39f979f7c7c832ba067aa59cd39ec58e8f4f7d17;hp=b920ec0e8baf953b19b96db5fe83c3ccd9831b01;hb=0b515edd2b706c7f5780854667a81b2d75eb2f7b;hpb=8b8f883cca7933fc7d87ffbad77f60f028ff925e diff --git a/htmlgen.lisp b/htmlgen.lisp index b920ec0..39f979f 100644 --- 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)