Fix button scoping stuff

James Graham · James Graham · commit 62e34369f0a2 · 2010-07-15T16:30:42.000+02:00
diff --git a/html5lib/constants.py b/html5lib/constants.py
@@ -310,6 +310,7 @@
 
 specialElements = frozenset((
     (namespaces["html"], "address"),
+    (namespaces["html"], "applet"),
     (namespaces["html"], "area"),
     (namespaces["html"], "article"),
     (namespaces["html"], "aside"),
@@ -320,6 +321,7 @@
     (namespaces["html"], "body"),
     (namespaces["html"], "br"),
     (namespaces["html"], "button"),
+    (namespaces["html"], "caption"),
     (namespaces["html"], "center"),
     (namespaces["html"], "col"),
     (namespaces["html"], "colgroup"),
@@ -346,6 +348,7 @@
     (namespaces["html"], "head"),
     (namespaces["html"], "header"),
     (namespaces["html"], "hr"),
+    (namespaces["html"], "html"),
     (namespaces["html"], "iframe"),
     # Note that image is commented out in the spec as "this isn't an
     # element that can end up on the stack, so it doesn't matter,"
@@ -356,12 +359,14 @@
     (namespaces["html"], "li"),
     (namespaces["html"], "link"),
     (namespaces["html"], "listing"),
+    (namespaces["html"], "marquee"),
     (namespaces["html"], "menu"),
     (namespaces["html"], "meta"),
     (namespaces["html"], "nav"),
     (namespaces["html"], "noembed"),
     (namespaces["html"], "noframes"),
     (namespaces["html"], "noscript"),
+    (namespaces["html"], "object"),
     (namespaces["html"], "ol"),
     (namespaces["html"], "p"),
     (namespaces["html"], "param"),
@@ -371,15 +376,19 @@
     (namespaces["html"], "section"),
     (namespaces["html"], "select"),
     (namespaces["html"], "style"),
+    (namespaces["html"], "table"),
     (namespaces["html"], "tbody"),
+    (namespaces["html"], "td"),
     (namespaces["html"], "textarea"),
     (namespaces["html"], "tfoot"),
+    (namespaces["html"], "th"),
     (namespaces["html"], "thead"),
     (namespaces["html"], "title"),
     (namespaces["html"], "tr"),
     (namespaces["html"], "ul"),
     (namespaces["html"], "wbr"),
-    (namespaces["html"], "xmp")
+    (namespaces["html"], "xmp"),
+    (namespaces["svg"], "foreignObject")
 ))
 
 spaceCharacters = frozenset((
diff --git a/html5lib/html5parser.py b/html5lib/html5parser.py
@@ -40,7 +40,7 @@ def startswithany(str, prefixes):
 import utils
 import constants
 from constants import spaceCharacters, asciiUpper2Lower
-from constants import scopingElements, formattingElements, specialElements
+from constants import formattingElements, specialElements
 from constants import headingElements, tableInsertModeElements
 from constants import cdataElements, rcdataElements, voidElements
 from constants import tokenTypes, ReparseException, namespaces, spaceCharacters
@@ -1015,12 +1015,12 @@ def startTagFrameset(self, token):
                 self.parser.phase = self.parser.phases["inFrameset"]
 
         def startTagCloseP(self, token):
-            if self.tree.elementInScope("p"):
+            if self.tree.elementInScope("p", variant="button"):
                 self.endTagP(impliedTagToken("p"))
             self.tree.insertElement(token)
 
         def startTagPreListing(self, token):
-            if self.tree.elementInScope("p"):
+            if self.tree.elementInScope("p", variant="button"):
                 self.endTagP(impliedTagToken("p"))
             self.tree.insertElement(token)
             self.parser.framesetOK = False
@@ -1030,7 +1030,7 @@ def startTagForm(self, token):
             if self.tree.formPointer:
                 self.parser.parseError(u"unexpected-start-tag", {"name": "form"})
             else:
-                if self.tree.elementInScope("p"):
+                if self.tree.elementInScope("p", variant="button"):
                     self.endTagP(impliedTagToken("p"))
                 self.tree.insertElement(token)
                 self.tree.formPointer = self.tree.openElements[-1]
@@ -1047,24 +1047,24 @@ def startTagListItem(self, token):
                     self.parser.phase.processEndTag(
                         impliedTagToken(node.name, "EndTag"))
                     break
-                if (node.nameTuple in (scopingElements | specialElements) and
+                if (node.nameTuple in specialElements and
                     node.name not in ("address", "div", "p")):
                     break
 
-            if self.tree.elementInScope("p"):
+            if self.tree.elementInScope("p", variant="button"):
                 self.parser.phase.processEndTag(
                     impliedTagToken("p", "EndTag"))
 
             self.tree.insertElement(token)
 
         def startTagPlaintext(self, token):
-            if self.tree.elementInScope("p"):
+            if self.tree.elementInScope("p", variant="button"):
                 self.endTagP(impliedTagToken("p"))
             self.tree.insertElement(token)
             self.parser.tokenizer.state = self.parser.tokenizer.plaintextState
 
         def startTagHeading(self, token):
-            if self.tree.elementInScope("p"):
+            if self.tree.elementInScope("p", variant="button"):
                 self.endTagP(impliedTagToken("p"))
             if self.tree.openElements[-1].name in headingElements:
                 self.parser.parseError("unexpected-start-tag", {"name": token["name"]})
@@ -1116,15 +1116,15 @@ def startTagAppletMarqueeObject(self, token):
             self.parser.framesetOK = False
 
         def startTagXmp(self, token):
-            if self.tree.elementInScope("p"):
+            if self.tree.elementInScope("p", variant="button"):
                 self.endTagP(impliedTagToken("p"))
             self.tree.reconstructActiveFormattingElements()
             self.parser.framesetOK = False
             self.parser.parseRCDataRawtext(token, "RAWTEXT")
 
         def startTagTable(self, token):
             if self.parser.compatMode != "quirks":
-                if self.tree.elementInScope("p"):
+                if self.tree.elementInScope("p", variant="button"):
                     self.processEndTag(impliedTagToken("p"))
             self.tree.insertElement(token)
             self.parser.framesetOK = False
@@ -1143,7 +1143,7 @@ def startTagParamSource(self, token):
             token["selfClosingAcknowledged"] = True
 
         def startTagHr(self, token):
-            if self.tree.elementInScope("p"):
+            if self.tree.elementInScope("p", variant="button"):
                 self.endTagP(impliedTagToken("p"))
             self.tree.insertElement(token)
             self.tree.openElements.pop()
@@ -1402,8 +1402,7 @@ def endTagFormatting(self, token):
                 afeIndex = self.tree.openElements.index(formattingElement)
                 furthestBlock = None
                 for element in self.tree.openElements[afeIndex:]:
-                    if (element.nameTuple in
-                        specialElements | scopingElements):
+                    if element.nameTuple in specialElements:
                         furthestBlock = element
                         break
                 # Step 3
@@ -1525,8 +1524,7 @@ def endTagOther(self, token):
                         pass
                     break
                 else:
-                    if (node.nameTuple in
-                        specialElements | scopingElements):
+                    if node.nameTuple in specialElements:
                         self.parser.parseError("unexpected-end-tag", {"name": token["name"]})
                         break
 
diff --git a/html5lib/treebuilders/_base.py b/html5lib/treebuilders/_base.py
@@ -132,6 +132,7 @@ def elementInScope(self, target, variant=None):
         # Exit early when possible.
         listElementsMap = {
             None:scopingElements,
+            "button":scopingElements | set([(namespaces["html"], "button")]),
             "list":scopingElements | set([(namespaces["html"], "ol"),
                                           (namespaces["html"], "ul")]),
             "table":set([(namespaces["html"], "html"),
