m.code,doxygen: test inline ANSI code highlighting.

Because it got broken with Pygments newer than the ancient 2.6.1 fork I
have (it now unconditionally adds a wrapper <div>), and unfortunately I
can't see how to not do that in 2.14 without delegating into private
APIs.

So just to have that problematic part reproduced in tests, once I get to
that. Unfortunately latest Pelican doesn't work with older Pygments
anymore for some reason (or, well, disallows it), so I can't generate
the website until I have this fixed properly. Ugh.

diff --git a/documentation/test_doxygen/contents_code_language/ansi.html b/documentation/test_doxygen/contents_code_language/ansi.html
index a071d1e36fa2db44c196160e0d6106bb72e34a57..b2db02dc5da07f0284b969b300444cc715d54410 100644 (file)
--- a/documentation/test_doxygen/contents_code_language/ansi.html
+++ b/documentation/test_doxygen/contents_code_language/ansi.html
@@ -22,7 +22,7 @@
         <h1>
           ANSI color escape code highlighting
         </h1>
-<pre class="m-console">!<span class="g g-AnsiBlue">[</span><span class="g g-AnsiBrightWhite">mosra@don-perverzo </span><span class="g g-AnsiWhite">m.css</span><span class="g g-AnsiBlue">]</span><span class="g g-AnsiBrightCyan">$ </span></pre><pre class="m-console"><span style="color: #dcdcdc; background-color: #dcdcdc">██</span> <span style="color: #a5c9ea; background-color: #a5c9ea">██</span> <span style="color: #3bd267; background-color: #3bd267">██</span> <span style="color: #c7cf2f; background-color: #c7cf2f">██</span> <span style="color: #cd3431; background-color: #cd3431">██</span> <span style="color: #2f83cc; background-color: #2f83cc">▓▓</span> <span style="color: #747474; background-color: #747474">▒▒</span>
+<p>Including <code class="m-console"><span class="g g-AnsiRed">inline</span></code> highlighting:</p><pre class="m-console">!<span class="g g-AnsiBlue">[</span><span class="g g-AnsiBrightWhite">mosra@don-perverzo </span><span class="g g-AnsiWhite">m.css</span><span class="g g-AnsiBlue">]</span><span class="g g-AnsiBrightCyan">$ </span></pre><pre class="m-console"><span style="color: #dcdcdc; background-color: #dcdcdc">██</span> <span style="color: #a5c9ea; background-color: #a5c9ea">██</span> <span style="color: #3bd267; background-color: #3bd267">██</span> <span style="color: #c7cf2f; background-color: #c7cf2f">██</span> <span style="color: #cd3431; background-color: #cd3431">██</span> <span style="color: #2f83cc; background-color: #2f83cc">▓▓</span> <span style="color: #747474; background-color: #747474">▒▒</span>
 
 Leading zeros: <span style="color: #0f7403; background-color: #0f7403">▒▒</span> <span style="color: #0f7403">▒▒</span>
 

diff --git a/documentation/test_doxygen/contents_code_language/input.dox b/documentation/test_doxygen/contents_code_language/input.dox
index a35fefc5368ff51c503ee9a2d25e3b51a8cad958..1ee303f41c7921166842a30273cfde39c2a0f394 100644 (file)
--- a/documentation/test_doxygen/contents_code_language/input.dox
+++ b/documentation/test_doxygen/contents_code_language/input.dox
@@ -32,6 +32,8 @@ Another paragraph.
 
 /** @page ansi ANSI color escape code highlighting
 
+Including @code{.ansi} \e[31minline @endcode highlighting:
+
 @code{.ansi}
 !\e[0;34m[\e[1;37mmosra@don-perverzo \e[0;37mm.css\e[0;34m]\e[1;36m$ \e[0m
 @endcode

diff --git a/plugins/m/test/code/page.html b/plugins/m/test/code/page.html
index 1d85e6ad9b37cb694ec8f4af6e84d5471230ee84..2a63fc1e06fc20bd4d5b88a3329c0e92955b6385 100644 (file)
--- a/plugins/m/test/code/page.html
+++ b/plugins/m/test/code/page.html
@@ -50,7 +50,7 @@ ASan reports:
 <p>Syntax highlighting:</p>
 <pre class="m-code"><span class="c1"># Comment</span>
 <span class="n">var</span> <span class="o">=</span> <span class="s2">&quot;string</span><span class="si">{}</span><span class="s2">escape</span><span class="se">\n</span><span class="s2">&quot;</span></pre>
-<p>Console colors:</p>
+<p>Console colors, including <code class="m-console"><span class="g g-AnsiRed">inline</span></code> code:</p>
 <pre class="m-console"><span class="g g-AnsiBrightDefault">Named foreground colors:</span>
   <span class="g g-AnsiBlack">Black </span><span class="g g-AnsiRed">Red </span><span class="g g-AnsiGreen">Green </span><span class="g g-AnsiYellow">Yellow </span><span class="g g-AnsiBlue">Blue </span><span class="g g-AnsiMagenta">Magenta </span><span class="g g-AnsiCyan">Cyan </span><span class="g g-AnsiWhite">White </span>Default
   <span class="g g-AnsiBrightBlack">BrightBlack </span><span class="g g-AnsiBrightRed">BrightRed </span><span class="g g-AnsiBrightGreen">BrightGreen </span><span class="g g-AnsiBrightYellow">BrightYellow</span>

diff --git a/plugins/m/test/code/page.rst b/plugins/m/test/code/page.rst
index 3cef393f794e66826595e3c614485c8f4f13af7d..09a13fda0788384d0542b4ef680428b8984c2cdd 100644 (file)
--- a/plugins/m/test/code/page.rst
+++ b/plugins/m/test/code/page.rst
@@ -1,6 +1,8 @@
 m.code
 ######
 
+.. role:: ansi(code)
+    :language: ansi
 .. role:: cpp(code)
     :language: c++
 .. role:: tex(code)
@@ -55,7 +57,7 @@ Syntax highlighting:
     # Comment
     var = "string{}escape\n"
 
-Console colors:
+Console colors, including :ansi:`\e[31minline` code:
 
 .. include:: console-colors.ansi
     :code: ansi