From: Kevin M. Rosenberg Date: Mon, 26 May 2003 14:53:33 +0000 (+0000) Subject: r5032: *** empty log message *** X-Git-Tag: v2.5.5~95 X-Git-Url: http://git.kpe.io/?a=commitdiff_plain;h=e0fde65db4134d8a1f369d95aa8a04edf3c728f2;p=lml.git r5032: *** empty log message *** --- diff --git a/base.lisp b/base.lisp index 2939200..2411ffd 100644 --- a/base.lisp +++ b/base.lisp @@ -7,7 +7,7 @@ ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Aug 2002 ;;;; -;;;; $Id: base.lisp,v 1.14 2003/04/19 03:50:12 kevin Exp $ +;;;; $Id: base.lisp,v 1.15 2003/05/26 14:53:33 kevin Exp $ ;;;; ;;;; 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) - (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*)) @@ -51,8 +50,11 @@ (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) - (lml-princ (date-string date))) + (lml-write-string (date-string date))) (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)) - (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) "")) (incf *indent*) (lml-exec-body ,@body) diff --git a/debian/changelog b/debian/changelog index 2e704d0..4275e42 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +cl-lml (2.4.1-1) unstable; urgency=low + + * New upstream, export *print-spaces*.xs + + -- Kevin M. Rosenberg Fri, 23 May 2003 09:39:28 -0600 + cl-lml (2.4.0-1) unstable; urgency=low * Move read-macro to it's own file. diff --git a/package.lisp b/package.lisp index 0c02e84..f919107 100644 --- a/package.lisp +++ b/package.lisp @@ -7,7 +7,7 @@ ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Aug 2002 ;;;; -;;;; $Id: package.lisp,v 1.4 2003/01/17 22:16:25 kevin Exp $ +;;;; $Id: package.lisp,v 1.5 2003/05/26 14:53:33 kevin Exp $ ;;;; ;;;; This file, part of LML, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; @@ -24,6 +24,7 @@ (:export ;; base.lisp + #:*print-spaces* #:reset-indent #:with #:print-page @@ -32,6 +33,7 @@ #:lml-print #:lml-princ #:lml-write-char + #:lml-write-string #:lml-print-date #:*html-output*