IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '7144_styling_desc_by_domainname' into 3.x

Browse Source
This commit is contained in:
Takeshi KOMIYA 2020-02-22 18:42:04 +09:00
commit db20d923d1
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -57,6 +57,7 @@ Features added
* #7108: config: Allow to show an error message from conf.py via ``ConfigError`` * #7108: config: Allow to show an error message from conf.py via ``ConfigError``
* #7032: html: :confval:`html_scaled_image_link` will be disabled for images having * #7032: html: :confval:`html_scaled_image_link` will be disabled for images having
``no-scaled-link`` class ``no-scaled-link`` class
* #7144: Add CSS class indicating its domain for each desc node
Bugs fixed Bugs fixed
---------- ----------

2
sphinx/directives/__init__.py
View File

@ -162,6 +162,8 @@ class ObjectDescription(SphinxDirective):
# 'desctype' is a backwards compatible attribute # 'desctype' is a backwards compatible attribute
node['objtype'] = node['desctype'] = self.objtype node['objtype'] = node['desctype'] = self.objtype
node['noindex'] = noindex = ('noindex' in self.options) node['noindex'] = noindex = ('noindex' in self.options)
if self.domain:
node['classes'].append(self.domain)
self.names = [] # type: List[Any] self.names = [] # type: List[Any]
signatures = self.get_signatures() signatures = self.get_signatures()

6
tests/test_build_html.py
View File

@ -176,8 +176,8 @@ def test_html4_output(app, status, warning):
r'-| |-'), r'-| |-'),
], ],
'autodoc.html': [ 'autodoc.html': [
(".//dt[@id='autodoc_target.Class']", ''), (".//dl[@class='py class']/dt[@id='autodoc_target.Class']", ''),
(".//dt[@id='autodoc_target.function']/em", r'\*\*kwds'), (".//dl[@class='py function']/dt[@id='autodoc_target.function']/em", r'\*\*kwds'),
(".//dd/p", r'Return spam\.'), (".//dd/p", r'Return spam\.'),
], ],
'extapi.html': [ 'extapi.html': [
@ -279,7 +279,7 @@ def test_html4_output(app, status, warning):
(".//dt/code", r'long\(parameter,\s* list\)'), (".//dt/code", r'long\(parameter,\s* list\)'),
(".//dt/code", 'another one'), (".//dt/code", 'another one'),
(".//a[@href='#mod.Cls'][@class='reference internal']", ''), (".//a[@href='#mod.Cls'][@class='reference internal']", ''),
(".//dl[@class='userdesc']", ''), (".//dl[@class='std userdesc']", ''),
(".//dt[@id='userdesc-myobj']", ''), (".//dt[@id='userdesc-myobj']", ''),
(".//a[@href='#userdesc-myobj'][@class='reference internal']", ''), (".//a[@href='#userdesc-myobj'][@class='reference internal']", ''),
# docfields # docfields