Skip to content

Commit

Permalink
Merge branch '4.x'
Browse files Browse the repository at this point in the history
  • Loading branch information
tk0miya committed Dec 23, 2021
2 parents 03c9151 + 6ad6594 commit 4e8bca2
Show file tree
Hide file tree
Showing 81 changed files with 1,022 additions and 1,044 deletions.
20 changes: 16 additions & 4 deletions CHANGES
Expand Up @@ -57,6 +57,7 @@ Features added
this behavior with the ``--respect-module-all`` switch.
* #9800: extlinks: Emit warning if a hardcoded link is replaceable
by an extlink, suggesting a replacement.
* #9961: html: Support nested <kbd> HTML elements in other HTML builders
* #9815: html theme: Wrap sidebar components in div to allow customizing their
layout via CSS
* #9899: py domain: Allows to specify cross-reference specifier (``.`` and
Expand All @@ -65,6 +66,8 @@ Features added
checking in matched documents.
* #9793: sphinx-build: Allow to use the parallel build feature in macOS on macOS
and Python3.8+
* #9993: std domain: Allow to refer an inline target (ex. ``_`target name```)
via :rst:role:`ref` role
* #9391: texinfo: improve variable in ``samp`` role
* #9578: texinfo: Add :confval:`texinfo_cross_references` to disable cross
references for readability with standalone readers
Expand All @@ -76,6 +79,8 @@ Bugs fixed
* #9883: autodoc: doccomment for the alias to mocked object was ignored
* #9908: autodoc: debug message is shown on building document using NewTypes
with Python 3.10
* #9968: autodoc: instance variables are not shown if __init__ method has
position-only-arguments
* #9947: i18n: topic directive having a bullet list can't be translatable
* #9878: mathjax: MathJax configuration is placed after loading MathJax itself
* #9857: Generated RFC links use outdated base url
Expand All @@ -86,11 +91,12 @@ Bugs fixed
* #9940: LaTeX: Multi-function declaration in Python domain has cramped
vertical spacing in latexpdf output
* #9390: texinfo: Do not emit labels inside footnotes
* #9979: Error level messages were displayed as warning messages

Testing
--------

Release 4.3.2 (in development)
Release 4.3.3 (in development)
==============================

Dependencies
Expand All @@ -108,12 +114,18 @@ Features added
Bugs fixed
----------

* #9917: C and C++, parse fundamental types no matter the order of simple type
specifiers.

Testing
--------

Release 4.3.2 (released Dec 19, 2021)
=====================================

Bugs fixed
----------

* #9917: C and C++, parse fundamental types no matter the order of simple type
specifiers.

Release 4.3.1 (released Nov 28, 2021)
=====================================

Expand Down
4 changes: 2 additions & 2 deletions doc/usage/extensions/autodoc.rst
Expand Up @@ -664,8 +664,8 @@ There are also config values that you can set:

.. confval:: autodoc_unqualified_typehints

If True, the leading module names of typehints of function signatures (ex.
``io.StringIO`` -> ``StringIO``). Defaults to False.
If True, the leading module names of typehints of function signatures are
removed (ex. ``io.StringIO`` -> ``StringIO``). Defaults to False.

.. versionadded:: 4.4

Expand Down
2 changes: 1 addition & 1 deletion setup.py
Expand Up @@ -44,7 +44,7 @@
'lint': [
'flake8>=3.5.0',
'isort',
'mypy>=0.920',
'mypy>=0.930',
'docutils-stubs',
"types-typed-ast",
"types-pkg_resources",
Expand Down
2 changes: 1 addition & 1 deletion sphinx/builders/html/transforms.py
Expand Up @@ -36,7 +36,7 @@ class KeyboardTransform(SphinxPostTransform):
x
"""
default_priority = 400
builders = ('html',)
formats = ('html',)
pattern = re.compile(r'(?<=.)(-|\+|\^|\s+)(?=.)')
multiwords_keys = (('caps', 'lock'),
('page' 'down'),
Expand Down
8 changes: 5 additions & 3 deletions sphinx/domains/std.py
Expand Up @@ -763,18 +763,20 @@ def process_doc(self, env: "BuildEnvironment", docname: str, document: nodes.doc
sectname = clean_astext(title)
elif node.tagname == 'rubric':
sectname = clean_astext(node)
elif node.tagname == 'target' and len(node) > 0:
# inline target (ex: blah _`blah` blah)
sectname = clean_astext(node)
elif self.is_enumerable_node(node):
sectname = self.get_numfig_title(node)
if not sectname:
continue
else:
toctree = next(iter(node.traverse(addnodes.toctree)), None)
if toctree and toctree.get('caption'):
sectname = toctree.get('caption')
else:
# anonymous-only labels
continue
self.labels[name] = docname, labelid, sectname
if sectname:
self.labels[name] = docname, labelid, sectname

def add_program_option(self, program: str, name: str, docname: str, labelid: str) -> None:
self.progoptions[program, name] = (docname, labelid)
Expand Down
2 changes: 1 addition & 1 deletion sphinx/environment/__init__.py
Expand Up @@ -621,7 +621,7 @@ def traverse_toctree(parent: str, docname: str) -> Iterator[Tuple[str, str]]:

def check_consistency(self) -> None:
"""Do consistency checks."""
included = set().union(*self.included.values()) # type: ignore
included = set().union(*self.included.values())
for docname in sorted(self.all_docs):
if docname not in self.files_to_rebuild:
if docname == self.config.root_doc:
Expand Down
Binary file modified sphinx/locale/bn/LC_MESSAGES/sphinx.mo
Binary file not shown.

0 comments on commit 4e8bca2

Please sign in to comment.