Disallow legacy syntax inside HTML blocks

diff --git a/geekigeeki.py b/geekigeeki.py
index 38870c8539c1bb39fc29b61be63878cefe0f635d..c87429bbedf615247ec378b771b93459a206c1f4 100755 (executable)
--- a/geekigeeki.py
+++ b/geekigeeki.py
@@ -155,7 +155,7 @@ def send_title(name, text="Limbo", msg_text=None, msg_type='error', writable=Fal
         print '  <b>' + link_tag('?fullsearch=' + name, text, 'navlink') + '</b> '
     else:
         print '  <b>' + text + '</b> '
-    print ' | ' + link_tag('FrontPage', 'Home', 'navlink')
+    print ' | ' + link_tag('FrontPage','Home', 'navlink')
     print ' | ' + link_tag('FindPage', 'Find Page', 'navlink')
     if 'history_url' in globals():
         print ' | <a href="' + relative_url(history_url) + '" class="navlink">Recent Changes</a>'
@@ -326,9 +326,9 @@ class WikiFormatter:
             "__":  ["u",   False],
             "^^":  ["sup", False],
             ",,":  ["sub", False],
-            "''":  ["em",  False], # OBSOLETE
-            "'''": ["b",   False], # OBSOLETE
-            "``":  ["tt",  False], # OBSOLETE
+            "''":  ["em",  False], # LEGACY
+            "'''": ["b",   False], # LEGACY
+            "``":  ["tt",  False], # LEGACY
         }
 
     def _b_repl(self, word):
@@ -379,12 +379,6 @@ class WikiFormatter:
         m = link_re.match(word)
         return link_tag(m.group(1), m.group(2))
 
-    def _url_repl(self, word):
-        return link_tag(word)
-
-    def _word_repl(self, word):
-        return link_tag(word)
-
     def _inl_repl(self, word):
         m = link_re.match(word)
         name = relative_url(m.group(1))
@@ -405,12 +399,6 @@ class WikiFormatter:
         else:
             return '<a href="%s"><img border="0" src="%s" /></a>' % (name, name)
 
-    def _img_repl(self, word):
-        return self._inl_repl('{{' + word + '}}')
-
-    def _email_repl(self, word):
-        return '<a href="mailto:%s">%s</a>' % (word, word)
-
     def _html_repl(self, word):
         self.in_html += 1
         return word; # Pass through
@@ -426,6 +414,21 @@ class WikiFormatter:
                 '<': '&lt;',
                 '>': '&gt;'}[s]
 
+    def _img_repl(self, word): # LEGACY
+        return self._inl_repl('{{' + word + '}}')
+
+    def _word_repl(self, word): # LEGACY
+        if self.in_html: return word # pass through
+        return link_tag(word)
+
+    def _url_repl(self, word): # LEGACY
+        if self.in_html: return word # pass through
+        return link_tag(word)
+
+    def _email_repl(self, word): # LEGACY
+        if self.in_html: return word # pass through
+        return '<a href="mailto:%s">%s</a>' % (word, word)
+
     def _li_repl(self, match):
         if self.in_li:
             return '</li><li>'