mirror of
https://github.com/sphinx-doc/sphinx.git
synced 2025-02-25 18:55:22 -06:00
Merge branch 'drop_desc_signature_first' into 3.x
This commit is contained in:
commit
2b70875f6a
1
CHANGES
1
CHANGES
@ -27,6 +27,7 @@ Incompatible changes
|
|||||||
Deprecated
|
Deprecated
|
||||||
----------
|
----------
|
||||||
|
|
||||||
|
* ``desc_signature['first']``
|
||||||
* ``sphinx.directives.DescDirective``
|
* ``sphinx.directives.DescDirective``
|
||||||
* ``sphinx.domains.std.StandardDomain.add_object()``
|
* ``sphinx.domains.std.StandardDomain.add_object()``
|
||||||
* ``sphinx.parsers.Parser.app``
|
* ``sphinx.parsers.Parser.app``
|
||||||
|
@ -26,6 +26,11 @@ The following is a list of deprecated interfaces.
|
|||||||
- (will be) Removed
|
- (will be) Removed
|
||||||
- Alternatives
|
- Alternatives
|
||||||
|
|
||||||
|
* - ``desc_signature['first']``
|
||||||
|
-
|
||||||
|
- 3.0
|
||||||
|
- N/A
|
||||||
|
|
||||||
* - ``sphinx.directives.DescDirective``
|
* - ``sphinx.directives.DescDirective``
|
||||||
- 3.0
|
- 3.0
|
||||||
- 5.0
|
- 5.0
|
||||||
|
@ -169,7 +169,6 @@ class ObjectDescription(SphinxDirective):
|
|||||||
# add a signature node for each signature in the current unit
|
# add a signature node for each signature in the current unit
|
||||||
# and add a reference target for it
|
# and add a reference target for it
|
||||||
signode = addnodes.desc_signature(sig, '')
|
signode = addnodes.desc_signature(sig, '')
|
||||||
signode['first'] = False
|
|
||||||
node.append(signode)
|
node.append(signode)
|
||||||
try:
|
try:
|
||||||
# name can also be a tuple, e.g. (classname, objname);
|
# name can also be a tuple, e.g. (classname, objname);
|
||||||
|
@ -203,7 +203,6 @@ class CObject(ObjectDescription):
|
|||||||
if targetname not in self.state.document.ids:
|
if targetname not in self.state.document.ids:
|
||||||
signode['names'].append(targetname)
|
signode['names'].append(targetname)
|
||||||
signode['ids'].append(targetname)
|
signode['ids'].append(targetname)
|
||||||
signode['first'] = (not self.names)
|
|
||||||
self.state.document.note_explicit_target(signode)
|
self.state.document.note_explicit_target(signode)
|
||||||
|
|
||||||
domain = cast(CDomain, self.env.get_domain('c'))
|
domain = cast(CDomain, self.env.get_domain('c'))
|
||||||
|
@ -6490,7 +6490,6 @@ class CPPObject(ObjectDescription):
|
|||||||
continue
|
continue
|
||||||
if id not in self.state.document.ids:
|
if id not in self.state.document.ids:
|
||||||
signode['ids'].append(id)
|
signode['ids'].append(id)
|
||||||
signode['first'] = (not self.names) # hmm, what is this about?
|
|
||||||
self.state.document.note_explicit_target(signode)
|
self.state.document.note_explicit_target(signode)
|
||||||
|
|
||||||
@property
|
@property
|
||||||
@ -6772,7 +6771,6 @@ class AliasTransform(SphinxTransform):
|
|||||||
if ast is None:
|
if ast is None:
|
||||||
# could not be parsed, so stop here
|
# could not be parsed, so stop here
|
||||||
signode = addnodes.desc_signature(sig, '')
|
signode = addnodes.desc_signature(sig, '')
|
||||||
signode['first'] = False
|
|
||||||
signode.clear()
|
signode.clear()
|
||||||
signode += addnodes.desc_name(sig, sig)
|
signode += addnodes.desc_name(sig, sig)
|
||||||
node.replace_self(signode)
|
node.replace_self(signode)
|
||||||
@ -6816,7 +6814,6 @@ class AliasTransform(SphinxTransform):
|
|||||||
|
|
||||||
if len(symbols) == 0:
|
if len(symbols) == 0:
|
||||||
signode = addnodes.desc_signature(sig, '')
|
signode = addnodes.desc_signature(sig, '')
|
||||||
signode['first'] = False
|
|
||||||
node.append(signode)
|
node.append(signode)
|
||||||
signode.clear()
|
signode.clear()
|
||||||
signode += addnodes.desc_name(sig, sig)
|
signode += addnodes.desc_name(sig, sig)
|
||||||
@ -6830,7 +6827,6 @@ class AliasTransform(SphinxTransform):
|
|||||||
options['tparam-line-spec'] = False
|
options['tparam-line-spec'] = False
|
||||||
for s in symbols:
|
for s in symbols:
|
||||||
signode = addnodes.desc_signature(sig, '')
|
signode = addnodes.desc_signature(sig, '')
|
||||||
signode['first'] = False
|
|
||||||
nodes.append(signode)
|
nodes.append(signode)
|
||||||
s.declaration.describe_signature(signode, 'markName', self.env, options)
|
s.declaration.describe_signature(signode, 'markName', self.env, options)
|
||||||
node.replace_self(nodes)
|
node.replace_self(nodes)
|
||||||
|
@ -109,7 +109,6 @@ class JSObject(ObjectDescription):
|
|||||||
if fullname not in self.state.document.ids:
|
if fullname not in self.state.document.ids:
|
||||||
signode['names'].append(fullname)
|
signode['names'].append(fullname)
|
||||||
signode['ids'].append(fullname.replace('$', '_S_'))
|
signode['ids'].append(fullname.replace('$', '_S_'))
|
||||||
signode['first'] = not self.names
|
|
||||||
self.state.document.note_explicit_target(signode)
|
self.state.document.note_explicit_target(signode)
|
||||||
|
|
||||||
domain = cast(JavaScriptDomain, self.env.get_domain('js'))
|
domain = cast(JavaScriptDomain, self.env.get_domain('js'))
|
||||||
|
@ -362,7 +362,6 @@ class PyObject(ObjectDescription):
|
|||||||
if fullname not in self.state.document.ids:
|
if fullname not in self.state.document.ids:
|
||||||
signode['names'].append(fullname)
|
signode['names'].append(fullname)
|
||||||
signode['ids'].append(fullname)
|
signode['ids'].append(fullname)
|
||||||
signode['first'] = (not self.names)
|
|
||||||
self.state.document.note_explicit_target(signode)
|
self.state.document.note_explicit_target(signode)
|
||||||
|
|
||||||
domain = cast(PythonDomain, self.env.get_domain('py'))
|
domain = cast(PythonDomain, self.env.get_domain('py'))
|
||||||
|
@ -43,7 +43,6 @@ class ReSTMarkup(ObjectDescription):
|
|||||||
if targetname not in self.state.document.ids:
|
if targetname not in self.state.document.ids:
|
||||||
signode['names'].append(targetname)
|
signode['names'].append(targetname)
|
||||||
signode['ids'].append(targetname)
|
signode['ids'].append(targetname)
|
||||||
signode['first'] = (not self.names)
|
|
||||||
self.state.document.note_explicit_target(signode)
|
self.state.document.note_explicit_target(signode)
|
||||||
|
|
||||||
domain = cast(ReSTDomain, self.env.get_domain('rst'))
|
domain = cast(ReSTDomain, self.env.get_domain('rst'))
|
||||||
@ -133,7 +132,6 @@ class ReSTDirectiveOption(ReSTMarkup):
|
|||||||
if targetname not in self.state.document.ids:
|
if targetname not in self.state.document.ids:
|
||||||
signode['names'].append(targetname)
|
signode['names'].append(targetname)
|
||||||
signode['ids'].append(targetname)
|
signode['ids'].append(targetname)
|
||||||
signode['first'] = (not self.names)
|
|
||||||
self.state.document.note_explicit_target(signode)
|
self.state.document.note_explicit_target(signode)
|
||||||
|
|
||||||
objname = ':'.join(filter(None, [directive_name, name]))
|
objname = ':'.join(filter(None, [directive_name, name]))
|
||||||
|
@ -115,10 +115,6 @@ class HTMLTranslator(SphinxTranslator, BaseTranslator):
|
|||||||
def visit_desc_signature(self, node: Element) -> None:
|
def visit_desc_signature(self, node: Element) -> None:
|
||||||
# the id is set automatically
|
# the id is set automatically
|
||||||
self.body.append(self.starttag(node, 'dt'))
|
self.body.append(self.starttag(node, 'dt'))
|
||||||
# anchor for per-desc interactive data
|
|
||||||
if node.parent['objtype'] != 'describe' \
|
|
||||||
and node['ids'] and node['first']:
|
|
||||||
self.body.append('<!--[%s]-->' % node['ids'][0])
|
|
||||||
|
|
||||||
def depart_desc_signature(self, node: Element) -> None:
|
def depart_desc_signature(self, node: Element) -> None:
|
||||||
if not node.get('is_multiline'):
|
if not node.get('is_multiline'):
|
||||||
|
@ -87,10 +87,6 @@ class HTML5Translator(SphinxTranslator, BaseTranslator):
|
|||||||
def visit_desc_signature(self, node: Element) -> None:
|
def visit_desc_signature(self, node: Element) -> None:
|
||||||
# the id is set automatically
|
# the id is set automatically
|
||||||
self.body.append(self.starttag(node, 'dt'))
|
self.body.append(self.starttag(node, 'dt'))
|
||||||
# anchor for per-desc interactive data
|
|
||||||
if node.parent['objtype'] != 'describe' \
|
|
||||||
and node['ids'] and node['first']:
|
|
||||||
self.body.append('<!--[%s]-->' % node['ids'][0])
|
|
||||||
|
|
||||||
def depart_desc_signature(self, node: Element) -> None:
|
def depart_desc_signature(self, node: Element) -> None:
|
||||||
if not node.get('is_multiline'):
|
if not node.get('is_multiline'):
|
||||||
|
Loading…
Reference in New Issue
Block a user