;;;; 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
;;;;
;;; Page wrappers
-(defmacro with-page ((title &key css (format :html)) &rest body)
+(defmacro with-page ((title &key css (format :xhtml)) &rest body)
(case format
- (:html
+ (:xhtml
`(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>"))))))
+ (: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
- (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)
projects / kmrcl.git / blobdiff