Some fixes for whitespace in <pre> handling

jgraham · jgraham · commit ab9a28e97256 · 2007-01-23T18:01:22.000Z
--HG--
extra : convert_revision : svn%3Aacbfec75-9323-0410-a652-858a13e371e0/trunk%40494
diff --git a/src/html5parser.py b/src/html5parser.py
@@ -1,3 +1,4 @@
+
 # 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>
@@ -17,6 +18,7 @@
     # Import from the sets module for python 2.3
     from sets import Set as set
     from sets import ImmutableSet as frozenset
+import new
 import gettext
 _ = gettext.gettext
 
@@ -624,8 +626,10 @@ def addFormattingElement(self, name, attributes):
     # the real deal
     def processSpaceCharactersPre(self, data):
         #Sometimes (start of <pre> blocks) we want to drop leading newlines
-        self.processSpaceCharacters = Phase.processSpaceCharacters
-        if data.startswith("\n"):
+        self.processSpaceCharacters = new.instancemethod(
+            Phase.processSpaceCharacters, self)
+        if (data.startswith("\n") and not 
+            self.tree.openElements[-1].hasContent()):
             data = data[1:]
         if data:
             self.tree.insertText(data)
@@ -859,6 +863,10 @@ def endTagHtml(self, name):
             self.parser.phase.processEndTag(name)
 
     def endTagBlock(self, name):
+        #Put us back in the right whitespace handling mode
+        if name == "pre":
+            self.processSpaceCharacters = new.instancemethod(
+                Phase.processSpaceCharacters, self)
         inScope = self.tree.elementInScope(name)
         if inScope:
             self.tree.generateImpliedEndTags()
