projects
/
geekigeeki.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update to gitweb 1.5.6.5
[geekigeeki.git]
/
geekigeeki.py
diff --git
a/geekigeeki.py
b/geekigeeki.py
index 2e2ef72160395e00d6ea40566c882ecf1d2762fd..1221e701f7f1437d09cc64913287da0ebf90b9cb 100755
(executable)
--- a/
geekigeeki.py
+++ b/
geekigeeki.py
@@
-126,6
+126,10
@@
def send_title(name, text="Limbo", msg_text=None, msg_type='error', writable=Fal
if not name:
print ' <meta name="robots" content="noindex,nofollow" />'
if not name:
print ' <meta name="robots" content="noindex,nofollow" />'
+ for meta in meta_urls:
+ http_equiv, content = meta
+ print ' <meta http-equiv="%s" content="%s" />' % (http_equiv, relative_url(content))
+
for link in link_urls:
rel, href = link
print ' <link rel="%s" href="%s" />' % (rel, relative_url(href))
for link in link_urls:
rel, href = link
print ' <link rel="%s" href="%s" />' % (rel, relative_url(href))
@@
-515,7
+519,7
@@
class WikiFormatter:
+ r"|(?P<hurl>\[\[([^\s\|]+)(?:\s*\|\s*([^\]]+)|)\]\])"
# Inline HTML
+ r"|(?P<hurl>\[\[([^\s\|]+)(?:\s*\|\s*([^\]]+)|)\]\])"
# Inline HTML
- + r"|(?P<html><(/|)(br|hr|div|
form|iframe|input|span)
)"
+ + r"|(?P<html><(/|)(br|hr|div|
span|form|iframe|input|textarea|a|img|h[1-5])[^>]*>
)"
+ r"|(?P<ent>[<>&])"
# Auto links (LEGACY)
+ r"|(?P<ent>[<>&])"
# Auto links (LEGACY)
@@
-561,7
+565,7
@@
class WikiFormatter:
print '</p><p>'
else:
indent = indent_re.match(self.line)
print '</p><p>'
else:
indent = indent_re.match(self.line)
- print self._indent_to(len(indent.group(0)))
+ print self._indent_to(len(indent.group(0)))
,
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>'