Changeset main,3

Timestamp:

02/05/2008 07:03:19 PM (18 years ago)

Author:

David Owen <dsowen@…>

branch-nick:

tags

revision id:

dsowen@fugue88.ws-20080205190319-ua05iw3kwktv81m1

Message:

• Added ASDF file.
• Redirect output to *TAG-OUT*.

Location:

main

Files:

• dso-tags.asd (added)
• tags.lisp (modified) (4 diffs)

main/tags.lisp

@@ -1 +1 @@
 (defpackage #:dso-tags
-  (:use #:cl)
-  (:export #:expand-tag #:render-tag #:render #:do-body))
+  (:use #:cl #:cl-ppcre)
+  (:export #:*tag-out* #:expand-tag #:render-tag #:do-body))
 
 (in-package #:dso-tags)
@@ -7 +7 @@
 
 
-(defvar *tag-out* nil)
+(defvar *tag-out* t)
 
 
@@ -34 +34 @@
     (etypecase item
       (string
-       (format t "~A" item))
+       (format *tag-out* "~A" (regex-replace-all "([^ ])  ([^ ])" item "\\1  \\2")))
       (list
        (multiple-value-bind (tag-name tag-body tag-attrs) (break-tag item)
@@ -46 +46 @@
 (defun render-empty-tag (tag body args)
   (assert (null body))
-  (format t "<~(~A~)~{ ~(~A~)='~A'~}/>" tag args))
+  (format *tag-out* "<~(~A~)~{ ~(~A~)='~A'~}/>" tag args))
 
 (defun render-simple-tag (tag body args)
   (if body
       (progn
-        (format t "<~(~A~)~{ ~(~A~)='~A'~}>" tag args)
+        (format *tag-out* "<~(~A~)~{ ~(~A~)='~A'~}>" tag args)
         (do-body body)
-        (format t "</~(~A~)>" tag))
+        (format *tag-out* "</~(~A~)>" tag))
       (render-empty-tag tag body args)))