From: Bernie Innocenti Date: Thu, 11 Dec 2008 03:44:38 +0000 (+0100) Subject: Add a few more HTML pass-through tags; fix double newlines. X-Git-Tag: v3.0~2 X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=0115a854ee709025539aa8498947dddb0ca04ad0;p=geekigeeki.git Add a few more HTML pass-through tags; fix double newlines. --- diff --git a/geekigeeki.py b/geekigeeki.py index 1e2b065..1221e70 100755 --- a/geekigeeki.py +++ b/geekigeeki.py @@ -519,7 +519,7 @@ class WikiFormatter: + r"|(?P\[\[([^\s\|]+)(?:\s*\|\s*([^\]]+)|)\]\])" # Inline HTML - + r"|(?P<(/|)(br|hr|div|span|form|iframe|input|textarea|a))" + + r"|(?P<(/|)(br|hr|div|span|form|iframe|input|textarea|a|img|h[1-5])[^>]*>)" + r"|(?P[<>&])" # Auto links (LEGACY) @@ -565,7 +565,7 @@ class WikiFormatter: print '

' else: indent = indent_re.match(self.line) - print self._indent_to(len(indent.group(0))) + print self._indent_to(len(indent.group(0))) , print re.sub(scan_re, self.replace, self.line) if self.in_pre: print ''