r5177: *** empty log message ***

[lml2.git] / stdsite.lisp

diff --git a/stdsite.lisp b/stdsite.lisp
index 0870163a98806610741d9e6200d079b0ba9c13be..c7b96d7a4ec26ed9073a12c16bf321376f7b0cd2 100644 (file)
--- a/stdsite.lisp
+++ b/stdsite.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Aug 2002
 ;;;;
-;;;; $Id: stdsite.lisp,v 1.3 2003/06/23 20:08:06 kevin Exp $
+;;;; $Id: stdsite.lisp,v 1.4 2003/06/23 20:37:43 kevin Exp $
 ;;;;
 ;;;; This file, part of LML2, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -62,20 +62,21 @@
         (std-footer ,file))))))))
   
 
-(defmacro print-std-page (file title &body body)
+(defmacro print-std-page (file title format &body body)
   `(progn
-    (xhtml-prologue)
-    (html
-     ((:html :xmlns "http://www.w3.org/1999/xhtml")
-      (std-head ,title)
-      (std-body ,file ,@body)))))
+     (html-prologue ,format)
+     (html
+      ((:html :xmlns "http://www.w3.org/1999/xhtml")
+       (std-head ,title)
+       (std-body ,file ,@body)))))
 
-(defmacro std-page (out-file title &body body)
+(defmacro std-page ((out-file title &key (format :xhtml11))
+                   &body body)
   `(let ((*indent* 0))
      (with-open-file (*html-stream* (lml-file-name ,out-file :output)
                      :direction :output
                      :if-exists :supersede)
-       (print-std-page (lml-file-name ,out-file :source) ,title ,@body))))
+       (print-std-page (lml-file-name ,out-file :source) ,title ,format ,@body))))
 
 (defmacro titled-pre-section (title &body body)
   `(progn