projects
/
lml2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r5306: add new attribute commands
[lml2.git]
/
stdsite.lisp
diff --git
a/stdsite.lisp
b/stdsite.lisp
index 49610e0eaa849a3504943ae72d729003e80104f7..259bb80da1d6fbc0b95f02350cd3cd5c3d268ded 100644
(file)
--- a/
stdsite.lisp
+++ b/
stdsite.lisp
@@
-7,19
+7,18
@@
;;;; Programmer: Kevin M. Rosenberg
;;;; Date Started: Aug 2002
;;;;
;;;; Programmer: Kevin M. Rosenberg
;;;; Date Started: Aug 2002
;;;;
-;;;; $Id: stdsite.lisp,v 1.
2 2003/06/20 04:46:54
kevin Exp $
+;;;; $Id: stdsite.lisp,v 1.
7 2003/07/12 17:54:05
kevin Exp $
;;;;
;;;;
-;;;; This file, part of LML2, is Copyright (c) 2002 by Kevin M. Rosenberg
+;;;; This file, part of LML2, is Copyright (c) 2000-2003 by Kevin Rosenberg.
+;;;; Rights of modification and redistribution are in the LICENSE file.
;;;;
;;;;
-;;;; LML2 users are granted the rights to distribute and use this software
-;;;; as governed by the terms of the GNU General Public License v2
-;;;; (http://www.gnu.org/licenses/gpl.html)
;;;; *************************************************************************
;;;; *************************************************************************
+
;;; A "standard site" is a format for a certain style of web page.
;;; It is based on the LML2 package.
;;; A stdsite page expects to include the following files:
;;; A "standard site" is a format for a certain style of web page.
;;; It is based on the LML2 package.
;;; A stdsite page expects to include the following files:
-;;; head.lml_
+;;; head
er
.lml_
;;; banner.lml_
;;; content.lml_
;;; footer.lml_
;;; banner.lml_
;;; content.lml_
;;; footer.lml_
@@
-30,7
+29,7
@@
`(html
(:head
(:title (:princ ,title))
`(html
(:head
(:title (:princ ,title))
- (lml-load "head.lml_")
+ (lml-load "head
er
.lml_")
,@body)))
,@body)))
@@
-45,8
+44,7
@@
(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)))))))
- (when (probe-file "footer.lml_")
- (lml-load "footer.lml_")))))
+ (lml-load "footer.lml_"))))
(defmacro std-body (file &body body)
(defmacro std-body (file &body body)
@@
-63,20
+61,21
@@
(std-footer ,file))))))))
(std-footer ,file))))))))
-(defmacro print-std-page (file title &body body)
+(defmacro print-std-page (file title
format
&body body)
`(progn
`(progn
-
(xhtml-prologue
)
- (html
- ((:html :xmlns "http://www.w3.org/1999/xhtml")
- (std-head ,title)
- (std-body ,file ,@body)))))
+
(dtd-prologue ,format
)
+
(html
+
((:html :xmlns "http://www.w3.org/1999/xhtml")
+
(std-head ,title)
+
(std-body ,file ,@body)))))
-(defmacro std-page (out-file title &body body)
+(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)
:direction :output
:if-exists :supersede)
`(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 ,@body))))
+ (print-std-page (lml-file-name ,out-file :source) ,title ,
format ,
@body))))
(defmacro titled-pre-section (title &body body)
`(progn
(defmacro titled-pre-section (title &body body)
`(progn