projects
/
lml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r5191: *** empty log message ***
[lml.git]
/
2
/
htmlgen.lisp
diff --git
a/2/htmlgen.lisp
b/2/htmlgen.lisp
index 3740158331e7eae39a9c17c4e42322dca9a0b6b3..3149977974f92978fcb5e8cfc340e7664afef3be 100644
(file)
--- a/
2/htmlgen.lisp
+++ b/
2/htmlgen.lisp
@@
-1,26
+1,24
@@
;; -*- mode: common-lisp; package: lml2 -*-
;;
;; -*- mode: common-lisp; package: lml2 -*-
;;
-;; $Id: htmlgen.lisp,v 1.
4 2003/06/24 16:30:05
kevin Exp $
+;; $Id: htmlgen.lisp,v 1.
7 2003/06/24 17:51:22
kevin Exp $
;;
;; copyright (c) 1986-2000 Franz Inc, Berkeley, CA
;; copyright (c) 2003 Kevin Rosenberg
;;
;; Main changes from Allegro version:
;;
;; copyright (c) 1986-2000 Franz Inc, Berkeley, CA
;; copyright (c) 2003 Kevin Rosenberg
;;
;; Main changes from Allegro version:
-;; - Support XHTML
-;; - lowercase symbol names
+;; - Support XHTML end tags
+;; - lowercase symbol names for attributes
+;; - Add custom tags such as :jscript, :insert-file, :nbsp
;;
;; This code is free software; you can redistribute it and/or
;; modify it under the terms of the version 2.1 of
;; the GNU Lesser General Public License as published by
;;
;; This code is free software; you can redistribute it and/or
;; modify it under the terms of the version 2.1 of
;; the GNU Lesser General Public License as published by
-;; the Free Software Foundation, as clarified by the AllegroServe
-;; prequel found in license-allegroserve.txt.
+;; the Free Software Foundation, as clarified by the LLGPL
(in-package #:lml2)
(in-package #:lml2)
-;; html generation
-
(defstruct (html-process (:type list) (:constructor
make-html-process (key has-inverse
macro special
(defstruct (html-process (:type list) (:constructor
make-html-process (key has-inverse
macro special
@@
-761,14
+759,14
@@
(def-special-html :insert-file
(named-function html-nbsp-function
(lambda (ent args argsp body)
(def-special-html :insert-file
(named-function html-nbsp-function
(lambda (ent args argsp body)
- (declare (ignore ent argsp))
+ (declare (ignore ent args
args
p))
(unless body
(error "must have a body with :insert-file"))
(unless body
(error "must have a body with :insert-file"))
- `(lml-load-path (car
,args) *html-stream*
)))
+ `(lml-load-path (car
',body)
)))
(named-function html-nbsp-print-function
(lambda (ent cmd args form subst unknown stream)
(named-function html-nbsp-print-function
(lambda (ent cmd args form subst unknown stream)
- (declare (ignore
args ent unknown subst
))
+ (declare (ignore
ent unknown subst stream args
))
(if* (eq cmd :full)
(if* (eq cmd :full)
- then (lml-load-path (ca
r args
))
+ then (lml-load-path (ca
dr form
))
else (error ":insert-file must be given an argument")))))
else (error ":insert-file must be given an argument")))))