X-Git-Url: http://git.kpe.io/?p=lml2.git;a=blobdiff_plain;f=stdsite.lisp;h=bc8fd1f86c017e8774803ee48b6e64b70b71db30;hp=a022c4277c24ae088cdc61a2ec056c83537f666d;hb=374af1ee8a520633dd2dc9a6b004bdbba12e139b;hpb=c159f94319250e01484fbd3635f551ad6dd0c254

diff --git a/stdsite.lisp b/stdsite.lisp
index a022c42..bc8fd1f 100644
--- a/stdsite.lisp
+++ b/stdsite.lisp
@@ -22,13 +22,15 @@
 ;;;  banner.lml_
 ;;;  content.lml_
 ;;;  footer.lml_
+;;; These files are optional
 ;;;  final.lml_
+;;;  rightcol.lml_
 
 (in-package #:lml2)
 
 (defmacro std-head (title &body body)
   `(html
-    (:head 
+    (:head
      (:title (:princ ,title))
      (lml-load "header.lml_")
      ,@body)))
@@ -38,13 +40,13 @@
   (html
    ((:div :class "disclaimsec")
     (let ((src-file (make-pathname
-		     :defaults *sources-dir*
-		     :type "lml"
-		     :name (pathname-name file))))	 
+                     :defaults *sources-dir*
+                     :type "lml"
+                     :name (pathname-name file))))
       (when (probe-file src-file)
-	(html
-	 ((:div :class "lastmod")
-	  (lml-format  "Last modified: ~A" (date-string (file-write-date src-file)))))))
+        (html
+         ((:div :class "lastmod")
+          (lml-format  "Last modified: ~A" (date-string (file-write-date src-file)))))))
     (lml-load "footer.lml_"))))
 
 
@@ -53,31 +55,33 @@
     (:body
      (lml-load "banner.lml_")
      ((:table :class "stdbodytable" :border "0" :cellpadding "3")
-      (:tbody 
+      (:tbody
        ((:tr :valign "top")
-	((:td :class "stdcontentcell")
-	 (lml-load "contents.lml_"))
-	((:td :valign "top")
-	 ,@body
-	 (std-footer ,file)))))
-     (lml-load "final.lml_"))))
-  
+        ((:td :class "stdcontentcell")
+         (lml-load "contents.lml_"))
+        ((:td :valign "top")
+         ,@body
+         (std-footer ,file))
+        ((:td :valign "top")
+         (lml-load "rightcol.lml_" :optional t)))))
+     (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))
-		    &body body)
+(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))))
+                      :direction :output
+                      :if-exists :supersede)
+       (print-std-page (lml-file-name ',out-file :source) ,title ,format ,encoding ,@body))))
 
 (defmacro titled-pre-section (title &body body)
   `(progn
@@ -85,6 +89,3 @@
      (:h1 ,title)
      ((:pre "style" "padding-left:30pt;")
       ,@body))))
-
-
-