Skip to content

Commit 8dd3d88

Browse files
q2markAA-Turner
andauthored
Use <span> in desc_annotation for better semantic HTML (#13689)
Co-authored-by: Adam Turner <9087854+AA-Turner@users.noreply.github.com>
1 parent f25cfdd commit 8dd3d88

File tree

4 files changed

+11
-5
lines changed

4 files changed

+11
-5
lines changed

AUTHORS.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ Contributors
8383
* Louis Maddox -- better docstrings
8484
* Łukasz Langa -- partial support for autodoc
8585
* Marco Buttu -- doctest extension (pyversion option)
86+
* Mark Ostroth -- semantic HTML contributions
8687
* Martin Hans -- autodoc improvements
8788
* Martin Larralde -- additional napoleon admonitions
8889
* Martin Liška -- option directive and role improvements

CHANGES.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,11 @@ Bugs fixed
9797
Patch by Bénédikt Tran.
9898
* #13712: intersphinx: Don't add "v" prefix to non-numeric versions.
9999
Patch by Szymon Karpinski.
100+
* #13688: HTML builder: Replace ``<em class="property">`` with
101+
``<span class="property">`` for attribute type annotations
102+
to improve `semantic HTML structure
103+
<https://html.spec.whatwg.org/multipage/text-level-semantics.html>`__.
104+
Patch by Mark Ostroth.
100105

101106
Testing
102107
-------

sphinx/writers/html5.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -305,10 +305,10 @@ def depart_desc_optional(self, node: Element) -> None:
305305
self.param_group_index += 1
306306

307307
def visit_desc_annotation(self, node: Element) -> None:
308-
self.body.append(self.starttag(node, 'em', '', CLASS='property'))
308+
self.body.append(self.starttag(node, 'span', '', CLASS='property'))
309309

310310
def depart_desc_annotation(self, node: Element) -> None:
311-
self.body.append('</em>')
311+
self.body.append('</span>')
312312

313313
##############################################
314314

tests/test_domains/test_domain_py_pyobject.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -925,17 +925,17 @@ def test_domain_py_type_alias(app):
925925

926926
content = (app.outdir / 'type_alias.html').read_text(encoding='utf8')
927927
assert (
928-
'<em class="property"><span class="k"><span class="pre">type</span></span><span class="w"> </span></em>'
928+
'<span class="property"><span class="k"><span class="pre">type</span></span><span class="w"> </span></span>'
929929
'<span class="sig-prename descclassname"><span class="pre">module_one.</span></span>'
930930
'<span class="sig-name descname"><span class="pre">MyAlias</span></span>'
931-
'<em class="property"><span class="w"> </span><span class="p"><span class="pre">=</span></span>'
931+
'<span class="property"><span class="w"> </span><span class="p"><span class="pre">=</span></span>'
932932
'<span class="w"> </span><span class="pre">list</span>'
933933
'<span class="p"><span class="pre">[</span></span>'
934934
'<span class="pre">int</span><span class="w"> </span>'
935935
'<span class="p"><span class="pre">|</span></span><span class="w"> </span>'
936936
'<a class="reference internal" href="#module_two.SomeClass" title="module_two.SomeClass">'
937937
'<span class="pre">module_two.SomeClass</span></a>'
938-
'<span class="p"><span class="pre">]</span></span></em>'
938+
'<span class="p"><span class="pre">]</span></span></span>'
939939
) in content
940940
assert app.warning.getvalue() == ''
941941

0 commit comments

Comments
 (0)