Merge pull request #51 from kevinfahy/master

Explicit ending tags for <section>, <aside>, and others
weavejester · May 22, 2012 · fcd6668 · fcd6668
2 parents f0d5221 + c7dd5cb
commit fcd6668
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/hiccup/compiler.clj b/src/hiccup/compiler.clj
@@ -36,9 +36,10 @@
 (def ^{:doc "A list of elements that need an explicit ending tag when rendered."
        :private true}
   container-tags
-  #{"a" "b" "body" "canvas" "dd" "div" "dl" "dt" "em" "fieldset" "form" "h1" "h2" "h3"
+  #{"a" "article" "aside" "b" "body" "canvas" "dd" "div" "dl" "dt" "em" "fieldset"
-    "h4" "h5" "h6" "head" "html" "i" "iframe" "label" "li" "ol" "option" "pre" 
+    "footer" "form" "h1" "h2" "h3" "h4" "h5" "h6" "head" "header" "hgroup" "html"
-    "script" "span" "strong" "style" "table" "textarea" "title" "ul"})
+    "i" "iframe" "label" "li" "nav" "ol" "option" "pre" "section" "script" "span"
+    "strong" "style" "table" "textarea" "title" "ul"})
 
 (defn normalize-element
   "Ensure an element vector is of the form [tag-name attrs content]."

diff --git a/test/hiccup/test/core.clj b/test/hiccup/test/core.clj
@@ -25,7 +25,8 @@
     (is (= (html [:text]) "<text />"))
     (is (= (html [:a]) "<a></a>"))
     (is (= (html [:iframe]) "<iframe></iframe>"))
-    (is (= (html [:title]) "<title></title>")))
+    (is (= (html [:title]) "<title></title>"))
+    (is (= (html [:section]) "<section></section>")))
   (testing "tags containing text"
     (is (= (html [:text "Lorem Ipsum"]) "<text>Lorem Ipsum</text>")))
   (testing "contents are concatenated"