Add a few more HTML pass-through tags; fix double newlines.

[geekigeeki.git] / geekigeeki.py
diff --git a/geekigeeki.py b/geekigeeki.py

index 1e2b065d05705ba8851177338d651429809590a4..1221e701f7f1437d09cc64913287da0ebf90b9cb 100755 (executable)
--- a/geekigeeki.py
+++ b/geekigeeki.py
@@ -519,7 +519,7 @@ class WikiFormatter:
              + r"|(?P<hurl>\[\[([^\s\|]+)(?:\s*\|\s*([^\]]+)|)\]\])"
  
              # Inline HTML
-            + r"|(?P<html><(/|)(br|hr|div|span|form|iframe|input|textarea|a))"
+            + r"|(?P<html><(/|)(br|hr|div|span|form|iframe|input|textarea|a|img|h[1-5])[^>]*>)"
              + r"|(?P<ent>[<>&])"
  
              # Auto links (LEGACY)
@@ -565,7 +565,7 @@ class WikiFormatter:
                      print '</p><p>'
                  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 '</pre>'