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-02-17 18:59:47 +01:00
commit 03a9656c72
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@ -135,6 +135,9 @@ New features added
Release 0.5.2 (in development)
==============================
* Don't output system messages while resolving, because they
would stay in the doctrees even if keep_warnings is false.
* #82: Determine the correct path for dependencies noted by
docutils. This fixes behavior where a source with dependent
files was always reported as changed.

20
sphinx/environment.py
View File

@ -1121,18 +1121,19 @@ class BuildEnvironment:
docname, labelid = self.anonlabels.get(target, ('',''))
sectname = node.astext()
if not docname:
newnode = doctree.reporter.system_message(
2, 'undefined label: %s' % target)
self.warn(fromdocname, 'undefined label: %s' % target,
node.line)
else:
# reference to the named label; the final node will
# contain the section name after the label
docname, labelid, sectname = self.labels.get(target,
('','',''))
if not docname:
newnode = doctree.reporter.system_message(
2, 'undefined label: %s' % target +
' -- if you don\'t give a link caption '
'the label must precede a section header.')
self.warn(fromdocname,
'undefined label: %s' % target +
' -- if you don\'t give a link caption '
'the label must precede a section header.',
node.line)
if docname:
newnode = nodes.reference('', '')
innernode = nodes.emphasis(sectname, sectname)
@ -1150,13 +1151,16 @@ class BuildEnvironment:
if labelid:
newnode['refuri'] += '#' + labelid
newnode.append(innernode)
else:
newnode = contnode
elif typ == 'doc':
# directly reference to document by source name;
# can be absolute or relative
docname = docname_join(fromdocname, target)
if docname not in self.all_docs:
newnode = doctree.reporter.system_message(
2, 'unknown document: %s' % docname)
self.warn(fromdocname, 'unknown document: %s' % docname,
node.line)
newnode = contnode
else:
if node['refcaption']:
# reference with explicit title