X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=web-utils-aserve.lisp;h=19ed28c5d92997bce5ada3f8d9df283a42e740d2;hb=3f50791d43f83b9141e4022ce1fd2460edf62436;hp=21d1b55f9c7c434c9a74f86d6f6cf434a599175e;hpb=4a7372ef4000eaaa86a987bc9668ccecf7d0489f;p=kmrcl.git diff --git a/web-utils-aserve.lisp b/web-utils-aserve.lisp index 21d1b55..19ed28c 100644 --- a/web-utils-aserve.lisp +++ b/web-utils-aserve.lisp @@ -8,7 +8,7 @@ ;;;; 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 ;;;; @@ -97,27 +97,34 @@ ;;; 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 "") - (print-http "") - (print-http "") + (print-http *standard-xhtml-header*) (print-http "") (head ,title :css ,css) (print-http "") (prog1 ,@body (print-http "")))))) + (:html + `(prog1 + (progn + (net.html.generator:html + (print-http *standard-html-header*) + (head ,title :css ,css) + (print-http "") + (prog1 + ,@body + (print-http "")))))) (:xml `(prog1 (progn (net.html.generator:html - (princ-http (std-xml-header)) + (princ-http *standard-xml-header* (princ-http "")) (with-tag "pagetitle" (princ-http ,title)) ,@body)