diff options
author | Takayuki Shimizukawa <shimizukawa+bitbucket@gmail.com> | 2014-09-23 12:21:15 +0900 |
---|---|---|
committer | Takayuki Shimizukawa <shimizukawa+bitbucket@gmail.com> | 2014-09-23 12:21:15 +0900 |
commit | 285e3beb39c47673df20d0a630f8b89086ae8a2d (patch) | |
tree | 50511c9f74bff8c6d659f0515d98f19255b9996e | |
parent | f5ca17f03123f467f929199403890e40226ed79f (diff) | |
parent | b322433ebf1a8240fde810b8fffd418e192cf4f3 (diff) | |
download | sphinx-285e3beb39c47673df20d0a630f8b89086ae8a2d.tar.gz |
Merged in tk0miya/sphinx (pull request #291)
Fix cannot capture title of literal_block node by xref
-rw-r--r-- | sphinx/domains/std.py | 5 | ||||
-rw-r--r-- | tests/root/markup.txt | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/sphinx/domains/std.py b/sphinx/domains/std.py index f14f65aa..a636299e 100644 --- a/sphinx/domains/std.py +++ b/sphinx/domains/std.py @@ -562,6 +562,11 @@ class StandardDomain(Domain): break else: continue + elif node.tagname == 'literal_block': + if 'caption' in node: + sectname = node['caption'] + else: + continue else: # anonymous-only labels continue diff --git a/tests/root/markup.txt b/tests/root/markup.txt index 8a55e690..6ed396ac 100644 --- a/tests/root/markup.txt +++ b/tests/root/markup.txt @@ -142,6 +142,7 @@ Adding \n to test unescaping. * :ref:`here <some-label>` * :ref:`my-figure` * :ref:`my-table` +* :ref:`my-code-block` * :doc:`subdir/includes` * ``:download:`` is tested in includes.txt * :option:`Python -c option <python -c>` @@ -228,8 +229,11 @@ Version markup Code blocks ----------- +.. _my-code-block: + .. code-block:: ruby :linenos: + :caption: my ruby code def ruby? false |