Ticket #691: Wiki.patch

Wiki.py

@@ -61 +61 @@
               r"""(?P<modulehref>((?P<modulename>bug|ticket|browser|source|repos|report|changeset|wiki|search):(?P<moduleargs>(&#34;(.*?)&#34;|'(.*?)')|([^ ]*[^\., \)]))))""",
               r"""(?P<wikilink>(^|(?<=[^A-Za-z]))[!]?[A-Z][a-z0-9/.]+(?:[A-Z][a-z0-9/.]*[a-z0-9/])+(?=\Z|\s|,|\.|:))""",
+              r"""(?P<relativelink>link:(?P<rlink>([^ ]+)))""",
+              r"""(?P<fancyrelativelink>\[link:(?P<frlink>([^ ]+)) (?P<frlinkname>.*?)\])""",
               r"""(?P<fancylink>\[(?P<fancyurl>([a-z]+:[^ ]+)) (?P<linkname>.*?)\])"""]
 
@@ -183 +185 @@
         return '<a href="%s">%s</a>' % (match, match)
 
+    def _relativelink_formatter(self, match, fullmatch):
+        return '<a href="%s">%s</a>' % (fullmatch.group('rlink'), fullmatch.group('rlink'))
+
+    def _fancyrelativelink_formatter(self, match, fullmatch):
+        return '<a href="%s">%s</a>' % (fullmatch.group('frlink'), fullmatch.group('frlinkname'))
+
     def _fancylink_formatter(self, match, fullmatch):
         link = fullmatch.group('fancyurl')
@@ -226 +234 @@
     A simple Wiki formatter
     """
-    _rules = [r"""(?P<svnimg>(source|repos):([^ ]+)\.(PNG|png|JPG|jpg|JPEG|jpeg|GIF|gif))"""] + \
+    _rules = [r"""(?P<svnimg>(source|repos):([^ ]+)\.(PNG|png|JPG|jpg|JPEG|jpeg|GIF|gif))""",
+              r"""(?P<relativeimgurl>link:(?P<rimgurl>([^ ]+)\.(PNG|png|JPG|jpg|JPEG|jpeg|GIF|gif)(\?\S+)?))"""] + \
              CommonFormatter._rules + \
              [r"""(?P<macro>\[\[(?P<macroname>[a-zA-Z]+)(\((?P<macroargs>[^\)]*)\))?\]\])""",
@@ -324 +333 @@
                (self.env.href.file(match[prefix_len:], format='raw'),
                 match[prefix_len:])
+
+    def _relativeimgurl_formatter(self, match, fullmatch):
+        return '<img src="%s" alt="%s" />' % (fullmatch.group('rimgurl'), fullmatch.group('rimgurl'))
 
     def _imgurl_formatter(self, match, fullmatch):