From f706d7a016134317f74c69031ec8ee14bcfbedf4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Mon, 16 Sep 2024 13:59:57 +0200 Subject: [PATCH] m.code: adapt to pygments 2.10 to 2.18. The new versions properly qualify whitespace as such instead of as text, and do so gradually, which is responsible for most changes in the output. Besides that, until 2.14 there were certain cases of empty in the output, which 2.14 fixes, so I add a postprocessing step to clean those up to not need to further branch the tests. The CI now tests various pygments versions, with only the last job taking the latest version. --- doc/build-status.html.in | 12 +-- documentation/doxygen.py | 7 ++ .../contents_blockquote/index-pygments29.html | 33 +++++++ .../contents_blockquote/index.html | 2 +- .../contents_code/index-pygments29.html | 35 +++++++ .../test_doxygen/contents_code/index.html | 8 +- .../contents_code/warnings-pygments29.html | 34 +++++++ .../test_doxygen/contents_code/warnings.html | 2 +- .../index-pygments210.html | 33 +++++++ .../contents_code_filters/index.html | 4 +- .../index-pygments213.html | 36 +++++++ .../index-pygments29.html | 36 +++++++ .../contents_code_language/index.html | 8 +- .../contents_custom/index-pygments29.html | 32 ++++++ .../test_doxygen/contents_custom/index.html | 2 +- .../contents_tagfile/index-pygments29.html | 31 ++++++ .../test_doxygen/contents_tagfile/index.html | 2 +- ..._2CMakeLists_8txt-example-pygments210.html | 39 ++++++++ .../path-prefix_2CMakeLists_8txt-example.html | 6 +- ...-prefix_2main_8cpp-example-pygments29.html | 43 ++++++++ .../path-prefix_2main_8cpp-example.html | 12 +-- documentation/test_doxygen/test_contents.py | 59 +++++++++-- documentation/test_doxygen/test_example.py | 16 ++- package/ci/circleci.yml | 26 ++++- plugins/m/code.py | 6 ++ plugins/m/test/code/page-210.html | 98 +++++++++++++++++++ plugins/m/test/code/page-29.html | 98 +++++++++++++++++++ plugins/m/test/code/page.html | 38 +++---- plugins/m/test/test_code.py | 12 ++- 29 files changed, 708 insertions(+), 62 deletions(-) create mode 100644 documentation/test_doxygen/contents_blockquote/index-pygments29.html create mode 100644 documentation/test_doxygen/contents_code/index-pygments29.html create mode 100644 documentation/test_doxygen/contents_code/warnings-pygments29.html create mode 100644 documentation/test_doxygen/contents_code_filters/index-pygments210.html create mode 100644 documentation/test_doxygen/contents_code_language/index-pygments213.html create mode 100644 documentation/test_doxygen/contents_code_language/index-pygments29.html create mode 100644 documentation/test_doxygen/contents_custom/index-pygments29.html create mode 100644 documentation/test_doxygen/contents_tagfile/index-pygments29.html create mode 100644 documentation/test_doxygen/example/path-prefix_2CMakeLists_8txt-example-pygments210.html create mode 100644 documentation/test_doxygen/example/path-prefix_2main_8cpp-example-pygments29.html create mode 100644 plugins/m/test/code/page-210.html create mode 100644 plugins/m/test/code/page-29.html diff --git a/doc/build-status.html.in b/doc/build-status.html.in index b64d60a6..70a3875a 100644 --- a/doc/build-status.html.in +++ b/doc/build-status.html.in @@ -3,12 +3,12 @@ - Python
3.6 - Python
3.7 - Python
3.8 - Python
3.9 - Python
3.10 - Python
3.11 + Python
3.6 + Python
3.7 + Python
3.8 + Python
3.9 + Python
3.10 + Python
3.11 Python
3.12 diff --git a/documentation/doxygen.py b/documentation/doxygen.py index 17faec3c..88a2d80d 100755 --- a/documentation/doxygen.py +++ b/documentation/doxygen.py @@ -1375,6 +1375,13 @@ def parse_desc_internal(state: State, element: ET.Element, immediate_parent: ET. if filter: code = filter(code) highlighted = highlight(code, lexer, formatter).rstrip() + # Pygments < 2.14 leave useless empty spans in the output. Filter + # them out to have the markup consistent across versions for easier + # testing. + # TODO same is in m.code, remove once support for < 2.14 is dropped + highlighted = (highlighted + .replace('', '') + .replace('', '')) # Strip whitespace around if inline code, strip only trailing # whitespace if a block if not code_block: highlighted = highlighted.lstrip() diff --git a/documentation/test_doxygen/contents_blockquote/index-pygments29.html b/documentation/test_doxygen/contents_blockquote/index-pygments29.html new file mode 100644 index 00000000..350ff819 --- /dev/null +++ b/documentation/test_doxygen/contents_blockquote/index-pygments29.html @@ -0,0 +1,33 @@ + + + + + My Project + + + + + +

+ My Project +

Mainly containing tests for Doxygen 1.9 parsing regressions and weirdness.

Preformatted text after a blockquote. In 1.9 it will get parsed just as a
+regular paragraph unless there's a dot before.
+

// code block that shouldn't be treated as inline

// quoted code block that should be neither inline nor in a paragraph

A delimiting paragraph, just to not have a blockqoute right after another blockquote.

"inline" + code in a usual paragraph.

"inline" + code with a tag after.

+ + diff --git a/documentation/test_doxygen/contents_blockquote/index.html b/documentation/test_doxygen/contents_blockquote/index.html index 350ff819..e008ef9e 100644 --- a/documentation/test_doxygen/contents_blockquote/index.html +++ b/documentation/test_doxygen/contents_blockquote/index.html @@ -24,7 +24,7 @@

Mainly containing tests for Doxygen 1.9 parsing regressions and weirdness.

Preformatted text after a blockquote. In 1.9 it will get parsed just as a
 regular paragraph unless there's a dot before.
-

// code block that shouldn't be treated as inline

// quoted code block that should be neither inline nor in a paragraph

A delimiting paragraph, just to not have a blockqoute right after another blockquote.

"inline" + code in a usual paragraph.

"inline" + code with a tag after.

// code block that shouldn't be treated as inline

// quoted code block that should be neither inline nor in a paragraph

A delimiting paragraph, just to not have a blockqoute right after another blockquote.

"inline" + code in a usual paragraph.

"inline" + code with a tag after.

diff --git a/documentation/test_doxygen/contents_code/index-pygments29.html b/documentation/test_doxygen/contents_code/index-pygments29.html new file mode 100644 index 00000000..4d8ef825 --- /dev/null +++ b/documentation/test_doxygen/contents_code/index-pygments29.html @@ -0,0 +1,35 @@ + + + + + My Project + + + + + +

+ My Project +

// A code block.
+// Spanning multiple lines.

Inline=code; at the start of a line. Then a code that is inside of true || false a text, should be delimited by spaces. But not when it is in (std::exit(2);) parentheses.

    // a block
+        // that is indented
+    // but has a lot of trailing whitespace which should be removed
+}

