summaryrefslogtreecommitdiff
path: root/sphinx/directives/code.py
diff options
context:
space:
mode:
authorTakayuki Shimizukawa <shimizukawa@gmail.com>2014-10-06 01:25:25 +0900
committerTakayuki Shimizukawa <shimizukawa@gmail.com>2014-10-06 01:25:25 +0900
commit655866d2cc97299b6e934c9761772fbe9b469a18 (patch)
tree6c2d3258265cee1830bc7780ec89f1965ca0d3fa /sphinx/directives/code.py
parent5eb459f5a610dae041a278a1331dfd33e8b37afe (diff)
downloadsphinx-git-655866d2cc97299b6e934c9761772fbe9b469a18.tar.gz
Fix. <caption> node should not include <paragraph> block element as a result of nested_parse.
Diffstat (limited to 'sphinx/directives/code.py')
-rw-r--r--sphinx/directives/code.py11
1 files changed, 7 insertions, 4 deletions
diff --git a/sphinx/directives/code.py b/sphinx/directives/code.py
index ff642ba70..d63d710cf 100644
--- a/sphinx/directives/code.py
+++ b/sphinx/directives/code.py
@@ -63,11 +63,14 @@ def dedent_lines(lines, dedent):
def container_wrapper(directive, literal_node, caption):
- caption_node = nodes.caption()
- directive.state.nested_parse(ViewList([caption], source=''),
- directive.content_offset, caption_node)
-
container_node = nodes.container('', literal_block=True)
+ parsed = nodes.Element()
+ directive.state.nested_parse(ViewList([caption], source=''),
+ directive.content_offset, parsed)
+ caption_node = nodes.caption(parsed[0].rawsource, '',
+ *parsed[0].children)
+ caption_node.source = parsed[0].source
+ caption_node.line = parsed[0].line
container_node += caption_node
container_node += literal_node
return container_node