+2006-11-07 Kevin M. Rosenberg <kevin@rosenberg.net>
+ * stdstite.lisp, files.lisp: Add optional final and rightcol files
+
+
2006-01-17 Kevin M. Rosenberg <kevin@rosenberg.net>
* cl-lml2.asd: Apply modified patch from Gary King
so that asdf:test-op always performs test.
+cl-lml2 (1.6.0-1) unstable; urgency=low
+
+ * New upstream
+
+ -- Kevin M. Rosenberg <kmr@debian.org> Tue, 7 Nov 2006 11:25:42 -0700
+
cl-lml2 (1.5.6-1) unstable; urgency=low
* New upstream
(*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)
(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*))
;;; banner.lml_
;;; content.lml_
;;; footer.lml_
+;;; These files are optional
;;; final.lml_
+;;; rightcol.lml_
(in-package #:lml2)
(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)