From 2b57d535dfddbee13cb30ad352c42e68e7915553 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sat, 14 Sep 2024 04:47:53 +0200 Subject: [PATCH] documentation/doxygen: Doxygen 1.11 can already produce . What an amazing piece of thing. --- documentation/doxygen.py | 6 +++--- .../{Warnings_8h-111.html => Warnings_8h-110.html} | 0 .../{warnings-111.html => warnings-110.html} | 0 documentation/test_doxygen/test_contents.py | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) rename documentation/test_doxygen/contents_sections_headings/{Warnings_8h-111.html => Warnings_8h-110.html} (100%) rename documentation/test_doxygen/contents_sections_headings/{warnings-111.html => warnings-110.html} (100%) diff --git a/documentation/doxygen.py b/documentation/doxygen.py index a4612ff7..8813b5d6 100755 --- a/documentation/doxygen.py +++ b/documentation/doxygen.py @@ -605,7 +605,7 @@ def parse_desc_internal(state: State, element: ET.Element, immediate_parent: ET. out.parsed += '

' out.write_paragraph_close_tag = True - # Block elements. Until Doxygen 1.11 it was at most , 1.12 seems + # Block elements. Until Doxygen 1.10 it was at most , 1.11 seems # to have up to 6: https://github.com/doxygen/doxygen/issues/11016 if i.tag in ['sect1', 'sect2', 'sect3', 'sect4', 'sect5', 'sect6']: assert element.tag != 'para' # should be top-level block element @@ -687,8 +687,8 @@ def parse_desc_internal(state: State, element: ET.Element, immediate_parent: ET. # Apparently, in 1.8.18, is used for Markdown headers only if # we run out of sect1-4 tags. Which also happens when there's a heading - # with a ####### underline. In 1.12 it doesn't produce a , and - # instead just puts the #'s to the output verbatim. Which means we + # with a ####### underline. In 1.11+ it doesn't produce a , + # and instead just puts the #'s to the output verbatim. Which means we # can't warn for that. See test_contents.SectionsHeadings for repro # cases. elif i.tag == 'heading': diff --git a/documentation/test_doxygen/contents_sections_headings/Warnings_8h-111.html b/documentation/test_doxygen/contents_sections_headings/Warnings_8h-110.html similarity index 100% rename from documentation/test_doxygen/contents_sections_headings/Warnings_8h-111.html rename to documentation/test_doxygen/contents_sections_headings/Warnings_8h-110.html diff --git a/documentation/test_doxygen/contents_sections_headings/warnings-111.html b/documentation/test_doxygen/contents_sections_headings/warnings-110.html similarity index 100% rename from documentation/test_doxygen/contents_sections_headings/warnings-111.html rename to documentation/test_doxygen/contents_sections_headings/warnings-110.html diff --git a/documentation/test_doxygen/test_contents.py b/documentation/test_doxygen/test_contents.py index 3c255154..a55a58a6 100644 --- a/documentation/test_doxygen/test_contents.py +++ b/documentation/test_doxygen/test_contents.py @@ -419,7 +419,7 @@ class SectionsHeadings(IntegrationTestCase): # https://github.com/doxygen/doxygen/issues/11016, merged into 1.12, is # responsible I think. It got better, yes. - if parse_version(doxygen_version()) >= (1, 12): + if parse_version(doxygen_version()) >= (1, 11): page = 'warnings.html' file = 'Warnings_8h.html' output = [ @@ -427,8 +427,8 @@ class SectionsHeadings(IntegrationTestCase): "WARNING:root:warnings.xml: more than five levels of sections are not supported, stopping at

", ] else: - page = 'warnings-111.html' - file = 'Warnings_8h-111.html' + page = 'warnings-110.html' + file = 'Warnings_8h-110.html' output = [ "WARNING:root:Warnings_8h.xml: more than three levels of sections in member descriptions are not supported, stopping at
", "WARNING:root:Warnings_8h.xml: a Markdown heading underline was apparently misparsed by Doxygen, prefix the headings with # instead", -- 2.30.2