From: Vladimír Vondruš <mosra@centrum.cz>
Date: Sat, 19 May 2018 11:23:21 +0000 (+0200)
Subject: doxygen: implement <hruler/>.
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~cjwatson/git?a=commitdiff_plain;h=9e64f08bee4db39c423e437d52da06120f148de8;p=blog.git

doxygen: implement <hruler/>.
---

diff --git a/doxygen/dox2html5.py b/doxygen/dox2html5.py
index 317e8a9f..05105e4e 100755
--- a/doxygen/dox2html5.py
+++ b/doxygen/dox2html5.py
@@ -546,6 +546,7 @@ def parse_desc_internal(state: State, element: ET.Element, immediate_parent: ET.
         # Those elements are:
         # - <heading>
         # - <blockquote>
+        # - <hruler>
         # - <simplesect> (if not describing return type) and <xrefsect>
         # - <verbatim>, <preformatted> (those are the same thing!)
         # - <variablelist>, <itemizedlist>, <orderedlist>
@@ -571,7 +572,7 @@ def parse_desc_internal(state: State, element: ET.Element, immediate_parent: ET.
             end_previous_paragraph = False
 
             # Straightforward elements
-            if i.tag in ['heading', 'blockquote', 'xrefsect', 'variablelist', 'verbatim', 'preformatted', 'itemizedlist', 'orderedlist', 'image', 'table', '{http://mcss.mosra.cz/doxygen/}div']:
+            if i.tag in ['heading', 'blockquote', 'hruler', 'xrefsect', 'variablelist', 'verbatim', 'preformatted', 'itemizedlist', 'orderedlist', 'image', 'table', '{http://mcss.mosra.cz/doxygen/}div']:
                 end_previous_paragraph = True
 
             # <simplesect> describing return type is cut out of text flow, so
@@ -1037,6 +1038,10 @@ def parse_desc_internal(state: State, element: ET.Element, immediate_parent: ET.
                     out.parsed += '<img class="m-image{}" src="{}" alt="Image" />'.format(
                         ' ' + add_css_class if add_css_class else '', name)
 
+        elif i.tag == 'hruler':
+            assert element.tag == 'para' # is inside a paragraph :/
+            out.parsed += '<hr/>'
+
         # Custom <div> with CSS classes (for making dim notes etc)
         elif i.tag == '{http://mcss.mosra.cz/doxygen/}div':
             has_block_elements = True
diff --git a/doxygen/test/contents_autobrief_hr/namespaceNamespace.html b/doxygen/test/contents_autobrief_hr/namespaceNamespace.html
index fa1eafe3..5cc09f2a 100644
--- a/doxygen/test/contents_autobrief_hr/namespaceNamespace.html
+++ b/doxygen/test/contents_autobrief_hr/namespaceNamespace.html
@@ -31,7 +31,7 @@
             </li>
           </ul>
         </div>
-<p>SOME HEAVY LICENSE HEADER WITH SOME HEAVY WORDS</p>
+<p>SOME HEAVY LICENSE HEADER WITH SOME HEAVY WORDS</p><hr/>
         <section id="func-members">
           <h2><a href="#func-members">Functions</a></h2>
           <dl class="m-dox">
diff --git a/doxygen/test/contents_typography/index.html b/doxygen/test/contents_typography/index.html
index 66acc16a..0a33ca5c 100644
--- a/doxygen/test/contents_typography/index.html
+++ b/doxygen/test/contents_typography/index.html
@@ -25,7 +25,7 @@
 <section id="section"><h2><a href="#section">Page section</a></h2><blockquote><p>A blockquote.</p></blockquote><pre>Preformatted text.
 </pre><p>Paragraph<br />with<br />explicit<br />line<br />breaks.</p><pre>Differently
   preformatted
-text.</pre><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&nbsp;title: <a href="index.html#an-anchor" class="m-dox">&lt;anchor&gt;</a>.</p><p>Empty elements:</p><pre></pre></section></section></section>
+text.</pre><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&nbsp;title: <a href="index.html#an-anchor" class="m-dox">&lt;anchor&gt;</a>.</p><p>Empty elements:</p><pre></pre><hr/><p>Above is a horizontal line.</p></section></section></section>
       </div>
     </div>
   </div>
diff --git a/doxygen/test/contents_typography/input.dox b/doxygen/test/contents_typography/input.dox
index 0d437a89..7e5fdce9 100644
--- a/doxygen/test/contents_typography/input.dox
+++ b/doxygen/test/contents_typography/input.dox
@@ -41,6 +41,10 @@ in&nbsp;title: @ref an-anchor "<anchor>".
 
 Empty elements: <em></em> <tt></tt> <strong></strong> <pre></pre>
 
+- - -
+
+Above is a horizontal line.
+
 */
 
 /** @page warnings Content that produces warnings