Make reset insertion mode work right + fix InSelect to match

Author: James Graham

html5lib/html5parser.py

@@ -375,6 +375,7 @@ def resetInsertionMode(self):
         # The name of this method is mostly historical. (It's also used in the
         # specification.)
         last = False
+        foreign = False
         newModes = {
             "select":"inSelect",
             "td":"inCell",
@@ -388,38 +389,36 @@ def resetInsertionMode(self):
             "table":"inTable",
             "head":"inBody",
             "body":"inBody",
-            "frameset":"inFrameset"
+            "frameset":"inFrameset",
+            "html":"beforeHead"
         }
         for node in self.tree.openElements[::-1]:
             nodeName = node.name
+            new_phase = None
             if node == self.tree.openElements[0]:
+                assert self.innerHTML
                 last = True
-                if nodeName not in ['td', 'th']:
-                    # XXX
-                    assert self.innerHTML
-                    nodeName = self.innerHTML
+                nodeName = self.innerHTML
             # Check for conditions that should only happen in the innerHTML
             # case
-            if nodeName in ("select", "colgroup", "head", "frameset"):
-                # XXX
+            if nodeName in ("select", "colgroup", "head", "frameset", "html"):
                 assert self.innerHTML
+
             if nodeName in newModes:
-                self.phase = self.phases[newModes[nodeName]]
+                new_phase = self.phases[newModes[nodeName]]
                 break
             elif node.namespace in (namespaces["mathml"], namespaces["svg"]):
-                self.phase = self.phases["inForeignContent"]
-                self.secondaryPhase = self.phases["inBody"]
-                break
-            elif nodeName == "html":
-                if self.tree.headPointer is None:
-                    self.phase = self.phases["beforeHead"]
-                else:
-                   self.phase = self.phases["afterHead"]
-                break
+                foreign = True
             elif last:
-                self.phase = self.phases["inBody"]
+                new_phase = self.phases["inBody"]
                 break
 
+        if foreign:
+            self.phase = self.phases["inForeignContent"]
+            self.secondaryPhase = new_phase
+        else:
+            self.phase = new_phase
+
     def parseRCDataRawtext(self, token, contentType):
         """Generic RCDATA/RAWTEXT Parsing algorithm
         contentType - RCDATA or RAWTEXT
@@ -2195,7 +2194,8 @@ def __init__(self, parser, tree):
             ("option", self.startTagOption),
             ("optgroup", self.startTagOptgroup),
             ("select", self.startTagSelect),
-            (("input", "keygen", "textarea"), self.startTagInput)
+            (("input", "keygen", "textarea"), self.startTagInput),
+            ("script", self.startTagScript)
         ])
         self.startTagHandler.default = self.startTagOther
 
@@ -2241,6 +2241,9 @@ def startTagInput(self, token):
             self.endTagSelect(impliedTagToken("select"))
             self.parser.phase.processStartTag(token)
 
+    def startTagScript(self, token):
+        self.parser.phases["inHead"].processStartTag(token)
+
     def startTagOther(self, token):
         self.parser.parseError("unexpected-start-tag-in-select",
           {"name": token["name"]})