;;;; Programmer: Kevin M. Rosenberg
;;;; Date Started: Aug 2002
;;;;
-;;;; $Id: base.lisp,v 1.10 2003/02/10 19:49:18 kevin Exp $
+;;;; $Id: base.lisp,v 1.13 2003/03/23 18:38:16 kevin Exp $
;;;;
;;;; This file, part of LML, is Copyright (c) 2002 by Kevin M. Rosenberg
;;;;
(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)))
(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)
- "")))))
+ (format nil " ~A" ,attr)
+ "")))))
(defun one-keyarg-string (key value)
"Return attribute string for keys"
(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))
(eval-when (:compile-toplevel :load-toplevel :execute)
(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 link))
- (export '(alink alink-c br hr img input meta meta-key))
+ html title pre tt u dl dt dd kbd code form textarea))
+ (export '(alink alink br hr img input meta link meta-key))
(export *macro-list*))
(loop for i in *macro-list*