X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=geekigeeki.py;h=41345e65340c2b711581a1d9ce097a69968395a6;hb=98ce48c0043fa3fc11a5407b98c9fd0aa2ab53d3;hp=cf69d55e013c25335643290af2dde44b8820f91a;hpb=e8b84c43bb30331bdca8f81b9fb9bdc5c3ea8521;p=geekigeeki.git

diff --git a/geekigeeki.py b/geekigeeki.py
index cf69d55..41345e6 100755
--- a/geekigeeki.py
+++ b/geekigeeki.py
@@ -363,7 +363,7 @@ class PageFormatter:
         else:
             self.h_level = len(word) - 1
             link = permalink(self.line)
-            result = '<h%d id="%s"><a class="heading" href="#%s">¶</a> ' % (self.h_level, link, link)
+            result = '\n</p><h%d id="%s"><a class="heading" href="#%s">¶</a> ' % (self.h_level, link, link)
         return result
 
     def _br_repl(self, word):
@@ -506,13 +506,14 @@ class PageFormatter:
             # Links
             + r"|(?P<img>\b[a-zA-Z0-9_-]+\.(png|gif|jpg|jpeg|bmp))"
             + r"|(?P<word>\b(?:[A-Z][a-z]+){2,}\b)"
-            + r"|(?P<hurl>\[\[([^ \t\n\r\f\v\|]+)(?:\s*\|\s*([^\]]+)|)\]\])"
+            + r"|(?P<hurl>\[\[([^ \s\|]+)(?:\s*\|\s*([^\]]+)|)\]\])"
             + r"|(?P<url>(http|https|ftp|mailto)\:[^\s'\"]+\S)"
             + r"|(?P<email>[-\w._+]+\@[\w.-]+)"
 
             # Lists, divs, spans
             + r"|(?P<li>^\s+[\*#] +)"
             + r"|(?P<pre>\{\{\{|\s*\}\}\})"
+            + r"|(?P<hurl>\{\{([^\s\|]+)(?:\s*\|\s*([^\]]+)|)\}\})"
 
             # Tables
             + r"|(?P<tr>^\s*\|\|(=|)\s*)"