Merge (somewhat botched)

James Graham · James Graham · commit a7f7dfafd6b9 · 2010-10-15T15:28:54.000+02:00
diff --git a/html5lib/constants.py b/html5lib/constants.py
@@ -411,6 +411,21 @@
     (namespaces["svg"], "foreignObject")
 ))
 
+htmlIntegrationPointElements = frozenset((
+    (namespaces["mathml"], "annotaion-xml"),
+    (namespaces["svg"], "foreignObject"),
+    (namespaces["svg"], "desc"),
+    (namespaces["svg"], "title")
+))
+
+mathmlTextIntegrationPointElements = frozenset((
+    (namespaces["mathml"], "mi"),
+    (namespaces["mathml"], "mo"),
+    (namespaces["mathml"], "mn"),
+    (namespaces["mathml"], "ms"),
+    (namespaces["mathml"], "mtext")
+))
+
 spaceCharacters = frozenset((
     u"\t",
     u"\n",
diff --git a/html5lib/html5parser.py b/html5lib/html5parser.py
@@ -44,6 +44,7 @@ def startswithany(str, prefixes):
 from constants import headingElements, tableInsertModeElements
 from constants import cdataElements, rcdataElements, voidElements
 from constants import tokenTypes, ReparseException, namespaces, spaceCharacters
+from constants import htmlIntegrationPointElements, mathmlTextIntegrationPointElements
 
 def parse(doc, treebuilder="simpletree", encoding=None, 
           namespaceHTMLElements=True):
