doxygen: link text can contain nested elements.

diff --git a/doxygen/dox2html5.py b/doxygen/dox2html5.py
index 378d7dff9777e2ef6b249a16799c31f3c57ed22c..261a244246634d1a668a036b8c9c0054258d7adf 100755 (executable)
--- a/doxygen/dox2html5.py
+++ b/doxygen/dox2html5.py
@@ -105,7 +105,7 @@ def parse_ref(state: State, element: ET.Element) -> str:
     else:
         class_ = 'm-dox'
 
-    return '<a href="{}" class="{}">{}</a>'.format(url, class_, add_wbr(html.escape(element.text)))
+    return '<a href="{}" class="{}">{}</a>'.format(url, class_, add_wbr(parse_inline_desc(state, element).strip()))
 
 def extract_id(element: ET.Element) -> str:
     id = element.attrib['id']

diff --git a/doxygen/test/contents_typography/index.html b/doxygen/test/contents_typography/index.html
index 960cf0a27aa1898700e37b9b3fd3c9d5af8ff439..c9fcfe7ac58016ce8b260a6a4d1a58b5798f16f0 100644 (file)
--- a/doxygen/test/contents_typography/index.html
+++ b/doxygen/test/contents_typography/index.html
@@ -38,7 +38,7 @@
           My Project
         </h1>
 <section id="section"><h2><a href="#section">Page section</a></h2><blockquote><p>A blockquote.</p></blockquote><pre class="m-code">Preformatted text.
-</pre><p>Paragraph<br />with<br />explicit<br />line<br />breaks.</p><section id="subsection"><h3><a href="#subsection">Page subsection</a></h3><ul><li>Unordered</li><li>list</li><li>of<ul><li>nested</li><li>items</li></ul></li><li>and back</li></ul><section id="subsubsection"><h4><a href="#subsubsection">Sub-sub section</a></h4><ol><li>Ordered</li><li>list</li><li>of<ol><li>nested</li><li>items</li></ol></li><li>and back</li></ol><p><a name="an-anchor"></a> This is a <code>typewriter text</code>, <em>emphasis</em> and <strong>bold</strong>. <em>Emphasis with <code>typewriter</code> and <strong>bold</strong> nested.</em> <a href="http://google.com">http:/<wbr />/<wbr />google.com</a> and <a href="http://google.com">URL</a>. En-dash &ndash; and em-dash &mdash;. Reference to a <a href="index.html#subsection" class="m-dox">Page subsection</a>.</p></section></section></section>
+</pre><p>Paragraph<br />with<br />explicit<br />line<br />breaks.</p><section id="subsection"><h3><a href="#subsection">Page subsection</a></h3><ul><li>Unordered</li><li>list</li><li>of<ul><li>nested</li><li>items</li></ul></li><li>and back</li></ul><section id="subsubsection"><h4><a href="#subsubsection">Sub-sub section</a></h4><ol><li>Ordered</li><li>list</li><li>of<ol><li>nested</li><li>items</li></ol></li><li>and back</li></ol><p><a name="an-anchor"></a> This is a <code>typewriter text</code>, <em>emphasis</em> and <strong>bold</strong>. <em>Emphasis with <code>typewriter</code> and <strong>bold</strong> nested.</em> <a href="http://google.com">http:/<wbr />/<wbr />google.com</a> and <a href="http://google.com">URL</a>. En-dash &ndash; and em-dash &mdash;. Reference to a <a href="index.html#subsection" class="m-dox">Page subsection</a>. Named reference with special characters in title: <a href="warnings.html" class="m-dox">&raquo; Warnings &laquo;</a>. Reference with escaped characters in title: <a href="index.html#an-anchor" class="m-dox">&lt;anchor&gt;</a>.</p></section></section></section>
       </div>
     </div>
   </div>

diff --git a/doxygen/test/contents_typography/input.dox b/doxygen/test/contents_typography/input.dox
index 8d8e6c4ecb1de3807dd3b732ac043946175c99f1..3203529171b574f6e2a8a1df89fd8bade943f2e7 100644 (file)
--- a/doxygen/test/contents_typography/input.dox
+++ b/doxygen/test/contents_typography/input.dox
@@ -31,7 +31,9 @@ Paragraph \n with \n explicit \n line \n breaks.
 This is a `typewriter text`, *emphasis* and **bold**. <em>Emphasis with
 <tt>typewriter</tt> and <strong>bold</strong> nested.</em> http://google.com
 and [URL](http://google.com). En-dash -- and em-dash ---. Reference to a
-@ref subsection.
+@ref subsection. Named reference with special characters in title:
+@ref warnings "&raquo; Warnings &laquo;". Reference with escaped characters in
+title: @ref an-anchor "<anchor>".
 
 */