diff --git a/AUTHORS.rst b/AUTHORS.rst index 43a8da3469d..89b4c52cfe7 100644 --- a/AUTHORS.rst +++ b/AUTHORS.rst @@ -83,6 +83,7 @@ Contributors * Louis Maddox -- better docstrings * Łukasz Langa -- partial support for autodoc * Marco Buttu -- doctest extension (pyversion option) +* Mark Ostroth -- semantic HTML contributions * Martin Hans -- autodoc improvements * Martin Larralde -- additional napoleon admonitions * Martin Liška -- option directive and role improvements diff --git a/CHANGES.rst b/CHANGES.rst index 0f047d6da92..c3e1d83b6c7 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -79,6 +79,9 @@ Bugs fixed Patch by Jean-François B. * #13685: gettext: Correctly ignore trailing backslashes. Patch by Bénédikt Tran. +* #13688: HTML5: Replace ```` with ```` + for Python attribute type annotations to improve semantic HTML structure. + Patch by Mark O. Testing ------- diff --git a/sphinx/writers/html5.py b/sphinx/writers/html5.py index 39d7ecea680..bbcd247e33c 100644 --- a/sphinx/writers/html5.py +++ b/sphinx/writers/html5.py @@ -305,10 +305,10 @@ def depart_desc_optional(self, node: Element) -> None: self.param_group_index += 1 def visit_desc_annotation(self, node: Element) -> None: - self.body.append(self.starttag(node, 'em', '', CLASS='property')) + self.body.append(self.starttag(node, 'span', '', CLASS='property')) def depart_desc_annotation(self, node: Element) -> None: - self.body.append('') + self.body.append('') ############################################## diff --git a/tests/test_domains/test_domain_py_pyobject.py b/tests/test_domains/test_domain_py_pyobject.py index 12b22a04dcc..dec4d71546e 100644 --- a/tests/test_domains/test_domain_py_pyobject.py +++ b/tests/test_domains/test_domain_py_pyobject.py @@ -925,17 +925,17 @@ def test_domain_py_type_alias(app): content = (app.outdir / 'type_alias.html').read_text(encoding='utf8') assert ( - 'type ' + 'type ' 'module_one.' 'MyAlias' - ' =' + ' =' ' list' '[' 'int ' '| ' '' 'module_two.SomeClass' - ']' + ']' ) in content assert app.warning.getvalue() == ''