projects
/
lml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r5032: *** empty log message ***
[lml.git]
/
base.lisp
diff --git
a/base.lisp
b/base.lisp
index 2939200cdbd79f5c16f6878744217e53397dfb6d..2411ffd82575e87bd39989a76a9829d2d2ee0627 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.1
4 2003/04/19 03:50:12
kevin Exp $
+;;;; $Id: base.lisp,v 1.1
5 2003/05/26 14:53:33
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
;;;;
@@
-38,9
+38,8
@@
(when *print-spaces* (indent-spaces *indent* *html-output*))
(if args
(apply #'format *html-output* str args)
(when *print-spaces* (indent-spaces *indent* *html-output*))
(if args
(apply #'format *html-output* str args)
- (princ str *html-output*))
- (when *print-spaces* (format *html-output* "~%"))
- (values)))
+ (write-string str *html-output*))
+ (when *print-spaces* (write-char #\newline *html-output*))))
(defun lml-princ (s)
(princ s *html-output*))
(defun lml-princ (s)
(princ s *html-output*))
@@
-51,8
+50,11
@@
(defun lml-write-char (char)
(write-char char *html-output*))
(defun lml-write-char (char)
(write-char char *html-output*))
+(defun lml-write-string (str)
+ (write-string str *html-output*))
+
(defun lml-print-date (date)
(defun lml-print-date (date)
- (lml-
princ
(date-string date)))
+ (lml-
write-string
(date-string date)))
(defmacro lml-exec-body (&body forms)
`(progn
(defmacro lml-exec-body (&body forms)
`(progn
@@
-73,9
+75,9
@@
(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)))
(if (and (stringp ,attr) (plusp (length ,attr)))
- (format nil "~A" ,attr)
+ (format nil "
~A" ,attr)
""))
(incf *indent*)
(lml-exec-body ,@body)
""))
(incf *indent*)
(lml-exec-body ,@body)