From: Vladimír Vondruš <mosra@centrum.cz>
Date: Thu, 14 Dec 2017 21:32:43 +0000 (+0100)
Subject: doxygen: test that nested inline elements are parsed properly.
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~cjwatson/git?a=commitdiff_plain;h=693cbe327f4cf1a677c319808d695cdd98232b34;p=blog.git

doxygen: test that nested inline elements are parsed properly.

Not really, the whitespace is stripped where it should be preserved.
---

diff --git a/doxygen/test/contents_custom/index.html b/doxygen/test/contents_custom/index.html
index f21a915d..6113ea02 100644
--- a/doxygen/test/contents_custom/index.html
+++ b/doxygen/test/contents_custom/index.html
@@ -37,7 +37,7 @@
         <h1>
           My Project
         </h1>
-<div class="m-note m-dim m-text-center">This paragraph is rendered in a dim note, centered.</div><p>This paragraph contains a <span class="m-text m-danger">red text</span> in a normal text flow and then  <strong class="m-text m-em m-small">small strong italics</strong>,   <em class="m-text m-info">blue italics</em> and  <a href="https://mcss.mosra.cz" class="m-text m-big">https:/<wbr />/<wbr />mcss.mosra.cz</a> (big-ass link).</p><p>A paragraph that is not affected by the inline classes from above.</p><p class="m-text m-strong m-noindent">Bold, non-indented paragraph.</p><p class="m-text m-primary"><strong>Bold text that should not have</strong> the same class as the paragraph.</p><p>A paragraph that doesn&#x27;t have any class applied. Next, a full-width image:</p><img class="m-image m-fullwidth" src="ship-small.jpg" alt="Image" /><figure class="m-figure m-flat"><img src="ship-small.jpg" alt="Image" /><figcaption>A flat figure</figcaption></figure><p>A fullwidth table:</p><table class="m-table m-fullwidth"><thead><tr><th>Table header</th><th>Another</th></tr></thead><tbody><tr><td>Cell</td><td>Another cell</td></tr><tr><td>Next row</td><td>Last.</td></tr></tbody></table><p>An unstyled list:</p><ul class="m-unstyled"><li>First item without a dot</li><li>Second item without a dot</li></ul>
+<div class="m-note m-dim m-text-center">This paragraph <em>is</em> rendered in a dim note, centered.</div><p>This paragraph contains a <span class="m-text m-danger"><em>red</em> text</span> in a normal text flow and then  <strong class="m-text m-em m-small">small strong italics</strong>,   <em class="m-text m-info">blue italics</em> and  <a href="https://mcss.mosra.cz" class="m-text m-big">https:/<wbr />/<wbr />mcss.mosra.cz</a> (big-ass link).</p><p>A paragraph that is not affected by the inline classes from above.</p><p class="m-text m-strong m-noindent">Bold, non-indented paragraph.</p><p class="m-text m-primary"><strong>Bold text that should not have</strong> the same class as the paragraph.</p><p>A paragraph that doesn&#x27;t have any class applied. Next, a full-width image:</p><img class="m-image m-fullwidth" src="ship-small.jpg" alt="Image" /><figure class="m-figure m-flat"><img src="ship-small.jpg" alt="Image" /><figcaption>A flat figure</figcaption></figure><p>A fullwidth table:</p><table class="m-table m-fullwidth"><thead><tr><th>Table header</th><th>Another</th></tr></thead><tbody><tr><td>Cell</td><td>Another cell</td></tr><tr><td>Next row</td><td>Last.</td></tr></tbody></table><p>An unstyled list:</p><ul class="m-unstyled"><li>First item without a dot</li><li>Second item without a dot</li></ul>
       </div>
     </div>
   </div>
diff --git a/doxygen/test/contents_custom/input.dox b/doxygen/test/contents_custom/input.dox
index d05777b3..6c9951f6 100644
--- a/doxygen/test/contents_custom/input.dox
+++ b/doxygen/test/contents_custom/input.dox
@@ -1,9 +1,9 @@
 /** @mainpage
 
-@m_div{m-note m-dim m-text-center} This paragraph is rendered in a dim note,
+@m_div{m-note m-dim m-text-center} This paragraph *is* rendered in a dim note,
 centered. @m_enddiv
 
-This paragraph contains a @m_span{m-text m-danger} red text @m_endspan in
+This paragraph contains a @m_span{m-text m-danger} *red* text @m_endspan in
 a normal text flow and then @m_class{m-text m-em m-small} **small strong italics**,
 @m_class{m-text m-info} *blue italics* and @m_class{m-text m-big} https://mcss.mosra.cz
 (big-ass link).
diff --git a/doxygen/test/contents_typography/index.html b/doxygen/test/contents_typography/index.html
index b76b510d..960cf0a2 100644
--- 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>. <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>.</p></section></section></section>
       </div>
     </div>
   </div>
diff --git a/doxygen/test/contents_typography/input.dox b/doxygen/test/contents_typography/input.dox
index 90b59ffe..8d8e6c4e 100644
--- a/doxygen/test/contents_typography/input.dox
+++ b/doxygen/test/contents_typography/input.dox
@@ -28,8 +28,9 @@ Paragraph \n with \n explicit \n line \n breaks.
 
 @anchor an-anchor
 
-This is a `typewriter text`, *emphasis* and **bold**. http://google.com and
-[URL](http://google.com). En-dash -- and em-dash ---. Reference to a
+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.
 
 */