diff options
| author | Takeshi KOMIYA <i.tkomiya@gmail.com> | 2020-08-08 21:20:55 +0900 |
|---|---|---|
| committer | Takeshi KOMIYA <i.tkomiya@gmail.com> | 2020-10-04 14:32:56 +0900 |
| commit | 66dda1fc50249e9da62e79380251d8795b8e36df (patch) | |
| tree | 01553329fefc8c55fd2323cf20acb1589cbdfac6 | |
| parent | d8cb7aa4f668f1bf92458372568e1be110501eb8 (diff) | |
| download | sphinx-git-66dda1fc50249e9da62e79380251d8795b8e36df.tar.gz | |
Fix #6914: figure numbers are unexpectedly assigned to uncaptioned items
The figure numbers should be assigned to items only having captions or
titles. This uses `get_numfig_title()` to ensures it on assign numbers.
| -rw-r--r-- | CHANGES | 1 | ||||
| -rw-r--r-- | sphinx/environment/collectors/toctree.py | 4 |
2 files changed, 5 insertions, 0 deletions
@@ -47,6 +47,7 @@ Bugs fixed singlehtml and so on) * #8239: Failed to refer a token in productionlist if it is indented * #8268: linkcheck: Report HTTP errors when ``linkcheck_anchors`` is ``True`` +* #6914: figure numbers are unexpectedly assigned to uncaptioned items Testing -------- diff --git a/sphinx/environment/collectors/toctree.py b/sphinx/environment/collectors/toctree.py index e168bd9c4..d6cdc8354 100644 --- a/sphinx/environment/collectors/toctree.py +++ b/sphinx/environment/collectors/toctree.py @@ -224,6 +224,10 @@ class TocTreeCollector(EnvironmentCollector): def get_figtype(node: Node) -> str: for domain in env.domains.values(): figtype = domain.get_enumerable_node_type(node) + if domain.name == 'std' and not domain.get_numfig_title(node): # type: ignore + # Skip if uncaptioned node + continue + if figtype: return figtype |