From b2d510a883e1e45b30a910d3deb4074858ef8474 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Tue, 7 Nov 2006 18:27:21 +0000 Subject: [PATCH] r11296: add optional final rightcol files --- 2/ChangeLog | 4 ++++ 2/debian/changelog | 6 ++++++ 2/files.lisp | 9 +++++---- 2/stdsite.lisp | 8 ++++++-- 4 files changed, 21 insertions(+), 6 deletions(-) diff --git a/2/ChangeLog b/2/ChangeLog index dc8a5ce..2f1b10f 100644 --- a/2/ChangeLog +++ b/2/ChangeLog @@ -1,3 +1,7 @@ +2006-11-07 Kevin M. Rosenberg + * stdstite.lisp, files.lisp: Add optional final and rightcol files + + 2006-01-17 Kevin M. Rosenberg * cl-lml2.asd: Apply modified patch from Gary King so that asdf:test-op always performs test. diff --git a/2/debian/changelog b/2/debian/changelog index 4acac63..a3476c2 100644 --- a/2/debian/changelog +++ b/2/debian/changelog @@ -1,3 +1,9 @@ +cl-lml2 (1.6.0-1) unstable; urgency=low + + * New upstream + + -- Kevin M. Rosenberg Tue, 7 Nov 2006 11:25:42 -0700 + cl-lml2 (1.5.6-1) unstable; urgency=low * New upstream diff --git a/2/files.lisp b/2/files.lisp index db1a9b1..9c5dd2e 100644 --- a/2/files.lisp +++ b/2/files.lisp @@ -55,13 +55,14 @@ (*sources-dir* ,sources-dir)) ,@body)))) -(defun lml-load-path (file) +(defun lml-load-path (file &key optional) (if (probe-file file) (with-open-file (in file :direction :input) (do ((form (read in nil 'eof) (read in nil 'eof))) ((eq form 'eof)) (eval form))) - (format *trace-output* "Warning: unable to load LML file ~S" file))) + (unless optional + (format *trace-output* "Warning: unable to load LML file ~S" file)))) (defun process-dir (dir &key sources) (with-dir (dir :sources sources) @@ -73,8 +74,8 @@ (format *trace-output* "~&; Processing ~A~%" file) (lml-load-path file))))) -(defun lml-load (file) - (lml-load-path (eval `(lml-file-name ,file :source)))) +(defun lml-load (file &key optional) + (lml-load-path (eval `(lml-file-name ,file :source)) :optional optional)) (defun insert-file (file) (print-file-contents file *html-stream*)) diff --git a/2/stdsite.lisp b/2/stdsite.lisp index a022c42..14fb961 100644 --- a/2/stdsite.lisp +++ b/2/stdsite.lisp @@ -22,7 +22,9 @@ ;;; banner.lml_ ;;; content.lml_ ;;; footer.lml_ +;;; These files are optional ;;; final.lml_ +;;; rightcol.lml_ (in-package #:lml2) @@ -59,8 +61,10 @@ (lml-load "contents.lml_")) ((:td :valign "top") ,@body - (std-footer ,file))))) - (lml-load "final.lml_")))) + (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) -- 2.34.1