uniform url/link rendering. add missing link
1 --- a/mwlib/rl/rlwriter.py Tue Nov 18 17:40:54 2008 +0100
2 +++ b/mwlib/rl/rlwriter.py Thu Nov 20 14:15:20 2008 +0100
3 @@ -950,7 +950,7 @@
4 writeSpecialLink = writeLink
5
6 def renderURL(self, url):
7 - url = xmlescape(url)
8 + url = xmlescape(url)
9 zws = '<font fontSize="1"> </font>'
10 url = url.replace("/",u'/%s' % zws).replace('&', u'&%s' % zws).replace('.','.%s' % zws).replace('+', '+%s' % zws)
11 return url
12 @@ -966,7 +966,7 @@
13 if (self.tableNestingLevel and len(href) > 30) and not self.ref_mode:
14 return self.writeNamedURL(obj)
15
16 - txt = '<link href="%s"><font fontName="%s">%s</font></link>' % (href, standardMonoFont, display_text)
17 + txt = '<link href="%s">%s</link>' % (href, display_text)
18 return [txt]
19
20 def writeNamedURL(self,obj):
21 @@ -977,7 +977,7 @@
22 self.references.append(i)
23 else: # we are writing a reference section. we therefore directly print URLs
24 txt = self.renderInline(obj)
25 - txt.append(' <font size="%d">(%s)</font>' % (SMALLFONTSIZE, self.renderURL(href)))
26 + txt.append(' <link href="%s">(%s)</link>' % (xmlescape(href), self.renderURL(urllib.unquote(href))))
27 return [''.join(txt)]
28
29 if not obj.children: