Fix a few cases where the spec has changed

jgraham · jgraham · commit 1fa604e2c84c · 2009-05-30T23:56:26.000+02:00
--HG--
branch : svgmathml
diff --git a/src/html5lib/constants.py b/src/html5lib/constants.py
@@ -295,6 +295,7 @@
     (namespaces["html"], "a"),
     (namespaces["html"], "b"),
     (namespaces["html"], "big"),
+    (namespaces["html"], "code"),
     (namespaces["html"], "em"),
     (namespaces["html"], "font"),
     (namespaces["html"], "i"),
diff --git a/src/html5lib/html5parser.py b/src/html5lib/html5parser.py
@@ -18,8 +18,7 @@
 from constants import scopingElements, formattingElements, specialElements
 from constants import headingElements, tableInsertModeElements
 from constants import cdataElements, rcdataElements, voidElements
-from constants import tokenTypes, ReparseException
-from constants import tokenTypes, namespaces
+from constants import tokenTypes, ReparseException, namespaces
 
 def parse(doc, treebuilder="simpletree", encoding=None):
     tb = treebuilders.getTreeBuilder(treebuilder)
@@ -677,7 +676,7 @@ def __init__(self, parser, tree):
 
         self. endTagHandler = utils.MethodDispatcher([
             ("head", self.endTagHead),
-            ("br", self.endTagBr)
+            (("br", "html", "body"), self.endTagHtmlBodyBr)
         ])
         self.endTagHandler.default = self.endTagOther
 
@@ -746,7 +745,7 @@ def endTagHead(self, token):
         assert node.name == "head", "Expected head got %s"%node.name
         self.parser.phase = self.parser.phases["afterHead"]
 
-    def endTagBr(self, token):
+    def endTagHtmlBodyBr(self, token):
         self.anythingElse()
         self.parser.phase.processEndTag(token)
 
@@ -775,7 +774,8 @@ def __init__(self, parser, tree):
             ("head", self.startTagHead)
         ])
         self.startTagHandler.default = self.startTagOther
-        self.endTagHandler = utils.MethodDispatcher([("br", self.endTagBr)])
+        self.endTagHandler = utils.MethodDispatcher([(("body", "html", "br"), 
+                                                      self.endTagHtmlBodyBr)])
         self.endTagHandler.default = self.endTagOther
 
     def processEOF(self):
@@ -811,7 +811,7 @@ def startTagOther(self, token):
         self.anythingElse()
         self.parser.phase.processStartTag(token)
 
-    def endTagBr(self, token):
+    def endTagHtmlBodyBr(self, token):
         #This is not currently in the spec
         self.anythingElse()
         self.parser.phase.processEndTag(token)
@@ -1002,6 +1002,9 @@ def startTagPlaintext(self, token):
     def startTagHeading(self, token):
         if self.tree.elementInScope("p"):
             self.endTagP(impliedTagToken("p"))
+        if self.tree.openElements[-1].name in headingElements:
+            self.parser.parseError("unexpected-start-tag", {"name": token["name"]})
+            self.tree.openElements.pop()
         # Uncomment the following for IE7 behavior:
         #
         #for item in headingElements:
@@ -1586,7 +1589,8 @@ def startTagStyleScript(self, token):
             self.startTagOther(token)
 
     def startTagInput(self, token):
-        if "type" in token["data"] and token["data"]["type"].translate(asciiUpper2Lower) == "hidden" and "tainted" not in self.getCurrentTable()._flags:
+        if ("type" in token["data"] and 
+            token["data"]["type"].translate(asciiUpper2Lower) == "hidden"):
             self.parser.parseError("unexpected-hidden-input-in-table")
             self.tree.insertElement(token)
             # XXX associate with form
