From: Vladimír Vondruš <mosra@centrum.cz>
Date: Mon, 1 Jan 2018 20:22:48 +0000 (+0100)
Subject: m.dox: not just pages can have sections.
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~cjwatson/git?a=commitdiff_plain;h=c18a029782cdedf5d0e98586efc5abbdfbdf45d5;p=blog.git

m.dox: not just pages can have sections.
---

diff --git a/pelican-plugins/m/dox.py b/pelican-plugins/m/dox.py
index f3c35d9e..aad2de1c 100644
--- a/pelican-plugins/m/dox.py
+++ b/pelican-plugins/m/dox.py
@@ -58,10 +58,6 @@ def init(pelicanobj):
                     link = path + child.find('filename').text + '.html'
                     symbol_mapping[child.find('name').text] = (child.find('title').text, link)
 
-                    # Page sections
-                    for section in child.findall('docanchor'):
-                        symbol_mapping[section.text] = (section.attrib.get('title', ''), link + '#' + section.text)
-
                 # Linking to files
                 if child.attrib['kind'] == 'file':
                     link = path + child.find('filename').text + ".html"
@@ -98,6 +94,10 @@ def init(pelicanobj):
                             for value in member.findall('enumvalue'):
                                 symbol_mapping[enumeration + '::' + value.text] = (None, link + '#' + value.attrib['anchor'])
 
+                # Sections
+                for section in child.findall('docanchor'):
+                    symbol_mapping[section.text] = (section.attrib.get('title', ''), link + '#' + section.text)
+
 def dox(name, rawtext, text, lineno, inliner: Inliner, options={}, content=[]):
     title, target = parse_link(text)
 
diff --git a/pelican-plugins/m/test/dox/page.html b/pelican-plugins/m/test/dox/page.html
index fc0d953a..87415d1c 100644
--- a/pelican-plugins/m/test/dox/page.html
+++ b/pelican-plugins/m/test/dox/page.html
@@ -30,6 +30,7 @@
 <li><a href="http://doc.magnum.graphics/corrade/testsuite.html">Custom link title</a></li>
 <li><a href="http://doc.magnum.graphics/corrade/corrade-cmake.html">Page link with custom title</a></li>
 <li><a href="http://doc.magnum.graphics/corrade/">Link to index page</a></li>
+<li><a href="http://doc.magnum.graphics/corrade/classCorrade_1_1TestSuite_1_1Tester.html#TestSuite-Tester-command-line">Link to class documentation section</a></li>
 </ul>
 <p>These should produce warnings:</p>
 <ul>
diff --git a/pelican-plugins/m/test/dox/page.rst b/pelican-plugins/m/test/dox/page.rst
index 47102b94..6f3cfe1d 100644
--- a/pelican-plugins/m/test/dox/page.rst
+++ b/pelican-plugins/m/test/dox/page.rst
@@ -7,6 +7,7 @@ m.dox
 -   :dox:`Custom link title <testsuite>`
 -   :dox:`Page link with custom title <corrade-cmake>`
 -   :dox:`Link to index page <corrade>`
+-   :dox:`Link to class documentation section <TestSuite-Tester-command-line>`
 
 These should produce warnings: