Ticket #992: anchors.3.diff

trac/Href.py

@@ -136 +136 @@
             return href_join(self.base, 'about_trac')
 
     def wiki(self, page=None, version=None, diff=0, history=0):
+        anchor = ""
+        if page and page.find("#") != -1:
+            anchor = page[page.find('#'):]
+            page = page[:page.find('#')]
         if page and version and diff:
-            return href_join(self.base, 'wiki', page) + '?version=' + str(version) + '&diff=yes'
+            return href_join(self.base, 'wiki', page) + anchor + '?version=' + str(version) + '&diff=yes'
         elif page and version:
-            return href_join(self.base, 'wiki', page) + '?version=' + str(version)
+            return href_join(self.base, 'wiki', page) + anchor + '?version=' + str(version)
         elif page and history:
-            return href_join(self.base, 'wiki', page) + '?history=yes'
+            return href_join(self.base, 'wiki', page) + anchor + '?history=yes'
         elif page:
-            return href_join(self.base, 'wiki', page)
+            return href_join(self.base, 'wiki', page) + anchor
         else:
             return href_join(self.base, 'wiki')
 

trac/WikiFormatter.py

@@ -45 +45 @@
               r"""(?P<changesethref>!?\[\d+\])""",
               r"""(?P<reporthref>!?\{\d+\})""",
               r"""(?P<modulehref>!?((?P<modulename>bug|ticket|browser|source|repos|report|changeset|wiki|milestone|search):(?P<moduleargs>(&#34;(.*?)&#34;|'(.*?)')|([^ ]*[^'~_\., \)]))))""",
-              r"""(?P<wikilink>!?(^|(?<=[^A-Za-z]))[A-Z][a-z]+(?:[A-Z][a-z]*[a-z/])+(?=\Z|\s|[.,;:!?\)}\]]))""",
+              r"""(?P<wikilink>!?(^|(?<=[^A-Za-z]))[A-Z][a-z]+(?:[A-Z][a-z]*[a-z/])+(?:#[A-Za-z0-9]+)?(?=\Z|\s|[.,;:!?\)}\]]))""",
               r"""(?P<fancylink>!?\[(?P<fancyurl>([a-z]+:[^ ]+)) (?P<linkname>.*?)\])"""]
 
     _open_tags = []
@@ -162 +162 @@
             else:
                 return self._href.ticket(args), '%s:%s' % (module, args), 1, ''
         elif module == 'wiki':
-            if not self.env._wiki_pages.has_key(args):
+            page = args
+            if page.find('#') != -1: page = page[:page.find('#')]
+            if not self.env._wiki_pages.has_key(page):
                 return self._href.wiki(args), '%s:%s' % (module, args), 1, None
             else:
                 return self._href.wiki(args), '%s:%s' % (module, args), 0, None
@@ -204 +206 @@
             return match
 
     def _wikilink_formatter(self, match, fullmatch):
-        if not self.env._wiki_pages.has_key(match):
+        page = match
+        if page.find('#') != -1: page = page[:page.find('#')]
+        if not self.env._wiki_pages.has_key(page):
             return '<a class="missing" href="%s">%s?</a>' % \
                    (self._href.wiki(match), match)
         else:
@@ -269 +273 @@
 
     _compiled_rules = re.compile('(?:' + string.join(_rules, '|') + ')')
     _processor_re = re.compile('#\!([a-zA-Z0-9/+-]+)')
+    _anchor_re = re.compile('[^\w\d]+')
     mime_type = ""
     
 
@@ -362 +367 @@
         self.close_paragraph()
         self.close_indentation()
         self.close_list()
-        self.out.write('<h%d>%s</h%d>' % (depth, match[depth + 1:len(match) - depth - 1], depth))
+        heading = match[depth + 1:len(match) - depth - 1]
+        anchor = self._anchor_re.sub("", heading)
+        self.out.write('<a name="%s"><h%d>%s</h%d></a>' % (anchor, depth, heading, depth))
         return ''
 
     def _svnimg_formatter(self, match, fullmatch):