IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

merge heads

Browse Source
This commit is contained in:
Georg Brandl 2014-09-23 07:51:52 +02:00
commit 986aba2a43
3 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@ -81,6 +81,8 @@ Features added
the order of documents before they are read by the environment. the order of documents before they are read by the environment.
* #1284: Program options documented with :rst:dir:`option` can now start with * #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 Bugs fixed
---------- ----------

5
sphinx/domains/std.py
View File

@ -562,6 +562,11 @@ class StandardDomain(Domain):
break break
else: else:
continue continue
elif node.tagname == 'literal_block':
if 'caption' in node:
sectname = node['caption']
else:
continue
else: else:
# anonymous-only labels # anonymous-only labels
continue continue

4
tests/root/markup.txt
View File

@ -142,6 +142,7 @@ Adding \n to test unescaping.
* :ref:`here <some-label>` * :ref:`here <some-label>`
* :ref:`my-figure` * :ref:`my-figure`
* :ref:`my-table` * :ref:`my-table`
* :ref:`my-code-block`
* :doc:`subdir/includes` * :doc:`subdir/includes`
* ``:download:`` is tested in includes.txt * ``:download:`` is tested in includes.txt
* :option:`Python -c option <python -c>` * :option:`Python -c option <python -c>`
@ -228,8 +229,11 @@ Version markup
Code blocks Code blocks
----------- -----------
.. _my-code-block:
.. code-block:: ruby .. code-block:: ruby
:linenos: :linenos:
:caption: my ruby code
def ruby? def ruby?
false false