projects
/
geekigeeki.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://sunjammer.codewiz.org/~/wiki/git/geekigeeki
[geekigeeki.git]
/
geekigeeki.py
diff --git
a/geekigeeki.py
b/geekigeeki.py
index 84cc9afa490ab574c859b4523ae124873b8e538a..44b5131bb1435a0e2781f56a8583e108b52b0b75 100755
(executable)
--- a/
geekigeeki.py
+++ b/
geekigeeki.py
@@
-610,8
+610,8
@@
class WikiFormatter:
print('</p><p>')
else:
indent = indent_re.match(self.line)
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)))
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>')
print(re.sub(scan_re, self.replace, self.line))
if self.in_pre: print('</pre>')
@@
-664,7
+664,7
@@
class Page:
out = '== '
pathname = ''
for dirname in self.page_name.strip('/').split('/'):
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'
out += '[[' + pathname + '|' + dirname + ']]/'
out += ' ==\n'