X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=base.lisp;h=4a03e71632aa245ba6cd35bccd957a553d3bad60;hb=b2d601fcc40acb08a61cb3607f4455bfbd3126fc;hp=d90ae6256352578bcd2cec0383702ca79757296d;hpb=75603625f58acaa4e23baca99712d4d098be43d0;p=lml.git diff --git a/base.lisp b/base.lisp index d90ae62..4a03e71 100644 --- 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.11 2003/02/17 06:48:46 kevin Exp $ ;;;; ;;;; This file, part of LML, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; @@ -26,7 +26,7 @@ "") (defun xhtml-prologue-string () - "") + "") (defvar *print-spaces* nil) (defvar *indent* 0) @@ -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,23 +189,23 @@ (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)) -(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)) @@ -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)) + (export '(alink alink br hr img input meta link meta-key)) (export *macro-list*)) (loop for i in *macro-list*