improve html library handling of self-closing tags

1 files changed, 6 insertions, 5 deletions

diff --git a/vendor/html.fnl b/vendor/html.fnl
index 1be5d5d..753bbb9 100644
--- a/vendor/html.fnl
+++ b/vendor/html.fnl
@@ -10,22 +10,23 @@
   (assert (= (type s) :string))
   (s:gsub entity-search entity-replacements))
 
-(fn tag [tag-name attrs]
+(fn tag [tag-name attrs self-closing?]
   (assert (= (type attrs) "table") (.. "Missing attrs table: " tag-name))
   (let [attr-str (table.concat (icollect [k v (pairs attrs)]
                                  (if (= v true) k
                                      (.. k "=\"" (escape v)"\""))) " ")]
-    (.. "<" tag-name " " attr-str">")))
+    (.. "<" tag-name " " attr-str (if self-closing? " />" ">"))))
 
 (fn render [document allow-no-escape?]
   (if (= (type document) :string)
       (escape document)
       (and allow-no-escape? (= (. document 1) :NO-ESCAPE))
       (. document 2)
-      (let [[tag-name attrs & body] document]
-        (.. (tag tag-name attrs)
+      (let [[tag-name attrs & body] document
+            self-closing? (= 0 (# body))]
+        (.. (tag tag-name attrs self-closing?)
             (table.concat (icollect [_ element (ipairs body)]
                             (render element allow-no-escape?)) " ")
-            "</" tag-name ">"))))
+            (if (not self-closing?) (.. "</" tag-name ">") "")))))
 
 { :render render }