introduce </p> handling; </br> handling is now conforming per the specification

annevk · annevk · commit b32b741f4195 · 2007-06-27T08:12:04.000Z
--HG--
extra : convert_revision : svn%3Aacbfec75-9323-0410-a652-858a13e371e0/trunk%40829
diff --git a/src/html5lib/html5parser.py b/src/html5lib/html5parser.py
@@ -1,16 +1,10 @@
-
 # Differences from the current specification (23 December 2006) are as follows:
 # * Phases and insertion modes are one concept in parser.py.
 # * EOF handling is slightly different to make sure <html>, <head> and <body>
 #   always exist.
-# * </br> creates a <br> element.
 #
 # We haven't updated DOCTYPE handling yet
-#
-# It should be trivial to add the following cases. However, we should probably
-# also look into comment handling and such then...
-# * A <p> element end tag creates an empty <p> element when there's no <p>
-#   element in scope.
+
 
 try:
     frozenset
@@ -485,7 +479,7 @@ def __init__(self, parser, tree):
         self.startTagHandler.default = self.startTagOther
 
         self.endTagHandler = utils.MethodDispatcher([
-            (("html", "head", "body", "br"), self.endTagImplyHead)
+            (("html", "head", "body", "br", "p"), self.endTagImplyHead)
         ])
         self.endTagHandler.default = self.endTagOther
 
@@ -530,7 +524,7 @@ def __init__(self, parser, tree):
 
         self. endTagHandler = utils.MethodDispatcher([
             ("head", self.endTagHead),
-            (("html", "body", "br"), self.endTagImplyAfterHead),
+            (("html", "body", "br", "p"), self.endTagImplyAfterHead),
             (("title", "style", "script"), self.endTagTitleStyleScript)
         ])
         self.endTagHandler.default = self.endTagOther
@@ -995,8 +989,12 @@ def endTagP(self, name):
             self.tree.generateImpliedEndTags("p")
         if self.tree.openElements[-1].name != "p":
             self.parser.parseError(_("Unexpected end tag (p)."))
-        while self.tree.elementInScope("p"):
-            self.tree.openElements.pop()
+        if self.tree.elementInScope("p"):
+            while self.tree.elementInScope("p"):
+                self.tree.openElements.pop()
+        else:
+            self.startTagCloseP("p", {})
+            self.endTagP("p")
 
     def endTagBody(self, name):
         # XXX Need to take open <p> tags into account here. We shouldn't imply
