add support for specifying encoding for std xhtml sites

[lml2.git] / stdsite.lisp

diff --git a/stdsite.lisp b/stdsite.lisp
index ac3ee634cf005741b2384785877b53f7855cc18d..bc8fd1f86c017e8774803ee48b6e64b70b71db30 100644 (file)
--- a/stdsite.lisp
+++ b/stdsite.lisp
@@ -67,21 +67,21 @@
      (lml-load "final.lml_" :optional t))))
 
 
-(defmacro print-std-page (file title format &body body)
+(defmacro print-std-page (file title format encoding &body body)
   `(progn
-     (dtd-prologue ,format)
+     (dtd-prologue ,format ,encoding)
      (html
       ((:html :xmlns "http://www.w3.org/1999/xhtml")
        (std-head ,title)
        (std-body ,file ,@body)))))
 
-(defmacro std-page ((out-file title &key (format :xhtml11))
+(defmacro std-page ((out-file title &key (format :xhtml10-strict) (encoding :utf-8))
                     &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 ,format ,@body))))
+       (print-std-page (lml-file-name ',out-file :source) ,title ,format ,encoding ,@body))))
 
 (defmacro titled-pre-section (title &body body)
   `(progn
@@ -89,6 +89,3 @@
      (:h1 ,title)
      ((:pre "style" "padding-left:30pt;")
       ,@body))))
-
-
-