merge heads

CHANGES

@@ -81,6 +81,8 @@ Features added
   the order of documents before they are read by the environment.
 * #1284: Program options documented with :rst:dir:`option` can now start with
   ``+``.
+* PR#291: The caption of :rst:dir:`code-block` is recognised as a title of ref
+  target. Thanks to Takeshi Komiya.
 
 Bugs fixed
 ----------

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

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