tag ending follow html protocol (#101)

Author: bung87

src/fusion/htmlparser/xmltree.nim

@@ -69,6 +69,14 @@ type
 const
   xmlHeader* = "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n"
     ## Header to use for complete XML output.
+  singleTags = ["area", "base", "basefont",
+    "br", "col","embed", "frame", "hr", "img",
+    "input","source","track",
+    "isindex", # obsolete HTML 4.01
+    "link", "meta", "param", "wbr",
+    "command", # obsolete
+    "keygen", # obsolete
+    ]
 
 proc newXmlNode(kind: XmlNodeKind): XmlNode =
   ## Creates a new ``XmlNode``.
@@ -85,7 +93,8 @@ proc newElement*(tag: string): XmlNode =
     a.add newElement("childTag")
     assert a.kind == xnElement
     assert $a == """<firstTag>
-  <childTag />
+  <childTag>
+  </childTag>
 </firstTag>"""
 
   result = newXmlNode(xnElement)
@@ -218,7 +227,8 @@ proc tag*(n: XmlNode): string {.inline.} =
     var a = newElement("firstTag")
     a.add newElement("childTag")
     assert $a == """<firstTag>
-  <childTag />
+  <childTag>
+  </childTag>
 </firstTag>"""
     assert a.tag == "firstTag"
 
@@ -238,11 +248,13 @@ proc `tag=`*(n: XmlNode, tag: string) {.inline.} =
     var a = newElement("firstTag")
     a.add newElement("childTag")
     assert $a == """<firstTag>
-  <childTag />
+  <childTag>
+  </childTag>
 </firstTag>"""
     a.tag = "newTag"
     assert $a == """<newTag>
-  <childTag />
+  <childTag>
+  </childTag>
 </newTag>"""
 
   assert n.k == xnElement
@@ -308,7 +320,7 @@ proc add*(father, son: XmlNode) {.inline.} =
     f.add newText("my text")
     f.add newElement("sonTag")
     f.add newEntity("my entity")
-    assert $f == "<myTag>my text<sonTag />&my entity;</myTag>"
+    assert $f == "<myTag>my text<sonTag></sonTag>&my entity;</myTag>"
   add(father.s, son)
 
 proc insert*(father, son: XmlNode, index: int) {.inline.} =
@@ -324,8 +336,10 @@ proc insert*(father, son: XmlNode, index: int) {.inline.} =
     f.add newElement("first")
     f.insert(newElement("second"), 0)
     assert $f == """<myTag>
-  <second />
-  <first />
+  <second>
+  </second>
+  <first>
+  </first>
 </myTag>"""
 
   assert father.k == xnElement and son.k == xnElement
@@ -346,7 +360,8 @@ proc delete*(n: XmlNode, i: Natural) {.noSideEffect.} =
     f.insert(newElement("second"), 0)
     f.delete(0)
     assert $f == """<myTag>
-  <first />
+  <first>
+  </first>
 </myTag>"""
 
   assert n.k == xnElement
@@ -376,8 +391,8 @@ proc `[]`*(n: XmlNode, i: int): XmlNode {.inline.} =
     var f = newElement("myTag")
     f.add newElement("first")
     f.insert(newElement("second"), 0)
-    assert $f[1] == "<first />"
-    assert $f[0] == "<second />"
+    assert $f[1] == "<first>\n</first>"
+    assert $f[0] == "<second>\n</second>"
 
   assert n.k == xnElement
   result = n.s[i]
@@ -591,9 +606,9 @@ proc add*(result: var string, n: XmlNode, indent = 0, indWidth = 2,
       c = newComment("my comment")
       s = ""
     s.add(c)
+    a.add(b)
     s.add(a)
-    s.add(b)
-    assert s == "<!-- my comment --><firstTag />my text"
+    assert s == "<!-- my comment --><firstTag>my text</firstTag>"
 
   proc noWhitespace(n: XmlNode): bool =
     for i in 0 ..< n.len:
@@ -633,8 +648,8 @@ proc add*(result: var string, n: XmlNode, indent = 0, indWidth = 2,
         result.addEscapedAttr(val)
         result.add('"')
 
-    if n.len == 0:
-      result.add(" />")
+    if n.len == 0 and n.fTag in singleTags:
+      result.add("/>")
       return
 
     let
@@ -685,7 +700,7 @@ proc child*(n: XmlNode, name: string): XmlNode =
     f.add newElement("firstSon")
     f.add newElement("secondSon")
     f.add newElement("thirdSon")
-    assert $(f.child("secondSon")) == "<secondSon />"
+    assert $(f.child("secondSon")) == "<secondSon>\n</secondSon>"
 
   assert n.kind == xnElement
   for i in items(n):