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 with 0.5

Browse Source
This commit is contained in:
Georg Brandl 2009-01-14 19:39:42 +01:00
commit a8756fb4b3
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@ -97,6 +97,8 @@ New features added
Release 0.5.2 (in development) Release 0.5.2 (in development)
============================== ==============================
* #86: Fix explicit document titles in toctrees.
* #81: Write environment and search index in a manner that is safe * #81: Write environment and search index in a manner that is safe
from exceptions that occur during dumping. from exceptions that occur during dumping.

4
sphinx/environment.py
View File

@ -985,12 +985,12 @@ class BuildEnvironment:
# replace titles, if needed, and set the target paths in the # replace titles, if needed, and set the target paths in the
# toctrees (they are not known at TOC generation time) # toctrees (they are not known at TOC generation time)
for refnode in newnode.traverse(nodes.reference): for refnode in newnode.traverse(nodes.reference):
refnode['refuri'] = builder.get_relative_uri(
docname, refnode['refuri']) + refnode['anchorname']
if titleoverrides and not refnode['anchorname'] \ if titleoverrides and not refnode['anchorname'] \
and refnode['refuri'] in titleoverrides: and refnode['refuri'] in titleoverrides:
newtitle = titleoverrides[refnode['refuri']] newtitle = titleoverrides[refnode['refuri']]
refnode.children = [nodes.Text(newtitle)] refnode.children = [nodes.Text(newtitle)]
refnode['refuri'] = builder.get_relative_uri(
docname, refnode['refuri']) + refnode['anchorname']
return newnode return newnode
descroles = frozenset(('data', 'exc', 'func', 'class', 'const', 'attr', 'obj', descroles = frozenset(('data', 'exc', 'func', 'class', 'const', 'attr', 'obj',