// this is a new block

// code?

// another block

The constexpr functions are pure.

inline variables are a thing?

Code block inside a list (has to be done using HTML):

A paragraph.
```
#include <os>
```
Another paragraph.
Yet another
A single paragraph, rendered without the wrapping tag

Note

Code block inside a note:

// code block

Another paragraph of that note.

+ + diff --git a/documentation/test_doxygen/contents_code/index.html b/documentation/test_doxygen/contents_code/index.html index 9c072f6e..329259e9 100644 --- a/documentation/test_doxygen/contents_code/index.html +++ b/documentation/test_doxygen/contents_code/index.html @@ -23,10 +23,10 @@ My Project

// A code block.
-// Spanning multiple lines.

Inline=code; at the start of a line. Then a code that is inside of true || false a text, should be delimited by spaces. But not when it is in (std::exit(2);) parentheses.

    // a block
-        // that is indented
-    // but has a lot of trailing whitespace which should be removed
-}

// this is a new block

// code?

// another block

The constexpr functions are pure.

inline variables are a thing?

Code block inside a list (has to be done using HTML):

A paragraph.
```
#include <os>
```
Another paragraph.
Yet another
A single paragraph, rendered without the wrapping tag

Note

Code block inside a note:

// code block

Another paragraph of that note.

+// Spanning multiple lines.

Inline=code; at the start of a line. Then a code that is inside of true || false a text, should be delimited by spaces. But not when it is in (std::exit(2);) parentheses.

    // a block
+        // that is indented
+    // but has a lot of trailing whitespace which should be removed
+}

// this is a new block

// code?

// another block

The constexpr functions are pure.

inline variables are a thing?

Code block inside a list (has to be done using HTML):

A paragraph.
```
#include <os>
```
Another paragraph.
Yet another
A single paragraph, rendered without the wrapping tag

Note

Code block inside a note:

// code block

Another paragraph of that note.

diff --git a/documentation/test_doxygen/contents_code/warnings-pygments29.html b/documentation/test_doxygen/contents_code/warnings-pygments29.html new file mode 100644 index 00000000..f578422a --- /dev/null +++ b/documentation/test_doxygen/contents_code/warnings-pygments29.html @@ -0,0 +1,34 @@ + + + + + Code that produces warnings | My Project + + + + + +

+ Code that produces warnings +

// Code without language
+// description

A paragraph.

multi=line;
+code="that is a part of a paragraph.";

Improper code block inside a list that needs to be extracted out:

A paragraph.
```
#include <os>
+// hello again
```

+ + diff --git a/documentation/test_doxygen/contents_code/warnings.html b/documentation/test_doxygen/contents_code/warnings.html index 92802460..58e0f9e8 100644 --- a/documentation/test_doxygen/contents_code/warnings.html +++ b/documentation/test_doxygen/contents_code/warnings.html @@ -24,7 +24,7 @@

// Code without language
 // description

A paragraph.

multi=line;
-code="that is a part of a paragraph.";

Improper code block inside a list that needs to be extracted out:

A paragraph.

#include <os>
+code="that is a part of a paragraph.";

Improper code block inside a list that needs to be extracted out:

A paragraph.
```
#include <os>
 // hello again
```

diff --git a/documentation/test_doxygen/contents_code_filters/index-pygments210.html b/documentation/test_doxygen/contents_code_filters/index-pygments210.html new file mode 100644 index 00000000..c8d5dc86 --- /dev/null +++ b/documentation/test_doxygen/contents_code_filters/index-pygments210.html @@ -0,0 +1,33 @@ + + + + + My Project + + + + + +

