projects
/
lml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r4160: Auto commit for Debian build
[lml.git]
/
base.lisp
diff --git
a/base.lisp
b/base.lisp
index 577622cc0c70c367ea3d472a2ed1741fe6c74623..20a1677c3abde47a40baef1df288c877d8208e8b 100644
(file)
--- a/
base.lisp
+++ b/
base.lisp
@@
-7,7
+7,7
@@
;;;; Programmer: Kevin M. Rosenberg
;;;; Date Started: Aug 2002
;;;;
;;;; Programmer: Kevin M. Rosenberg
;;;; Date Started: Aug 2002
;;;;
-;;;; $Id: base.lisp,v 1.
6 2003/01/26 21:35:27
kevin Exp $
+;;;; $Id: base.lisp,v 1.
12 2003/03/05 04:25:09
kevin Exp $
;;;;
;;;; This file, part of LML, is Copyright (c) 2002 by Kevin M. Rosenberg
;;;;
;;;;
;;;; This file, part of LML, is Copyright (c) 2002 by Kevin M. Rosenberg
;;;;
@@
-26,7
+26,7
@@
"<?xml version=\"1.0\" encoding=\"iso-8859-1\" standalone=\"yes\"?>")
(defun xhtml-prologue-string ()
"<?xml version=\"1.0\" encoding=\"iso-8859-1\" standalone=\"yes\"?>")
(defun xhtml-prologue-string ()
- "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.
0 Strict
//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">")
+ "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.
1
//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">")
(defvar *print-spaces* nil)
(defvar *indent* 0)
(defvar *print-spaces* nil)
(defvar *indent* 0)
@@
-49,7
+49,7
@@
(format *html-output* "~A~%" s))
(defun lml-write-char (char)
(format *html-output* "~A~%" s))
(defun lml-write-char (char)
- (write-char char *html-output))
+ (write-char char *html-output
*
))
(defun lml-print-date (date)
(lml-princ (date-string date)))
(defun lml-print-date (date)
(lml-princ (date-string date)))
@@
-73,7
+73,7
@@
(defmacro with-attr-string (tag attr-string &body body)
(let ((attr (gensym)))
`(let ((,attr ,attr-string))
(defmacro with-attr-string (tag attr-string &body body)
(let ((attr (gensym)))
`(let ((,attr ,attr-string))
- (lml-format "<~(~A~)~A>" ',tag
+ (lml-format "<~(~A~)
~A>" ',tag
(if (and (stringp ,attr) (plusp (length ,attr)))
(format nil "~A" ,attr)
""))
(if (and (stringp ,attr) (plusp (length ,attr)))
(format nil "~A" ,attr)
""))
@@
-85,7
+85,7
@@
(defmacro with-no-endtag-attr-string (tag attr-string)
(let ((attr (gensym)))
`(let ((,attr ,attr-string))
(defmacro with-no-endtag-attr-string (tag attr-string)
(let ((attr (gensym)))
`(let ((,attr ,attr-string))
- (lml-format "<~(~A~)~A />" ',tag
+ (lml-format "<~(~A~)
~A />" ',tag
(if (and (stringp ,attr) (plusp (length ,attr)))
(format nil "~A" ,attr)
"")))))
(if (and (stringp ,attr) (plusp (length ,attr)))
(format nil "~A" ,attr)
"")))))
@@
-189,23
+189,23
@@
(lml-format "~A~%" (xml-prologue-string))
(lml-format "~A~%" (xhtml-prologue-string))))
(lml-format "~A~%" (xml-prologue-string))
(lml-format "~A~%" (xhtml-prologue-string))))
-(defmacro link (dest &body body)
+(defmacro
a
link (dest &body body)
`(with a :href ,dest ,@body))
`(with a :href ,dest ,@body))
-(defmacro link-c (class dest &body body)
+(defmacro
a
link-c (class dest &body body)
`(with a :href ,dest :class (quote ,class) ,@body))
(defmacro img (dest &rest args)
`(with a :href ,dest :class (quote ,class) ,@body))
(defmacro img (dest &rest args)
- `(with-no-endtag :src ,dest ,@args))
+ `(with-no-endtag
img
:src ,dest ,@args))
(defmacro input (&rest args)
`(with-no-endtag input ,@args))
(defmacro input (&rest args)
`(with-no-endtag input ,@args))
-(defmacro
meta (name content
)
- `(with
meta :name ,name :content ,content
))
+(defmacro
link (&rest args
)
+ `(with
-no-endtag link ,@args
))
-(defmacro meta
-key (&key name content http-equiv
)
- `(with
meta :name ,name :content ,content :http-equiv ,http-equiv
))
+(defmacro meta
(&rest args
)
+ `(with
-no-endtag meta ,@args
))
(defmacro br (&rest args)
`(with-no-endtag br ,@args))
(defmacro br (&rest args)
`(with-no-endtag br ,@args))
@@
-230,7
+230,7
@@
(defparameter *macro-list*
'(a div span h1 h2 h3 h4 h5 h6 i b p li ul ol table tbody td th tr body head
html title pre tt u dl dt dd kbd code form textarea))
(defparameter *macro-list*
'(a div span h1 h2 h3 h4 h5 h6 i b p li ul ol table tbody td th tr body head
html title pre tt u dl dt dd kbd code form textarea))
- (export '(
link link-c br hr img input meta
meta-key))
+ (export '(
alink alink br hr img input meta link
meta-key))
(export *macro-list*))
(loop for i in *macro-list*
(export *macro-list*))
(loop for i in *macro-list*