Fix attribute bugs: tests 1 to 7 working.

* who.tl (convert-attributes): In the run-time case,
we must generate code to print the calculated
string, not just to calculate it.
(convert-tag-to-string-list): Test the original tag
keyword against the *html-empty-tags*, not the
transformed string.

* test/simple.tl: Port and enable tests 1 to 7.

1 files changed, 38 insertions, 36 deletions

diff --git a/test/simple.tl b/test/simple.tl
index 1100f25..17dfd87 100644
--- a/test/simple.tl
+++ b/test/simple.tl
@@ -26,60 +26,62 @@
                  :br))))
       "<a href='http://zappa.com/'><b>Frank Zappa</b></a><br /><a href='http://marcusmiller.com/'><b>Marcus Miller</b></a><br /><a href='http://www.milesdavis.com/'><b>Miles Davis</b></a><br />")
 
-(exit)
-
 ;;; 2
-(string= (with-output-to-string (out)
-           (with-html-output (out nil)
-             (loop for (link . title) in '(("http://zappa.com/" . "Frank Zappa")
-                                           ("http://marcusmiller.com/" . "Marcus Miller")
-                                           ("http://www.milesdavis.com/" . "Miles Davis"))
-                   do (htm (:a :href link
-                            (:b (str title)))
-                           :br))))
+(test (with-out-string-stream (out)
+        (with-html-output (out nil)
+          (keep-matches ((@link . @title) '(("http://zappa.com/" . "Frank Zappa")
+                                            ("http://marcusmiller.com/" . "Marcus Miller")
+                                            ("http://www.milesdavis.com/" . "Miles Davis")))
+            (htm (:a :href link
+                     (:b (str title)))
+                 :br))))
          "<a href='http://zappa.com/'><b>Frank Zappa</b></a><br /><a href='http://marcusmiller.com/'><b>Marcus Miller</b></a><br /><a href='http://www.milesdavis.com/'><b>Miles Davis</b></a><br />")
 
 ;;; 3
-(string= (with-output-to-string (foo)
-           (with-html-output (out foo)
-             (loop for (link . title) in '(("http://zappa.com/" . "Frank Zappa")
-                                           ("http://marcusmiller.com/" . "Marcus Miller")
-                                           ("http://www.milesdavis.com/" . "Miles Davis"))
-                   do (htm (:a :href link
-                            (:b (str title)))
-                           :br))))
+(test (with-out-string-stream (foo)
+        (with-html-output (out foo)
+          (keep-matches ((@link . @title) '(("http://zappa.com/" . "Frank Zappa")
+                                            ("http://marcusmiller.com/" . "Marcus Miller")
+                                            ("http://www.milesdavis.com/" . "Miles Davis")))
+            (htm (:a :href link
+                     (:b (str title)))
+                 :br))))
          "<a href='http://zappa.com/'><b>Frank Zappa</b></a><br /><a href='http://marcusmiller.com/'><b>Marcus Miller</b></a><br /><a href='http://www.milesdavis.com/'><b>Miles Davis</b></a><br />")
 
 ;;; 4
-(string= (with-html-output-to-string (out)
-           (loop for (link . title) in '(("http://zappa.com/" . "Frank Zappa")
+(test (with-html-output-to-string (out)
+       (keep-matches ((@link . @title) '(("http://zappa.com/" . "Frank Zappa")
                                          ("http://marcusmiller.com/" . "Marcus Miller")
-                                         ("http://www.milesdavis.com/" . "Miles Davis"))
-                 do (htm (:a :href link
-                          (:b (str title)))
-                         :br)))
+                                         ("http://www.milesdavis.com/" . "Miles Davis")))
+         (htm (:a :href link
+                  (:b (str title)))
+              :br)))
          "<a href='http://zappa.com/'><b>Frank Zappa</b></a><br /><a href='http://marcusmiller.com/'><b>Marcus Miller</b></a><br /><a href='http://www.milesdavis.com/'><b>Miles Davis</b></a><br />")
 
 ;;; 5
-(string= (with-html-output-to-string (out nil)
-           (loop for (link . title) in '(("http://zappa.com/" . "Frank Zappa")
+(test (with-html-output-to-string (out nil)
+       (keep-matches ((@link . @title) '(("http://zappa.com/" . "Frank Zappa")
                                          ("http://marcusmiller.com/" . "Marcus Miller")
-                                         ("http://www.milesdavis.com/" . "Miles Davis"))
-                 do (htm (:a :href link
-                          (:b (str title)))
-                         :br)))
+                                         ("http://www.milesdavis.com/" . "Miles Davis")))
+         (htm (:a :href link
+                  (:b (str title)))
+              :br)))
          "<a href='http://zappa.com/'><b>Frank Zappa</b></a><br /><a href='http://marcusmiller.com/'><b>Marcus Miller</b></a><br /><a href='http://www.milesdavis.com/'><b>Miles Davis</b></a><br />")
 
 ;;; 6
-(string= (with-html-output-to-string (out nil :prologue nil)
-           (loop for (link . title) in '(("http://zappa.com/" . "Frank Zappa")
+(test (with-html-output-to-string (out nil :prologue nil)
+       (keep-matches ((@link . @title) '(("http://zappa.com/" . "Frank Zappa")
                                          ("http://marcusmiller.com/" . "Marcus Miller")
-                                         ("http://www.milesdavis.com/" . "Miles Davis"))
-                 do (htm (:a :href link
-                          (:b (str title)))
-                         :br)))
+                                         ("http://www.milesdavis.com/" . "Miles Davis")))
+         (htm (:a :href link
+                  (:b (str title)))
+              :br)))
          "<a href='http://zappa.com/'><b>Frank Zappa</b></a><br /><a href='http://marcusmiller.com/'><b>Marcus Miller</b></a><br /><a href='http://www.milesdavis.com/'><b>Miles Davis</b></a><br />")
 
+(exit)
+
+
+
 ;;; 7
 (eq (array-element-type
      (with-html-output-to-string (out nil :element-type 'base-char)