chiark / gitweb /
documentation/doxygen: dedicated test for Doxygen 1.9 blockquote bugs.
authorVladimír Vondruš <mosra@centrum.cz>
Mon, 10 Jan 2022 18:56:36 +0000 (19:56 +0100)
committerVladimír Vondruš <mosra@centrum.cz>
Mon, 10 Jan 2022 20:04:13 +0000 (21:04 +0100)
And removing the problematic interaction from the general typography
test -- it's now here instead.

documentation/test_doxygen/contents_blockquote/Doxyfile [new file with mode: 0644]
documentation/test_doxygen/contents_blockquote/index.html [new file with mode: 0644]
documentation/test_doxygen/contents_blockquote/input.dox [new file with mode: 0644]
documentation/test_doxygen/contents_typography/index.html
documentation/test_doxygen/contents_typography/input.dox
documentation/test_doxygen/test_contents.py

diff --git a/documentation/test_doxygen/contents_blockquote/Doxyfile b/documentation/test_doxygen/contents_blockquote/Doxyfile
new file mode 100644 (file)
index 0000000..0797976
--- /dev/null
@@ -0,0 +1,14 @@
+INPUT                   = input.dox
+QUIET                   = YES
+GENERATE_HTML           = NO
+GENERATE_LATEX          = NO
+GENERATE_XML            = YES
+XML_PROGRAMLISTING      = NO
+CASE_SENSE_NAMES        = YES
+
+##! M_PAGE_FINE_PRINT   =
+##! M_THEME_COLOR       =
+##! M_FAVICON           =
+##! M_LINKS_NAVBAR1     =
+##! M_LINKS_NAVBAR2     =
+##! M_SEARCH_DISABLED   = YES
diff --git a/documentation/test_doxygen/contents_blockquote/index.html b/documentation/test_doxygen/contents_blockquote/index.html
new file mode 100644 (file)
index 0000000..350ff81
--- /dev/null
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8" />
+  <title>My Project</title>
+  <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,400i,600,600i%7CSource+Code+Pro:400,400i,600" />
+  <link rel="stylesheet" href="m-dark+documentation.compiled.css" />
+  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+</head>
+<body>
+<header><nav id="navigation">
+  <div class="m-container">
+    <div class="m-row">
+      <a href="index.html" id="m-navbar-brand" class="m-col-t-8 m-col-m-none m-left-m">My Project</a>
+    </div>
+  </div>
+</nav></header>
+<main><article>
+  <div class="m-container m-container-inflatable">
+    <div class="m-row">
+      <div class="m-col-l-10 m-push-l-1">
+        <h1>
+          My Project
+        </h1>
+<p>Mainly containing tests for Doxygen 1.9 parsing regressions and weirdness.</p><blockquote><p>A blockquote. In 1.9 it has a ZWJ added in the XML, which should get stripped away again.</p></blockquote><pre>Preformatted text after a blockquote. In 1.9 it will get parsed just as a
+regular paragraph unless there&#x27;s a dot before.
+</pre><blockquote><p>Another blockquote.</p></blockquote><pre class="m-code"><span class="c1">// code block that shouldn&#39;t be treated as inline</span></pre><blockquote><pre class="m-code"><span class="c1">// quoted code block that should be neither inline nor in a paragraph</span></pre></blockquote><p>A delimiting paragraph, just to not have a blockqoute right after another blockquote.</p><blockquote><p>Another blockquote.</p></blockquote><p><code class="m-code"><span class="s">&quot;inline&quot;</span> <span class="o">+</span> <span class="n">code</span></code> in a usual paragraph.</p><blockquote><p>Another blockquote.</p></blockquote><p><code class="m-code"><span class="s">&quot;inline&quot;</span> <span class="o">+</span> <span class="n">code</span></code> <strong>with a tag after.</strong></p>
+      </div>
+    </div>
+  </div>
+</article></main>
+</body>
+</html>
diff --git a/documentation/test_doxygen/contents_blockquote/input.dox b/documentation/test_doxygen/contents_blockquote/input.dox
new file mode 100644 (file)
index 0000000..c2607c2
--- /dev/null
@@ -0,0 +1,32 @@
+/** @mainpage
+
+Mainly containing tests for Doxygen 1.9 parsing regressions and weirdness.
+
+> A blockquote. In 1.9 it has a ZWJ added in the XML, which should get stripped
+> away again.
+
+    Preformatted text after a blockquote. In 1.9 it will get parsed just as a
+    regular paragraph unless there's a dot before.
+
+> Another blockquote.
+
+@code{.cpp}
+// code block that shouldn't be treated as inline
+@endcode
+
+> @code{.cpp}
+> // quoted code block that should be neither inline nor in a paragraph
+> @endcode
+
+A delimiting paragraph, just to not have a blockqoute right after another
+blockquote.
+
+> Another blockquote.
+
+@code{.cpp} "inline" + code @endcode in a usual paragraph.
+
+> Another blockquote.
+
+@code{.cpp} "inline" + code @endcode <b>with a tag after.</b>
+
+*/
index c06a041363fe911e4797ab0279e9f358078f7dca..f1dccd1f87378bc5859b2a346c254d5a8e497f4a 100644 (file)
@@ -22,8 +22,8 @@
         <h1>
           My Project
         </h1>
-<blockquote><p>A blockquote.</p></blockquote><pre>Preformatted text.
-</pre><p>Paragraph<br />with<br />explicit<br />line<br />breaks.</p><section id="section"><h2><a href="#section">Page section</a></h2><pre>Differently
+<blockquote><p>A blockquote.</p></blockquote><p>Paragraph<br />with<br />explicit<br />line<br />breaks.</p><pre>Preformatted text.
+</pre><section id="section"><h2><a href="#section">Page section</a></h2><pre>Differently
   preformatted
 text.</pre><ul><li>Unordered</li><li>list</li><li>of<ul><li>nested</li><li>items</li></ul></li><li>and back</li></ul><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>, <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>. <small>Small <em>text</em>.</small> En-dash &ndash; and em-dash &mdash;. Reference to a <a href="index.html#section" class="m-doc">Page section</a>. Named reference with special characters in title: <a href="index.html#section" class="m-doc">&raquo; Warnings &laquo;</a>. Reference with escaped characters in&nbsp;title: <a href="index.html#an-anchor" class="m-doc">&lt;anchor&gt;</a>.</p><p>2<sup>nd</sup> is L<sub>&infin;</sub> &forall; &nabla; &pi; &real; &image; This costs no $, &euro;, &pound;, &yen; or &curren;.</p><p>Empty elements:</p><pre></pre><hr/><p>Above is a horizontal line.</p></section>
       </div>
index 61d53473938189bf9420e0868ba37278bd6cf729..29c0cb8013acdbcdd66573c2bc415c8ac4a5d319 100644 (file)
@@ -2,10 +2,10 @@
 
 > A blockquote.
 
-    Preformatted text.
-
 Paragraph \n with \n explicit \n line \n breaks.
 
+    Preformatted text.
+
 @section section Page section
 
 <pre>Differently
index a505c867d98e54fde70215df5fd32c5e50ae6848..debb41d7bf344ea0d82a70fdce396ddfa267d2e6 100644 (file)
@@ -504,3 +504,8 @@ class CodeFilters(IntegrationTestCase):
             }
         })
         self.assertEqual(*self.actual_expected_contents('index.html'))
+
+class Blockquote(IntegrationTestCase):
+    def test(self):
+        self.run_doxygen(wildcard='indexpage.xml')
+        self.assertEqual(*self.actual_expected_contents('index.html'))