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

Fix some naming issues in intersphinx when given an explicit prefix.

Browse Source
This commit is contained in:
Georg Brandl 2010-07-26 19:32:44 +02:00
parent ebb7a54141
commit bf71b0b2fa
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sphinx/ext/intersphinx.py
View File

@ -191,10 +191,12 @@ def missing_reference(app, env, node, contnode):
return return
objtypes = ['%s:%s' % (domain, objtype) for objtype in objtypes] objtypes = ['%s:%s' % (domain, objtype) for objtype in objtypes]
to_try = [(env.intersphinx_inventory, target)] to_try = [(env.intersphinx_inventory, target)]
in_set = None
if ':' in target: if ':' in target:
# first part may be the foreign doc set name # first part may be the foreign doc set name
setname, newtarget = target.split(':', 1) setname, newtarget = target.split(':', 1)
if setname in env.intersphinx_named_inventory: if setname in env.intersphinx_named_inventory:
in_set = setname
to_try.append((env.intersphinx_named_inventory[setname], newtarget)) to_try.append((env.intersphinx_named_inventory[setname], newtarget))
for inventory, target in to_try: for inventory, target in to_try:
for objtype in objtypes: for objtype in objtypes:
@ -204,10 +206,13 @@ def missing_reference(app, env, node, contnode):
newnode = nodes.reference('', '', internal=False, refuri=uri, newnode = nodes.reference('', '', internal=False, refuri=uri,
reftitle='(in %s v%s)' % (proj, version)) reftitle='(in %s v%s)' % (proj, version))
if dispname == '-': if dispname == '-':
newnode.append(contnode) dispname = target
else: newnode.append(contnode.__class__(dispname, dispname))
newnode.append(contnode.__class__(dispname, dispname))
return newnode return newnode
# at least get rid of the ':' in the target
if in_set is not None:
if len(contnode) and isinstance(contnode[0], nodes.Text):
contnode[0] = nodes.Text(newtarget, contnode[0].rawsource)
def setup(app): def setup(app):