+ My Project +

Adding typographically correct spaces before and a color swatch after — and for inline as well: p { color: #ff3366; }

p {
+    color: #ff3366;
+}

+ + diff --git a/documentation/test_doxygen/contents_code_filters/index.html b/documentation/test_doxygen/contents_code_filters/index.html index c8d5dc86..03b8babc 100644 --- a/documentation/test_doxygen/contents_code_filters/index.html +++ b/documentation/test_doxygen/contents_code_filters/index.html @@ -22,8 +22,8 @@

My Project

Adding typographically correct spaces before and a color swatch after — and for inline as well: p { color: #ff3366; }

p {
-    color: #ff3366;
+Adding typographically correct spaces before and a color swatch after — and for inline as well: p { color: #ff3366; }
p {
+    color: #ff3366;
 }
       
     
diff --git a/documentation/test_doxygen/contents_code_language/index-pygments213.html b/documentation/test_doxygen/contents_code_language/index-pygments213.html
new file mode 100644
index 00000000..164451ca
--- /dev/null
+++ b/documentation/test_doxygen/contents_code_language/index-pygments213.html
@@ -0,0 +1,36 @@
+
+
+
+  
+  My Project
+  
+  
+  
+
+
+
+  
+    
+      My Project
+    
+  
+
+
+  
+    
+      
+        
+          My Project
+        
+// Special handling of some extensions
Inline=code of different cd dir languages.
Code file with a custom language:
#!/bin/bash
+
+if [ -d '/user' ]; then echo "Hello"; fi
+false
Look:
void foo() { return; }
A paragraph following a one line snippet should not be merged with it.
void foo() { return; }
This one also not.
#include <cmath>
+
+void bar() { return; }
And this should not produce a warning.
Another paragraph.
+      
+    
+  
+
+
+
diff --git a/documentation/test_doxygen/contents_code_language/index-pygments29.html b/documentation/test_doxygen/contents_code_language/index-pygments29.html
new file mode 100644
index 00000000..a4609029
--- /dev/null
+++ b/documentation/test_doxygen/contents_code_language/index-pygments29.html
@@ -0,0 +1,36 @@
+
+
+
+  
+  My Project
+  
+  
+  
+
+
+
+  
+    
+      My Project
+    
+  
+
+
+  
+    
+      
+        
+          My Project
+        
+// Special handling of some extensions
Inline=code of different cd dir languages.
Code file with a custom language:
#!/bin/bash
+
+if [ -d '/user' ]; then echo "Hello"; fi
+false
Look:
void foo() { return; }
A paragraph following a one line snippet should not be merged with it.
void foo() { return; }
This one also not.
#include <cmath>
+
+void bar() { return; }
And this should not produce a warning.
Another paragraph.
+      
+    
+  
+
+
+
diff --git a/documentation/test_doxygen/contents_code_language/index.html b/documentation/test_doxygen/contents_code_language/index.html
index 828fa10f..b97a5e77 100644
--- a/documentation/test_doxygen/contents_code_language/index.html
+++ b/documentation/test_doxygen/contents_code_language/index.html
@@ -22,12 +22,12 @@
         
           My Project
         
-// Special handling of some extensions
Inline=code of different cd dir languages.
Code file with a custom language:
#!/bin/bash
+// Special handling of some extensions
Inline=code of different cd dir languages.
Code file with a custom language:
#!/bin/bash
 
-if [ -d '/user' ]; then echo "Hello"; fi
-false
Look:
void foo() { return; }
A paragraph following a one line snippet should not be merged with it.
void foo() { return; }
This one also not.
#include <cmath>
+if [ -d '/user' ]; then echo "Hello"; fi
+false
Look:
void foo() { return; }
A paragraph following a one line snippet should not be merged with it.
void foo() { return; }
This one also not.
#include <cmath>
 
-void bar() { return; }
And this should not produce a warning.
Another paragraph.
+void bar() { return; }
And this should not produce a warning.
Another paragraph.
       
     
   
diff --git a/documentation/test_doxygen/contents_custom/index-pygments29.html b/documentation/test_doxygen/contents_custom/index-pygments29.html
new file mode 100644
index 00000000..d27e67f1
--- /dev/null
+++ b/documentation/test_doxygen/contents_custom/index-pygments29.html
@@ -0,0 +1,32 @@
+
+
+
+  
+  My Project
+  
+  
+  
+
+
+
+  
+    
+      My Project
+    
+  
+
+
+  
+    
+      
+        
+          My Project
+        
+This paragraph is rendered in a dim note, centered.
This paragraph contains a red text in a normal text flow and then small strong italics, blue italics and https://mcss.mosra.cz (big-ass link). A styled page ref: The math page.
A button
with subtitle
A paragraph that is not affected by the inline classes from above.
Bold, non-indented paragraph.
Bold text that should not have the same class as the paragraph.
A paragraph that doesn't have any class applied. Next, a full-width image:
A flat figure
A fullwidth table:
Table header Another
Cell Another cell
Next row Last.
An unstyled list:
First item without a dot
Second item without a dot
A info block with some paragraphs inside
Hello.
This is good, finally.
Note
A note styled as a frame.
This has to be here otherwise doxygen puts the next @m_class call into the above note. WHAT THE HELL!!!
Third-party license info
This package is licensed under MIT. All is good.
// this is the code
+printf("The answer to the universe and everything is %d.", 5*9)
The answer to the universe and everything is 42.
A paragraph containing a footnote 27 reference.
27.
And a styled footnote, overriding the default styling which is used for TODO pages and other xrefitems, like Third-party license info.
+      
+    
+  
+
+
+
diff --git a/documentation/test_doxygen/contents_custom/index.html b/documentation/test_doxygen/contents_custom/index.html
index d27e67f1..56723c50 100644
--- a/documentation/test_doxygen/contents_custom/index.html
+++ b/documentation/test_doxygen/contents_custom/index.html
@@ -23,7 +23,7 @@
           My Project
         
 This paragraph is rendered in a dim note, centered.
This paragraph contains a red text in a normal text flow and then small strong italics, blue italics and https://mcss.mosra.cz (big-ass link). A styled page ref: The math page.
A button
with subtitle
A paragraph that is not affected by the inline classes from above.
Bold, non-indented paragraph.
Bold text that should not have the same class as the paragraph.
A paragraph that doesn't have any class applied. Next, a full-width image:
A flat figure
A fullwidth table:
Table header Another
Cell Another cell
Next row Last.
An unstyled list:
First item without a dot
Second item without a dot
A info block with some paragraphs inside
Hello.
This is good, finally.
Note
A note styled as a frame.
This has to be here otherwise doxygen puts the next @m_class call into the above note. WHAT THE HELL!!!
Third-party license info
This package is licensed under MIT. All is good.
// this is the code
-printf("The answer to the universe and everything is %d.", 5*9)
The answer to the universe and everything is 42.
A paragraph containing a footnote 27 reference.
27.
And a styled footnote, overriding the default styling which is used for TODO pages and other xrefitems, like Third-party license info.
+printf("The answer to the universe and everything is %d.", 5*9)

Table header	Another
Cell	Another cell
Next row	Last.

Table header	Another
Cell	Another cell
Next row	Last.

The answer to the universe and everything is 42.

A paragraph containing a footnote 27 reference.

27.: And a styled footnote, overriding the default styling which is used for TODO pages and other xrefitems, like Third-party license info.

diff --git a/documentation/test_doxygen/contents_tagfile/index-pygments29.html b/documentation/test_doxygen/contents_tagfile/index-pygments29.html new file mode 100644 index 00000000..37cac36c --- /dev/null +++ b/documentation/test_doxygen/contents_tagfile/index-pygments29.html @@ -0,0 +1,31 @@ + + + + + My Project + + + + + +

+ My Project +

See CORRADE_ASSERT() for more information.

Corrade::Utility::Resource rx;

+ + diff --git a/documentation/test_doxygen/contents_tagfile/index.html b/documentation/test_doxygen/contents_tagfile/index.html index 37cac36c..1ff83c9b 100644 --- a/documentation/test_doxygen/contents_tagfile/index.html +++ b/documentation/test_doxygen/contents_tagfile/index.html @@ -22,7 +22,7 @@

My Project

See CORRADE_ASSERT() for more information.

Corrade::Utility::Resource rx;

See CORRADE_ASSERT() for more information.

Corrade::Utility::Resource rx;

diff --git a/documentation/test_doxygen/example/path-prefix_2CMakeLists_8txt-example-pygments210.html b/documentation/test_doxygen/example/path-prefix_2CMakeLists_8txt-example-pygments210.html new file mode 100644 index 00000000..65d0cebc --- /dev/null +++ b/documentation/test_doxygen/example/path-prefix_2CMakeLists_8txt-example-pygments210.html @@ -0,0 +1,39 @@ + + + + + A page » The Example » CMakeLists.txt source | My Project + + + + + + +

+ A page » + The Example » + CMakeLists.txt source +

configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake
+               ${CMAKE_CURRENT_BINARY_DIR}/configure.h)
+
+add_executable(app main.cpp)
+target_include_directories(app ${CMAKE_CURRENT_BINARY_DIR})

The Example | configure.h.cmake »

+ + diff --git a/documentation/test_doxygen/example/path-prefix_2CMakeLists_8txt-example.html b/documentation/test_doxygen/example/path-prefix_2CMakeLists_8txt-example.html index 65d0cebc..bb09d135 100644 --- a/documentation/test_doxygen/example/path-prefix_2CMakeLists_8txt-example.html +++ b/documentation/test_doxygen/example/path-prefix_2CMakeLists_8txt-example.html @@ -26,10 +26,10 @@ CMakeLists.txt source

configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake
-               ${CMAKE_CURRENT_BINARY_DIR}/configure.h)
+               ${CMAKE_CURRENT_BINARY_DIR}/configure.h)
 
-add_executable(app main.cpp)
-target_include_directories(app ${CMAKE_CURRENT_BINARY_DIR})

+add_executable(app main.cpp) +target_include_directories(app ${CMAKE_CURRENT_BINARY_DIR})

The Example | configure.h.cmake »

diff --git a/documentation/test_doxygen/example/path-prefix_2main_8cpp-example-pygments29.html b/documentation/test_doxygen/example/path-prefix_2main_8cpp-example-pygments29.html new file mode 100644 index 00000000..948e5bf0 --- /dev/null +++ b/documentation/test_doxygen/example/path-prefix_2main_8cpp-example-pygments29.html @@ -0,0 +1,43 @@ + + + + + A page » The Example » main.cpp source | My Project + + + + + + +

+ A page » + The Example » + main.cpp source +

#include <iostream>
+
+#include "configure.h"
+
+int main() {
+    #ifdef SAY_HELLO
+    std::cout << "hello?" << std::endl;
+    #endif
+}

« configure.h.cmake | The Example

+ + diff --git a/documentation/test_doxygen/example/path-prefix_2main_8cpp-example.html b/documentation/test_doxygen/example/path-prefix_2main_8cpp-example.html index d9b1fc5b..0c6a3f51 100644 --- a/documentation/test_doxygen/example/path-prefix_2main_8cpp-example.html +++ b/documentation/test_doxygen/example/path-prefix_2main_8cpp-example.html @@ -25,14 +25,14 @@ main.cpp source -

#include <iostream>
+#include <iostream>
 
-#include "configure.h"
+#include "configure.h"
 
-int main() {
-    #ifdef SAY_HELLO
-    std::cout << "hello?" << std::endl;
-    #endif
+int main() {
+    #ifdef SAY_HELLO
+    std::cout << "hello?" << std::endl;
+    #endif
 }
         « configure.h.cmake | The Example
       
diff --git a/documentation/test_doxygen/test_contents.py b/documentation/test_doxygen/test_contents.py
index 0bddd3b3..996b5aba 100644
--- a/documentation/test_doxygen/test_contents.py
+++ b/documentation/test_doxygen/test_contents.py
@@ -25,6 +25,7 @@
 
 import os
 import pickle
+import pygments
 import re
 import shutil
 import subprocess
@@ -84,13 +85,24 @@ class Internal(IntegrationTestCase):
 class Code(IntegrationTestCase):
     def test(self):
         self.run_doxygen(wildcard='indexpage.xml')
-        self.assertEqual(*self.actual_expected_contents('index.html'))
+
+        # Pygments 2.10+ properly highlight Whitespace as such, and not as
+        # Text
+        if parse_version(pygments.__version__) >= parse_version("2.10"):
+            self.assertEqual(*self.actual_expected_contents('index.html'))
+        else:
+            self.assertEqual(*self.actual_expected_contents('index.html', 'index-pygments29.html'))
 
     def test_warnings(self):
         with self.assertLogs() as cm:
             self.run_doxygen(wildcard='warnings.xml')
 
-        self.assertEqual(*self.actual_expected_contents('warnings.html'))
+        # Pygments 2.10+ properly highlight Whitespace as such, and not as
+        # Text
+        if parse_version(pygments.__version__) >= parse_version("2.10"):
+            self.assertEqual(*self.actual_expected_contents('warnings.html'))
+        else:
+            self.assertEqual(*self.actual_expected_contents('warnings.html', 'warnings-pygments29.html'))
         self.assertEqual(cm.output, [
             "WARNING:root:warnings.xml: no filename attribute in , assuming C++",
             "WARNING:root:warnings.xml: inline code has multiple lines, fallback to a code block",
@@ -102,7 +114,15 @@ class CodeLanguage(IntegrationTestCase):
                          "https://github.com/doxygen/doxygen/pull/621")
     def test(self):
         self.run_doxygen(wildcard='indexpage.xml')
-        self.assertEqual(*self.actual_expected_contents('index.html'))
+
+        # Pygments 2.10+ properly highlight Whitespace as such, and not as
+        # Text. Pygments 2.14+ further improve on that.
+        if parse_version(pygments.__version__) >= parse_version("2.14"):
+            self.assertEqual(*self.actual_expected_contents('index.html'))
+        elif parse_version(pygments.__version__) >= parse_version("2.10"):
+            self.assertEqual(*self.actual_expected_contents('index.html', 'index-pygments213.html'))
+        else:
+            self.assertEqual(*self.actual_expected_contents('index.html', 'index-pygments29.html'))
 
     @unittest.skipUnless(parse_version(doxygen_version()) > parse_version("1.8.13"),
                          "https://github.com/doxygen/doxygen/pull/623")
@@ -291,12 +311,24 @@ class MathCached(IntegrationTestCase):
 class Tagfile(IntegrationTestCase):
     def test(self):
         self.run_doxygen(wildcard='indexpage.xml')
-        self.assertEqual(*self.actual_expected_contents('index.html'))
+
+        # Pygments 2.10+ properly highlight Whitespace as such, and not as
+        # Text
+        if parse_version(pygments.__version__) >= parse_version("2.10"):
+            self.assertEqual(*self.actual_expected_contents('index.html'))
+        else:
+            self.assertEqual(*self.actual_expected_contents('index.html', 'index-pygments29.html'))
 
 class Custom(IntegrationTestCase):
     def test(self):
         self.run_doxygen(wildcard='indexpage.xml')
-        self.assertEqual(*self.actual_expected_contents('index.html'))
+
+        # Pygments 2.10+ properly highlight Whitespace as such, and not as
+        # Text
+        if parse_version(pygments.__version__) >= parse_version("2.10"):
+            self.assertEqual(*self.actual_expected_contents('index.html'))
+        else:
+            self.assertEqual(*self.actual_expected_contents('index.html', 'index-pygments29.html'))
 
     @unittest.skipUnless(shutil.which('latex'),
                          "Math rendering requires LaTeX installed")
@@ -568,9 +600,22 @@ class CodeFilters(IntegrationTestCase):
                 'CSS': _add_color_swatch,
             }
         })
