projects
/
kmrcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r3074: *** empty log message ***
[kmrcl.git]
/
web-utils-aserve.lisp
diff --git
a/web-utils-aserve.lisp
b/web-utils-aserve.lisp
index 21d1b55f9c7c434c9a74f86d6f6cf434a599175e..19ed28c5d92997bce5ada3f8d9df283a42e740d2 100644
(file)
--- a/
web-utils-aserve.lisp
+++ b/
web-utils-aserve.lisp
@@
-8,7
+8,7
@@
;;;; Programmer: Kevin M. Rosenberg
;;;; Date Started: Apr 2000
;;;;
;;;; Programmer: Kevin M. Rosenberg
;;;; Date Started: Apr 2000
;;;;
-;;;; $Id: web-utils-aserve.lisp,v 1.
6 2002/10/16 21:58:49
kevin Exp $
+;;;; $Id: web-utils-aserve.lisp,v 1.
7 2002/10/16 22:56:07
kevin Exp $
;;;;
;;;; This file, part of KMRCL, is Copyright (c) 2002 by Kevin M. Rosenberg
;;;;
;;;;
;;;; This file, part of KMRCL, is Copyright (c) 2002 by Kevin M. Rosenberg
;;;;
@@
-97,27
+97,34
@@
;;; Page wrappers
;;; Page wrappers
-(defmacro with-page ((title &key css (format :html)) &rest body)
+(defmacro with-page ((title &key css (format :
x
html)) &rest body)
(case format
(case format
- (:html
+ (:
x
html
`(prog1
(progn
(net.html.generator:html
`(prog1
(progn
(net.html.generator:html
- (print-http "<?xml version=\"1.0\" standalone=\"yes\"?>")
- (print-http "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\"")
- (print-http " \"http://www.w3c.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">")
- (print-http "")
+ (print-http *standard-xhtml-header*)
(print-http "<html xmlns=\"http://www.w3.org/1999/xhtml\">")
(head ,title :css ,css)
(print-http "<body>")
(prog1
,@body
(print-http "</body></html>"))))))
(print-http "<html xmlns=\"http://www.w3.org/1999/xhtml\">")
(head ,title :css ,css)
(print-http "<body>")
(prog1
,@body
(print-http "</body></html>"))))))
+ (:html
+ `(prog1
+ (progn
+ (net.html.generator:html
+ (print-http *standard-html-header*)
+ (head ,title :css ,css)
+ (print-http "<body>")
+ (prog1
+ ,@body
+ (print-http "</body></html>"))))))
(:xml
`(prog1
(progn
(net.html.generator:html
(:xml
`(prog1
(progn
(net.html.generator:html
- (princ-http
(std-xml-header))
+ (princ-http
*standard-xml-header*
(princ-http "<pagedata xmlns:xlink=\"http://www.w3.org/1999/xlink\" xmlns:html=\"http://www.w3.org/TR/REC-html40\">"))
(with-tag "pagetitle" (princ-http ,title))
,@body)
(princ-http "<pagedata xmlns:xlink=\"http://www.w3.org/1999/xlink\" xmlns:html=\"http://www.w3.org/TR/REC-html40\">"))
(with-tag "pagetitle" (princ-http ,title))
,@body)