projects
/
geekigeeki.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5be2755
)
Fix a few XHTML validation errors
author
Bernardo Innocenti
<bernie@codewiz.org>
Fri, 28 Mar 2008 08:26:28 +0000
(09:26 +0100)
committer
Bernardo Innocenti
<bernie@codewiz.org>
Fri, 28 Mar 2008 08:26:28 +0000
(09:26 +0100)
geekigeeki.py
patch
|
blob
|
history
diff --git
a/geekigeeki.py
b/geekigeeki.py
index 7695228a895cb33c7d9720980022aaae891a9b8a..76888601650f52e137b24a9278cbf9c5c12aad04 100755
(executable)
--- a/
geekigeeki.py
+++ b/
geekigeeki.py
@@
-332,7
+332,7
@@
class PageFormatter:
def __init__(self, raw):
self.raw = raw
self.h_level = 0
def __init__(self, raw):
self.raw = raw
self.h_level = 0
- self.in_pre = self.in_table = False
+ self.in_pre = self.in_table =
self.in_li =
False
self.in_header = True
self.list_indents = []
self.tr_cnt = 0
self.in_header = True
self.list_indents = []
self.tr_cnt = 0
@@
-356,12
+356,12
@@
class PageFormatter:
def _tit_repl(self, word):
if self.h_level:
def _tit_repl(self, word):
if self.h_level:
- result = '</h%d>' % self.h_level
+ result = '</h%d>
<p>\n
' % self.h_level
self.h_level = 0
else:
self.h_level = len(word) - 1
abridged = re.sub('[^A-Za-z0-9_]', '', self.line).lower()
self.h_level = 0
else:
self.h_level = len(word) - 1
abridged = re.sub('[^A-Za-z0-9_]', '', self.line).lower()
- result = '<h%d id="%s"><a class="heading" href="#%s">¶</a> ' % (self.h_level, abridged, abridged)
+ result = '
\n</p>
<h%d id="%s"><a class="heading" href="#%s">¶</a> ' % (self.h_level, abridged, abridged)
return result
def _br_repl(self, word):
return result
def _br_repl(self, word):
@@
-413,7
+413,11
@@
class PageFormatter:
'>': '>'}[s]
def _li_repl(self, match):
'>': '>'}[s]
def _li_repl(self, match):
- return '<li>'
+ if self.in_li:
+ return '</li><li>'
+ else:
+ self.in_li = True
+ return '<li>'
def _pre_repl(self, word):
if word == '{{{' and not self.in_pre:
def _pre_repl(self, word):
if word == '{{{' and not self.in_pre:
@@
-456,6
+460,9
@@
class PageFormatter:
s = '</p>'
while self._indent_level() > new_level:
del(self.list_indents[-1])
s = '</p>'
while self._indent_level() > new_level:
del(self.list_indents[-1])
+ if self.in_li:
+ s += '</li>'
+ self.in_li = False # FIXME
s += '</ul>\n'
while self._indent_level() < new_level:
self.list_indents.append(new_level)
s += '</ul>\n'
while self._indent_level() < new_level:
self.list_indents.append(new_level)
@@
-609,6
+616,7
@@
class Page:
return self.get_attrs().get(name, default)
def can(self, action, default=True):
return self.get_attrs().get(name, default)
def can(self, action, default=True):
+ acl = None
try:
#acl SomeUser:read,write All:read
acl = self.get_attr("acl", None)
try:
#acl SomeUser:read,write All:read
acl = self.get_attr("acl", None)