-        self.assertEqual(*self.actual_expected_contents('index.html'))
+
+        # Pygments 2.10+ properly highlight Whitespace as such, and not as
+        # Text. Compared to elsewhere, in this case the difference is only with
+        # 2.11+.
+        if parse_version(pygments.__version__) >= parse_version("2.11"):
+            self.assertEqual(*self.actual_expected_contents('index.html'))
+        else:
+            self.assertEqual(*self.actual_expected_contents('index.html', 'index-pygments210.html'))
 
 class Blockquote(IntegrationTestCase):
     def test(self):
         self.run_doxygen(wildcard='indexpage.xml')
-        self.assertEqual(*self.actual_expected_contents('index.html'))
+
+        # Pygments 2.10+ properly highlight Whitespace as such, and not as
+        # Text
+        if parse_version(pygments.__version__) >= parse_version("2.10"):
+            self.assertEqual(*self.actual_expected_contents('index.html'))
+        else:
+            self.assertEqual(*self.actual_expected_contents('index.html', 'index-pygments29.html'))
diff --git a/documentation/test_doxygen/test_example.py b/documentation/test_doxygen/test_example.py
index 93cdc25b..f05a0e08 100644
--- a/documentation/test_doxygen/test_example.py
+++ b/documentation/test_doxygen/test_example.py
@@ -23,6 +23,7 @@
 #   DEALINGS IN THE SOFTWARE.
 #
 
