<link>, <base> and <meta> are no longer moved to <head>, unless in very special cases

annevk · annevk · commit 50f68b29459d · 2007-06-20T13:51:57.000Z
--HG--
extra : convert_revision : svn%3Aacbfec75-9323-0410-a652-858a13e371e0/trunk%40779
diff --git a/src/html5parser.py b/src/html5parser.py
@@ -595,7 +595,11 @@ def startTagScript(self, name, attributes):
 
     def startTagBaseLinkMeta(self, name, attributes):
         element = self.tree.createElement(name, attributes)
-        self.appendToHead(element)
+        if (self.tree.headPointer is not None and
+            self.parser.phase == self.parser.phases["inHead"]):
+            self.appendToHead(element)
+        else:
+            self.tree.openElements[-1].appendChild(element)
 
     def startTagOther(self, name, attributes):
         self.anythingElse()
@@ -692,9 +696,9 @@ def __init__(self, parser, tree):
 
         self.startTagHandler = utils.MethodDispatcher([
             ("html", self.startTagHtml),
-            (("script", "style"), self.startTagScriptStyle),
-            (("base", "link", "meta", "title"),
-              self.startTagFromHead),
+            (("base", "link", "meta", "script", "style"),
+              self.startTagProcessInHead),
+            ("title", self.startTagTitle),
             ("body", self.startTagBody),
             (("address", "blockquote", "center", "dir", "div", "dl",
               "fieldset", "listing", "menu", "ol", "p", "pre", "ul"),
@@ -779,10 +783,10 @@ def processCharacters(self, data):
         self.tree.reconstructActiveFormattingElements()
         self.tree.insertText(data)
 
-    def startTagScriptStyle(self, name, attributes):
+    def startTagProcessInHead(self, name, attributes):
         self.parser.phases["inHead"].processStartTag(name, attributes)
 
-    def startTagFromHead(self, name, attributes):
+    def startTagTitle(self, name, attributes):
         self.parser.parseError(_(u"Unexpected start tag (" + name +\
           ") that belongs in the head. Moved."))
         self.parser.phases["inHead"].processStartTag(name, attributes)
