Merge branch 'patch-2' of https://github.com/rgv151/Nim into rgv151-patch-2

Conflicts:
	lib/pure/htmlparser.nim
This commit is contained in:
Dominik Picheta 2015-06-20 11:36:59 +01:00
commit 89727ef207

View file

@ -423,6 +423,7 @@ proc toHtmlTag(s: string): HtmlTag =
of "wbr": tagWbr
else: tagUnknown
proc htmlTag*(n: XmlNode): HtmlTag =
## gets `n`'s tag as a ``HtmlTag``.
if n.clientData == 0:
@ -469,7 +470,7 @@ proc untilElementEnd(x: var XmlParser, result: XmlNode,
tagOption}:
errors.add(expected(x, result))
break
of tagTd, tagTh, tagTfoot, tagThead:
of tagTd, tagTh:
if htmlTag(x.elemName) in {tagTr, tagTd, tagTh, tagTfoot, tagThead}:
errors.add(expected(x, result))
break