+import pygments
 import unittest
 
 from . import IntegrationTestCase, doxygen_version, parse_version
@@ -32,12 +33,23 @@ class Example(IntegrationTestCase):
         self.run_doxygen(index_pages=[], wildcard='*.xml')
 
         self.assertEqual(*self.actual_expected_contents('path-prefix_2configure_8h_8cmake-example.html'))
-        self.assertEqual(*self.actual_expected_contents('path-prefix_2main_8cpp-example.html'))
+        # Pygments 2.10+ properly highlight Whitespace as such, and not as
+        # Text
+        if parse_version(pygments.__version__) >= parse_version("2.10"):
+            self.assertEqual(*self.actual_expected_contents('path-prefix_2main_8cpp-example.html'))
+        else:
+            self.assertEqual(*self.actual_expected_contents('path-prefix_2main_8cpp-example.html', 'path-prefix_2main_8cpp-example-pygments29.html'))
 
     @unittest.skipUnless(parse_version(doxygen_version()) > parse_version("1.8.13"),
                          "needs to have file extension exposed in the XML")
     def test_other(self):
         self.run_doxygen(index_pages=[], wildcard='*.xml')
 
-        self.assertEqual(*self.actual_expected_contents('path-prefix_2CMakeLists_8txt-example.html'))
+        # Pygments 2.10+ properly highlight Whitespace as such, and not as
+        # Text. Compared to elsewhere, in this case the difference is only with
+        # 2.11+.
+        if parse_version(pygments.__version__) >= parse_version("2.11"):
+            self.assertEqual(*self.actual_expected_contents('path-prefix_2CMakeLists_8txt-example.html'))
+        else:
+            self.assertEqual(*self.actual_expected_contents('path-prefix_2CMakeLists_8txt-example.html', 'path-prefix_2CMakeLists_8txt-example-pygments210.html'))
         self.assertEqual(*self.actual_expected_contents('a_8txt-example.html'))
diff --git a/package/ci/circleci.yml b/package/ci/circleci.yml
index e3cc43b6..c406dee1 100644
--- a/package/ci/circleci.yml
+++ b/package/ci/circleci.yml
@@ -66,16 +66,17 @@ commands:
       pelican-version:
         type: string
         default: ""
+      pygments-version:
+        type: string
+        default: ""
       qrcode-version:
         type: string
         default: ""
     steps:
     - run:
         name: Install Python dependencies
-        # Pygments 2.11 (and apparently 2.10 as well) treats certain whitespace
-        # differently, I have to update the expected output first.
         command: |
-          pip install jinja2 docutils<< parameters.docutils-version >> pygments==2.9.0 pelican<< parameters.pelican-version >> Pyphen Pillow coverage codecov qrcode<< parameters.qrcode-version >> matplotlib<< parameters.matplotlib-version >> attrs<< parameters.attrs-version >> numpy<< parameters.numpy-version >>
+          pip install jinja2 docutils<< parameters.docutils-version >> pygments<< parameters.pygments-version >> pelican<< parameters.pelican-version >> Pyphen Pillow coverage codecov qrcode<< parameters.qrcode-version >> matplotlib<< parameters.matplotlib-version >> attrs<< parameters.attrs-version >> numpy<< parameters.numpy-version >>
     - run:
         name: Fix unheard-of cursed issues
         # otherwise i get Error: unsupported locale setting
@@ -208,6 +209,11 @@ jobs:
         pelican-version: ==4.2.0
         # Ubuntu 18.04 has docutils 0.14
         docutils-version: ==0.14
+        # Pygments 2.9 are the last before 2.10+ starts classifying whitespace
+        # differently. Ubuntu 18.04 has pygments 2.2.0, but when requesting
+        # that one, the pelican version doesn't play well with Jinja, and I
+        # just don't have patience to deal with that for such an old version.
+        pygments-version: ==2.9.0
     - checkout
     - test-theme
     - test-plugins
