X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=geekigeeki.py;h=43b9cc1107ac68b484b205b86e69f79d18107b25;hb=3c14378f82db1c48eee23445edd2fd59e03349dd;hp=83b6142a0a82d6cd457c53baf76154dccbb1eb89;hpb=aa564134b01555f0288e16ae09ca5a87533d3155;p=geekigeeki.git

diff --git a/geekigeeki.py b/geekigeeki.py
index 83b6142..43b9cc1 100755
--- a/geekigeeki.py
+++ b/geekigeeki.py
@@ -336,18 +336,27 @@ class PageFormatter:
     def __init__(self, raw):
         self.raw = raw
         self.h_level = 0
-        self.in_pre = self.in_table = self.in_var = self.in_em = self.in_b = False
+        self.in_pre = self.in_table = False
         self.in_header = True
         self.list_indents = []
         self.tr_cnt = self.h_cnt = 0
+        self.styles = {
+            #wiki   html   enabled?
+            "//":  ["em",  False],
+            "''":  ["em",  False],
+            "**":  ["b",   False],
+            "'''": ["b",   False],
+            "##":  ["tt",  False],
+            "``":  ["tt",  False],
+            "__":  ["u",   False],
+            "^^":  ["sup", False],
+            ",,":  ["sub", False]
+        }
 
     def _b_repl(self, word):
-        self.in_b = not self.in_b
-        return ['</strong>', '<strong>'][self.in_b]
-
-    def _em_repl(self, word):
-        self.in_em = not self.in_em
-        return ['</em>', '<em>'][self.in_em]
+        style = self.styles[word]
+        style[1] = not style[1]
+        return ['</','<'][style[1]] + style[0] + '>'
 
     def _tit_repl(self, word):
         if self.h_level:
@@ -432,15 +441,6 @@ class PageFormatter:
             cl = 'notice'
         return '<strong class="highlight ' + cl + '">' + word + '</strong>'
 
-    def _var_repl(self, word):
-        if word == '{{' and not self.in_var:
-            self.in_var = True
-            return '<code>'
-        elif self.in_var:
-            self.in_var = False
-            return '</code>'
-        return ''
-
     def _tr_repl(self, word):
         out = ''
         if not self.in_table:
@@ -500,8 +500,7 @@ class PageFormatter:
         scan_re = re.compile(
             r"(?:"
             # Formatting
-            + r"(?P<b>\*\*|''')"
-            + r"|(?P<em>//|'')"
+            + r"(?P<b>\*\*|'''|//|''|##|``|__|\^\^|,,)"
             + r"|(?P<tit>\={2,6})"
             + r"|(?P<br>\\\\)"
             + r"|(?P<rule>^-{3,})"
@@ -519,7 +518,6 @@ class PageFormatter:
             # Lists, divs, spans
             + r"|(?P<li>^\s+[\*#] +)"
             + r"|(?P<pre>\{\{\{|\s*\}\}\})"
-            + r"|(?P<var>\{\{|\}\})"
 
             # Tables
             + r"|(?P<tr>^\s*\|\|(=|)\s*)"