Fixes issue 91 by omitting the head element's start tag when the head element is empty.

tbroyer · tbroyer · commit 09dc1a278f77 · 2009-02-26T14:24:02.000Z
Also adds checks againts "EmptyTag" when the expected "start tag" might be the one of a "void element" (this is an undocumented mess in html5lib between what should be a StartTag vs. an EmptyTag and a Characters vs. SpaceCharacters token; the "optionaltags" filter expects what is emitted by a treewalker).

Therefore, fixed a few tests that used "EmptyTag" for to represent empty (no child) non-void elements.

--HG--
extra : convert_revision : svn%3Aacbfec75-9323-0410-a652-858a13e371e0/trunk%401271
diff --git a/src/html5lib/filters/optionaltags.py b/src/html5lib/filters/optionaltags.py
@@ -31,7 +31,11 @@ def is_optional_start(self, tagname, previous, next):
         elif tagname == 'head':
             # A head element's start tag may be omitted if the first thing
             # inside the head element is an element.
-            return type == "StartTag"
+            # XXX: we also omit the start tag if the head element is empty
+            if type in ("StartTag", "EmptyTag"):
+                return True
+            elif type == "EndTag":
+                return next["name"] == "head"
         elif tagname == 'body':
             # A body element's start tag may be omitted if the first thing
             # inside the body element is not a space character or a comment,
@@ -52,7 +56,7 @@ def is_optional_start(self, tagname, previous, next):
             # inside the colgroup element is a col element, and if the element
             # is not immediately preceeded by another colgroup element whose
             # end tag has been omitted.
-            if type == "StartTag":
+            if type in ("StartTag", "EmptyTag"):
                 # XXX: we do not look at the preceding event, so instead we never
                 # omit the colgroup element's end tag when it is immediately
                 # followed by another colgroup element. See is_optional_end.
@@ -114,7 +118,7 @@ def is_optional_end(self, tagname, next):
             # footer, form, h1, h2, h3, h4, h5, h6, header, hr, menu,
             # nav, ol, p, pre, section, table, or ul, element, or if
             # there is no more content in the parent element.
-            if type == "StartTag":
+            if type in ("StartTag", "EmptyTag"):
                 return next["name"] in ('address', 'article', 'aside',     \
                     'blockquote', 'datagrid', 'dialog', 'dir', 'div',      \
                     'dl', 'fieldset', 'footer', 'form', 'h1', 'h2', 'h3',  \
