Merge branch 'master' into du22-title-style-context

Author: AA-Turner

sphinx/directives/other.py

@@ -5,6 +5,7 @@
 from pathlib import Path
 from typing import TYPE_CHECKING, cast
 
+import docutils
 from docutils import nodes
 from docutils.parsers.rst import directives
 from docutils.parsers.rst.directives.misc import Class
@@ -21,14 +22,15 @@
 
 if TYPE_CHECKING:
     from collections.abc import Sequence
-    from typing import Any, ClassVar
+    from typing import Any, ClassVar, Final
 
     from docutils.nodes import Element, Node
 
     from sphinx.application import Sphinx
     from sphinx.util.typing import ExtensionMetadata, OptionSpec
 
 
+DU_22_PLUS: Final = docutils.__version_info__ >= (0, 22, 0, 'alpha', 0)
 glob_re = re.compile(r'.*[*?\[].*')
 logger = logging.getLogger(__name__)
 
@@ -330,6 +332,14 @@ def run(self) -> list[Node]:
         surrounding_section_level = memo.section_level
         memo.title_styles = []
         memo.section_level = 0
+        if DU_22_PLUS:
+            # https://github.com/sphinx-doc/sphinx/issues/13539
+            # https://sourceforge.net/p/docutils/code/10093/
+            # https://sourceforge.net/p/docutils/patches/213/
+            surrounding_section_parents = memo.section_parents
+            memo.section_parents = []
+        else:
+            surrounding_section_parents = []
         try:
             self.state.nested_parse(
                 self.content, self.content_offset, node, match_titles=True
@@ -365,6 +375,8 @@ def run(self) -> list[Node]:
             return []
         finally:
             memo.title_styles = surrounding_title_styles
+            if DU_22_PLUS:
+                memo.section_parents = surrounding_section_parents
             memo.section_level = surrounding_section_level
 
 

tests/test_directives/test_directive_only.py

@@ -5,20 +5,13 @@
 import re
 from typing import TYPE_CHECKING
 
-import docutils
 import pytest
 from docutils import nodes
 
 if TYPE_CHECKING:
     from sphinx.testing.util import SphinxTestApp
 
-xfail_du_22 = pytest.mark.xfail(
-    docutils.__version_info__ >= (0, 22, 0, 'alpha', 0),
-    reason='expected failure on Docutils 0.22+',
-)
 
-
-@xfail_du_22
 @pytest.mark.sphinx('text', testroot='directive-only')
 def test_sectioning(app: SphinxTestApp) -> None:
     def getsects(section):

tests/test_environment/test_environment_toctree.py

@@ -4,7 +4,6 @@
 
 from typing import TYPE_CHECKING
 
-import docutils
 import pytest
 from docutils import nodes
 from docutils.nodes import bullet_list, list_item, literal, reference, title
@@ -18,13 +17,7 @@
 if TYPE_CHECKING:
     from sphinx.testing.util import SphinxTestApp
 
-xfail_du_22 = pytest.mark.xfail(
-    docutils.__version_info__ >= (0, 22, 0, 'alpha', 0),
-    reason='expected failure on Docutils 0.22+',
-)
 
-
-@xfail_du_22
 @pytest.mark.sphinx('xml', testroot='toctree')
 @pytest.mark.test_params(shared_result='test_environment_toctree_basic')
 def test_process_doc(app):
@@ -471,7 +464,6 @@ def test_domain_objects_document_scoping(app: SphinxTestApp) -> None:
     )
 
 
-@xfail_du_22
 @pytest.mark.sphinx('xml', testroot='toctree')
 @pytest.mark.test_params(shared_result='test_environment_toctree_basic')
 def test_document_toc(app):
@@ -529,7 +521,6 @@ def test_document_toc(app):
     assert_node(toctree[2][0], [compact_paragraph, reference, 'Indices and tables'])
 
 
-@xfail_du_22
 @pytest.mark.sphinx('xml', testroot='toctree')
 @pytest.mark.test_params(shared_result='test_environment_toctree_basic')
 def test_document_toc_only(app):