From bc7162743c53967b41c6df6f4a420cf9105e3fc5 Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Sun, 6 Nov 2011 12:15:00 -0800
Subject: [PATCH] html.components: For the t:html tag, only wrap strings in
 unescaped so that other objects can render.

---
 basis/html/components/components-tests.factor | 14 +++++++++++++-
 basis/html/components/components.factor       |  2 +-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/basis/html/components/components-tests.factor b/basis/html/components/components-tests.factor
index d1d43c762c..4609ef634c 100644
--- a/basis/html/components/components-tests.factor
+++ b/basis/html/components/components-tests.factor
@@ -1,7 +1,7 @@
 USING: tools.test kernel io.streams.string
 io.streams.null accessors inspector html.streams
 html.components html.forms namespaces
-xml.writer ;
+xml.writer xml.syntax ;
 FROM: html.components => inspector ;
 IN: html.components.tests
 
@@ -196,3 +196,15 @@ M: link-test link-href drop "http://www.apple.com/foo&bar" ;
 [ ] [
     "error" hidden render
 ] unit-test
+
+! Test xml in html components
+[ ] [
+    [XML <foo/> XML] "xmltest" set-value
+] unit-test
+
+[ "<foo/>" ] [
+    [
+        "xmltest" html render
+    ] with-string-writer
+] unit-test
+
diff --git a/basis/html/components/components.factor b/basis/html/components/components.factor
index f4f30ea33f..30ad323ae8 100644
--- a/basis/html/components/components.factor
+++ b/basis/html/components/components.factor
@@ -190,7 +190,7 @@ M: comparison render*
 ! HTML component
 SINGLETON: html
 
-M: html render* 2drop <unescaped> ;
+M: html render* 2drop dup string? [ <unescaped> ] when ;
 
 ! XML component
 SINGLETON: xml