From 7ebe5704be4382cfca5080a149f6d33f1ab147d3 Mon Sep 17 00:00:00 2001 From: Takeshi KOMIYA Date: Sun, 1 May 2016 07:30:32 +0900 Subject: [PATCH] Fix #2483: any figure number was not assigned if figure title contains only non text objects --- CHANGES | 1 + sphinx/domains/std.py | 2 +- sphinx/transforms.py | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index 5b98354463..991f3db444 100644 --- a/CHANGES +++ b/CHANGES @@ -47,6 +47,7 @@ Bugs fixed * #1534: Word wrap long lines in Latex verbatim blocks * #2460: too much white space on top of captioned literal blocks in PDF output * Show error reason when multiple math extensions are loaded (ref: #2499) +* #2483: any figure number was not assigned if figure title contains only non text objects Release 1.4.1 (released Apr 12, 2016) diff --git a/sphinx/domains/std.py b/sphinx/domains/std.py index 8b88192da8..997d95ba3d 100644 --- a/sphinx/domains/std.py +++ b/sphinx/domains/std.py @@ -548,7 +548,7 @@ class StandardDomain(Domain): sectname = clean_astext(node[0]) # node[0] == title node elif self.is_enumerable_node(node): sectname = self.get_numfig_title(node) - if sectname is None: + if not sectname: continue elif node.traverse(addnodes.toctree): n = node.traverse(addnodes.toctree)[0] diff --git a/sphinx/transforms.py b/sphinx/transforms.py index 2e3fb7f0b9..47e22237e1 100644 --- a/sphinx/transforms.py +++ b/sphinx/transforms.py @@ -114,7 +114,7 @@ class AutoNumbering(Transform): domain = self.document.settings.env.domains['std'] for node in self.document.traverse(nodes.Element): - if domain.is_enumerable_node(node) and domain.get_numfig_title(node): + if domain.is_enumerable_node(node) and domain.get_numfig_title(node) is not None: self.document.note_implicit_target(node)