r3979: Automatic commit for debian_version_2_2_3-1

[lml.git] / base.lisp

diff --git a/base.lisp b/base.lisp
index d90ae6256352578bcd2cec0383702ca79757296d..685382eba69f67f1a74af309b6a1a63540043205 100644 (file)
--- a/base.lisp
+++ b/base.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Aug 2002
 ;;;;
-;;;; $Id: base.lisp,v 1.5 2003/01/17 22:16:25 kevin Exp $
+;;;; $Id: base.lisp,v 1.9 2003/02/07 04:31:48 kevin Exp $
 ;;;;
 ;;;; This file, part of LML, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -73,7 +73,7 @@
 (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)
                ""))
@@ -85,7 +85,7 @@
 (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)
                "")))))
@@ -189,14 +189,14 @@
      (lml-format "~A~%" (xml-prologue-string))
      (lml-format "~A~%" (xhtml-prologue-string))))
 
-(defmacro link (dest &body body)
+(defmacro alink (dest &body body)
   `(with a :href ,dest ,@body))
 
-(defmacro link-c (class dest &body body)
+(defmacro alink-c (class dest &body body)
   `(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))
@@ -228,9 +228,9 @@
 
 (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 tr body head
-         html title pre tt u dl dt dd kbd code form))
-  (export '(link link-c br hr img input meta meta-key))
+    '(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))
   (export *macro-list*))
 
 (loop for i in *macro-list*