X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=geekigeeki.py;h=1221e701f7f1437d09cc64913287da0ebf90b9cb;hb=cea14c59bb3e7f4fc6cdb434026a9fcf909ccf3c;hp=4e9e788e63a19f7c9520aa52b248dc9bc8fd7b72;hpb=66d15e2736566926d87036352aa5928eb0ec0cba;p=geekigeeki.git diff --git a/geekigeeki.py b/geekigeeki.py index 4e9e788..1221e70 100755 --- a/geekigeeki.py +++ b/geekigeeki.py @@ -126,6 +126,10 @@ def send_title(name, text="Limbo", msg_text=None, msg_type='error', writable=Fal if not name: print ' ' + for meta in meta_urls: + http_equiv, content = meta + print ' ' % (http_equiv, relative_url(content)) + for link in link_urls: rel, href = link print ' ' % (rel, relative_url(href)) @@ -515,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) @@ -561,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 ''