X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=2%2Fhtmlgen.lisp;h=97287b2a4062a1da57c4128cdc02d52e1e6b1f09;hb=28ffbb681a9e3af53d604e65eb68684e411e2be6;hp=b920ec0e8baf953b19b96db5fe83c3ccd9831b01;hpb=da72d5a589184915325d1aae5552a8baa9bfeb94;p=lml.git
diff --git a/2/htmlgen.lisp b/2/htmlgen.lisp
index b920ec0..97287b2 100644
--- a/2/htmlgen.lisp
+++ b/2/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$
;;
;; 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)
@@ -815,19 +813,21 @@
;; must use syntax
(declare (ignore ent args argsp))
`(progn
+ #+ignore
(write-string "" *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 ""
+ (format stream ""
(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")))))
+