r11296: add optional final rightcol files

[lml2.git] / stdsite.lisp

diff --git a/stdsite.lisp b/stdsite.lisp
index 259bb80da1d6fbc0b95f02350cd3cd5c3d268ded..14fb961b02c8c45aa7b12f3be82af361e9164b62 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.7 2003/07/12 17:54:05 kevin Exp $
+;;;; $Id$
 ;;;;
 ;;;; This file, part of LML2, is Copyright (c) 2000-2003 by Kevin Rosenberg.
 ;;;; Rights of modification and redistribution are in the LICENSE file.
@@ -22,6 +22,9 @@
 ;;;  banner.lml_
 ;;;  content.lml_
 ;;;  footer.lml_
+;;; These files are optional
+;;;  final.lml_
+;;;  rightcol.lml_
 
 (in-package #:lml2)
 
@@ -58,7 +61,10 @@
         (lml-load "contents.lml_"))
        ((:td :valign "top")
         ,@body
-        (std-footer ,file))))))))
+        (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)
@@ -72,10 +78,10 @@
 (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)
+     (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 ,@body))))
 
 (defmacro titled-pre-section (title &body body)
   `(progn