X-Git-Url: https://codewiz.org/gitweb?p=geekigeeki.git;a=blobdiff_plain;f=geekigeeki.py;h=12b6b7cdaec57d05e14baadd381c17a6431029bb;hp=abaa4338ee109158cc2fd4f90009423fe990e4f2;hb=75836706224e9f6b8ede6c59deea646e31672924;hpb=19caef617e3d5739b28b2c426afbab38691e2da2
diff --git a/geekigeeki.py b/geekigeeki.py
index abaa433..12b6b7c 100755
--- a/geekigeeki.py
+++ b/geekigeeki.py
@@ -129,7 +129,7 @@ def send_title(name, text="Limbo", msg=None, msg_type='error'):
print '
'
print '
' + site_name + ': ',
if name:
- print link_tag('?fullsearch=' + name, text) + ' '
+ print link_tag('?fullsearch=' + name, text, 'navlink') + ' '
else:
print text + ' '
print ' | ' + link_tag('FrontPage', 'Front Page', 'navlink')
@@ -334,23 +334,19 @@ class PageFormatter:
"""
def __init__(self, raw):
self.raw = raw
- self.is_em = self.is_b = 0
self.h_level = 0
- self.h_count = 0
- self.list_indents = []
- self.in_pre = False
- self.in_table = False
- self.tr_cnt = 0
- self.in_var = False
+ self.in_pre = self.in_table = self.in_var = self.in_em = self.in_b = False
self.in_header = True
+ self.list_indents = []
+ self.tr_cnt = self.h_cnt = 0
- def _emph_repl(self, word):
- if len(word) == 3:
- self.is_b = not self.is_b
- return ['', '
'][self.is_b]
- else:
- self.is_em = not self.is_em
- return ['', ''][self.is_em]
+ def _b_repl(self, word):
+ self.in_b = not self.in_b
+ return ['', '
'][self.in_b]
+
+ def _em_repl(self, word):
+ self.in_em = not self.in_em
+ return ['', ''][self.in_em]
def _tit_repl(self, word):
if self.h_level:
@@ -358,10 +354,13 @@ class PageFormatter:
self.h_level = 0
else:
self.h_level = len(word) - 1
- self.h_count += 1
- result = '* ' % (self.h_level, self.h_count, self.h_count)
+ self.h_cnt += 1
+ result = '* ' % (self.h_level, self.h_cnt, self.h_cnt)
return result
+ def _br_repl(self, word):
+ return '
'
+
def _rule_repl(self, word):
return self._undent() + '\n
\n' % (len(word) - 2)
@@ -379,9 +378,9 @@ class PageFormatter:
return '%s' % (word, word)
def _hurl_repl(self, word):
- m = re.compile("\[\[(\S+)([^\]]*)\]\]").match(word)
+ m = re.compile("\[\[(\S+)(?:\s*\|\s*([^\]]*)|)\]\]").match(word)
name = m.group(1)
- descr = m.group(2).strip() or name
+ descr = m.group(2) or name
macro = globals().get('_macro_' + name)
if macro:
@@ -393,7 +392,7 @@ class PageFormatter:
elif name.startswith('/'):
return '%s' % (name, descr)
else:
- return link_tag(name, descr)
+ return link_tag(name, descr, 'wikilink')
def _email_repl(self, word):
return '%s' % (word, word)
@@ -443,16 +442,17 @@ class PageFormatter:
self.tr_cnt = 0
out = '\n'
self.tr_cnt += 1
- return out + ''
+ out = out + ' |
'
+ return out + ['', ' | '][word.strip() == '||=']
- def _tre_repl(self, word):
+ def _td_repl(self, word):
if self.in_table:
- return ' |
'
+ return ['', ' | '][word.strip() == '||=']
return ''
- def _td_repl(self, word):
+ def _tre_repl(self, word):
if self.in_table:
- return ' | '
+ return [' | ', ''][word.strip() == '||=']
return ''
def _indent_level(self):
@@ -494,8 +494,10 @@ class PageFormatter:
scan_re = re.compile(
r"(?:"
# Formatting
- + r"(?P'{2,3})"
+ + r"(?P\*\*|''')"
+ + r"|(?P//|'')"
+ r"|(?P\={2,6})"
+ + r"|(?P
\\\\)"
+ r"|(?P^-{3,})"
+ r"|(?P<(/|)(div|span|iframe)[^<>]*>)"
+ r"|(?P[<>&])"
@@ -504,19 +506,19 @@ class PageFormatter:
# Links
+ r"|(?P\b[a-zA-Z0-9_-]+\.(png|gif|jpg|jpeg|bmp))"
+ r"|(?P\b(?:[A-Z][a-z]+){2,}\b)"
- + r"|(?P\[\[\S+[^\]]*\]\])"
+ + r"|(?P\[\[(\S+)(?:\s*\|\s*([^\]]*)|)\]\])"
+ r"|(?P(http|https|ftp|mailto)\:[^\s'\"]+\S)"
+ r"|(?P[-\w._+]+\@[\w.-]+)"
# Lists, divs, spans
- + r"|(?P^\s+\*)"
- + r"|(?P(\{\{\{|\s*\}\}\}))"
- + r"|(?P(\{\{|\}\}))"
+ + r"|(?P^\s+[\*#] +)"
+ + r"|(?P\{\{\{|\s*\}\}\})"
+ + r"|(?P\{\{|\}\})"
# Tables
- + r"|(?P^\s*\|\|\s*)"
- + r"|(?P\s*\|\|\s*$)"
- + r"|(?P\s*\|\|\s*)"
+ + r"|(?P | ^\s*\|\|(=|)\s*)"
+ + r"|(?P\s*\|\|(=|)\s*$)"
+ + r"|(?P\s*\|\|(=|)\s*)"
+ r")")
pre_re = re.compile(
r"(?:"
|