@@ -235,6 +241,11 @@ jobs:
         # 7.4 has different output, however on 3.7 and older it's too annoying
         # to check what version is installed, so pin to 7.3
         qrcode-version: ==7.3.1
+        # Pygments 2.9 are the last before 2.10+ starts classifying whitespace
+        # differently. Ubuntu 20.04 has pygments 2.3.1, but that one has a
+        # slight difference in output and it doesn't make sense to add another
+        # test variant for such an old version.
+        pygments-version: ==2.9.0
     - checkout
     - test-theme
     - test-plugins
@@ -258,6 +269,9 @@ jobs:
         # Docutils 0.18.0 dropped `in_footnote_list` and made some changes that
         # 0.18.1 reverted again, test we're not affected by those
         docutils-version: ==0.18.0
+        # Pygments 2.9 are the last before 2.10+ starts classifying whitespace
+        # differently
+        pygments-version: ==2.9.0
     - checkout
     - test-theme
     - test-plugins
@@ -281,6 +295,8 @@ jobs:
         matplotlib-version: ==3.9.2
         # NumPy 2.0 only works with pybind 2.12+
         numpy-version: ==1.26.4
+        # Pygments 2.10 classifies whitespace differently than 2.9 and 2.11
+        pygments-version: ==2.10.0
     - checkout
     - test-theme
     - test-plugins
@@ -300,6 +316,8 @@ jobs:
     - install-python-deps:
         # NumPy 2.0 doesn't work with pybind 2.11, see below
         numpy-version: ==1.26.4
+        # Ubuntu 22.04 has pygments 2.11
+        pygments-version: ==2.11.0
     - checkout
     - test-theme
     - test-plugins
@@ -324,6 +342,8 @@ jobs:
     - install-python-deps:
         # NumPy 2.0 doesn't work with pybind 2.11, see below
         numpy-version: ==1.26.4
+        # Ubuntu 24.04 has pygments 2.17
+        pygments-version: ==2.17.0
     - checkout
     - test-theme
     - test-plugins
diff --git a/plugins/m/code.py b/plugins/m/code.py
index e6c764b5..39f0314a 100644
--- a/plugins/m/code.py
+++ b/plugins/m/code.py
@@ -108,6 +108,12 @@ def _highlight(code, language, options, *, is_block, filters=[]):
     if f: code = f(code)
 
     highlighted = highlight(code, lexer, formatter).rstrip()
+    # Pygments < 2.14 leave useless empty spans in the output. Filter them out
+    # to have the markup consistent across versions for easier testing.
+    # TODO same is in doxygen.py, remove once support for < 2.14 is dropped
+    highlighted = (highlighted
+        .replace('', '')
+        .replace('', ''))
     # Strip whitespace around if inline code, strip only trailing whitespace if
     # a block
     if not is_block: highlighted = highlighted.lstrip()
