Fixed #28. Inline raw html is now enclosed in p tags. This used to work. Somehow we stopped checking for a single inline html element when swapping back in raw html. Added a test. Also patched a weird (invalid) comment test. Seeing the input is not really a valid html comment - it doesn't matter what we do with it. I suppose we test it to make sure it doesn't break the parser. Actual output is not so important. As a side note, this has exposed a preexisting (unrelated) bug with the extra extension's handling of raw html. That test is failing following this fix.

1 files changed, 12 insertions, 1 deletions

diff --git a/markdown/postprocessors.py b/markdown/postprocessors.py
index cd90eb8..8985fb8 100644
--- a/markdown/postprocessors.py
+++ b/markdown/postprocessors.py
@@ -8,6 +8,7 @@ processing.
 
 """
 
+import re
 import util
 import odict
 
@@ -55,7 +56,7 @@ class RawHtmlPostprocessor(Postprocessor):
                     html = ''
                 else:
                     html = self.markdown.html_replacement_text
-            if safe or not self.markdown.safeMode:
+            if self.isblocklevel(html) and (safe or not self.markdown.safeMode):
                 text = text.replace("<p>%s</p>" % 
                             (self.markdown.htmlStash.get_placeholder(i)),
                             html + "\n")
@@ -78,6 +79,16 @@ class RawHtmlPostprocessor(Postprocessor):
         return html.replace('"', '&quot;')
 
 
+    def isblocklevel(self, html):
+        m = re.match(r'^\<\/?([^ ]+)', html)
+        if m:
+            if m.group(1).startswith(('!', '?', '@', '%')):
+                # Comment, php etc...
+                return True
+            return util.isBlockLevel(m.group(1))
+        return False
+
+
 class AndSubstitutePostprocessor(Postprocessor):
     """ Restore valid entities """
     def __init__(self):