Merge branch 'master' of ssh://trinity.codewiz.org/~/public_html/wiki/git/geekigeeki

diff --git a/geekigeeki.py b/geekigeeki.py
index aa54781073b62048ff81f144243ecebfca6f9ae8..9d2bf9e12e8dea0617622960871baa95a990d753 100755 (executable)
--- a/geekigeeki.py
+++ b/geekigeeki.py
@@ -614,8 +614,8 @@ class WikiFormatter:
                     print('</p><p>')
                 else:
                     indent = indent_re.match(self.line)
-                    #3.0: print(self._indent_to(len(indent.group(0))), end=' ')
                     print(self._indent_to(len(indent.group(1)), indent.group(2)))
+                    # Stand back! Here we apply the monster regex that does all the parsing
                     print(re.sub(scan_re, self.replace, self.line))
 
         if self.in_pre: print('</pre>')
@@ -668,7 +668,7 @@ class Page:
         out = '== '
         pathname = ''
         for dirname in self.page_name.strip('/').split('/'):
-            pathname = (pathname + '/' + dirname) if pathname else dirname
+            pathname = (pathname and pathname + '/' ) + dirname
             out += '[[' + pathname + '|' + dirname + ']]/'
         out += ' ==\n'