From 66dda1fc50249e9da62e79380251d8795b8e36df Mon Sep 17 00:00:00 2001 From: Takeshi KOMIYA Date: Sat, 8 Aug 2020 21:20:55 +0900 Subject: [PATCH] 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. --- CHANGES | 1 + sphinx/environment/collectors/toctree.py | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/CHANGES b/CHANGES index 4252376b0..11b758399 100644 --- a/CHANGES +++ b/CHANGES @@ -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