diff --git a/plugins/m/test/code/page-210.html b/plugins/m/test/code/page-210.html
new file mode 100644
index 00000000..779360cd
--- /dev/null
+++ b/plugins/m/test/code/page-210.html
@@ -0,0 +1,98 @@
+
+
+
+  
+  m.code | A Pelican Blog
+  
+  
+  
+  
+
+
+
+  
+    
+      A Pelican Blog
+    
+  
+
+
+
+  
+    
+      
+        m.code
+
+int main() {
+    return 0;
+}
+int main() {
+    return 1;
+}
+Legacy :hl_lines: option should work the same:
+int main() {
+    return 1;
+}
+Same as above, but for a .. include::, which should also support line
+highlighting:
+int main() {
+    return 1;
+}
+Inline code is here: constexpr int foo = 5;. Syntax highlighting:
+# Comment
+var = "string{}escape\n"
+// this language is not highlighted
+Properly preserve backslashes: \frac{a}{b} ... and backticks:
+:ref:`a function <os.path.join()>`
+Don't trim leading spaces in blocks:
+        nope();
+    return false;
+}
+
+Code with no language specified
+This is a plain block.
+This is a plain block,
+    which is colored.
+This is a plain inline code and one which is also colored.
+
+
+Advanced file inclusion
+
+"Sphinx Gallery"-alike self-contained code file
+This is a reST markup explaining the following code, with the initial
+#<space> stripped, and on blank lines only the # stripped:
+## However in this case both leading ## will be kept.
+The math.sin() calculates a sin, of course, and the initial indentation
+of it is stripped also:
+sin = math.sin(0.13587)
+two_sins = sin + sin
+In comparison, here's the default output without :strip-prefix::
+    sin = math.sin(0.13587)
+    two_sins = sin + sin
+
+
+
+Filters
+Applied by default, adding typographically correct spaces before and a color
+swatch after --- and for inline as well: p { color: #ff3366; }
+p {
+    color: #ff3366;
+}
+Applied explicitly and then by default --- and for inline as well:
+p { color: #3bd267; }
+p {
+    color: #3bd267;
+}
+Includes too:
+p {
+    color: #3bd267;
+}
+
+
+      
+    
+  
+
+
+
+
diff --git a/plugins/m/test/code/page-29.html b/plugins/m/test/code/page-29.html
new file mode 100644
index 00000000..56c8ed93
--- /dev/null
+++ b/plugins/m/test/code/page-29.html
@@ -0,0 +1,98 @@
+
+
+
+  
+  m.code | A Pelican Blog
+  
+  
+  
+  
+
+
+
+  
+    
+      A Pelican Blog
+    
+  
+
+
+
+  
+    
+      
+        m.code
+
+int main() {
+    return 0;
+}
+int main() {
+    return 1;
+}
+Legacy :hl_lines: option should work the same:
+int main() {
+    return 1;
+}
+Same as above, but for a .. include::, which should also support line
+highlighting:
+int main() {
+    return 1;
+}
+Inline code is here: constexpr int foo = 5;. Syntax highlighting:
+# Comment
+var = "string{}escape\n"
+// this language is not highlighted
+Properly preserve backslashes: \frac{a}{b} ... and backticks:
+:ref:`a function <os.path.join()>`
+Don't trim leading spaces in blocks:
+        nope();
+    return false;
+}
+
+Code with no language specified
+This is a plain block.
+This is a plain block,
+    which is colored.
+This is a plain inline code and one which is also colored.
+
+
+Advanced file inclusion
+
+"Sphinx Gallery"-alike self-contained code file
+This is a reST markup explaining the following code, with the initial
+#<space> stripped, and on blank lines only the # stripped:
+## However in this case both leading ## will be kept.
+The math.sin() calculates a sin, of course, and the initial indentation
+of it is stripped also:
+sin = math.sin(0.13587)
+two_sins = sin + sin
+In comparison, here's the default output without :strip-prefix::
+    sin = math.sin(0.13587)
+    two_sins = sin + sin
+
+
+
+Filters
+Applied by default, adding typographically correct spaces before and a color
+swatch after --- and for inline as well: p { color: #ff3366; }
+p {
+    color: #ff3366;
+}
+Applied explicitly and then by default --- and for inline as well:
+p { color: #3bd267; }
+p {
+    color: #3bd267;
+}
+Includes too:
+p {
+    color: #3bd267;
+}
+
+
+      
+    
+  
+
+
+
+
diff --git a/plugins/m/test/code/page.html b/plugins/m/test/code/page.html
index 56c8ed93..5b764f57 100644
--- a/plugins/m/test/code/page.html
+++ b/plugins/m/test/code/page.html
@@ -23,30 +23,30 @@
       
         m.code
 
-int main() {
-    return 0;
+int main() {
+    return 0;
 }
-int main() {
-    return 1;
+int main() {
+    return 1;
 }
 Legacy :hl_lines: option should work the same:
-int main() {
-    return 1;
+int main() {
+    return 1;
 }
 Same as above, but for a .. include::, which should also support line
 highlighting:
-int main() {
-    return 1;
+int main() {
+    return 1;
 }
-Inline code is here: constexpr int foo = 5;. Syntax highlighting:
+Inline code is here: constexpr int foo = 5;. Syntax highlighting:
 # Comment
 var = "string{}escape\n"
 // this language is not highlighted
 Properly preserve backslashes: \frac{a}{b} ... and backticks:
 :ref:`a function <os.path.join()>`
 Don't trim leading spaces in blocks:
-        nope();
-    return false;
+        nope();
+    return false;
 }
 
 Code with no language specified
@@ -74,18 +74,18 @@ of it is stripped also:
 
 Filters
 Applied by default, adding typographically correct spaces before and a color
-swatch after --- and for inline as well: p { color: #ff3366; }
-p {
-    color: #ff3366;
+swatch after --- and for inline as well: p { color: #ff3366; }
+p {
+    color: #ff3366;
 }
 Applied explicitly and then by default --- and for inline as well:
-p { color: #3bd267; }
-p {
-    color: #3bd267;
+p { color: #3bd267; }
+p {
+    color: #3bd267;
 }
 Includes too:
-p {
-    color: #3bd267;
+p {
+    color: #3bd267;
 }
 
 
diff --git a/plugins/m/test/test_code.py b/plugins/m/test/test_code.py
index 9a430366..8e8f5b2e 100644
--- a/plugins/m/test/test_code.py
+++ b/plugins/m/test/test_code.py
@@ -23,9 +23,10 @@
 #   DEALINGS IN THE SOFTWARE.
 #
 
+import pygments
 import re
 
-from . import PelicanPluginTestCase
+from . import PelicanPluginTestCase, parse_version
 
 _css_colors_src = re.compile(r"""#(?P[0-9a-f]{6})""")
 _css_colors_dst = r"""#\g"""
@@ -54,5 +55,12 @@ class Code(PelicanPluginTestCase):
             },
         })
 
-        self.assertEqual(*self.actual_expected_contents('page.html'))
+        # Pygments 2.10+ properly highlight Whitespace as such, and not as
+        # Text. The whitespace classification is further improved in 2.11.
+        if parse_version(pygments.__version__) >= parse_version("2.11"):
+            self.assertEqual(*self.actual_expected_contents('page.html'))
+        elif parse_version(pygments.__version__) >= parse_version("2.10"):
+            self.assertEqual(*self.actual_expected_contents('page.html', 'page-210.html'))
+        else:
+            self.assertEqual(*self.actual_expected_contents('page.html', 'page-29.html'))
         self.assertEqual(*self.actual_expected_contents('ansi.html'))
-- 
2.30.2