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 sphinx-domains.

Browse Source
This commit is contained in:
Leontius Adhika Pradhana 2010-04-16 03:27:40 +08:00
commit 280699a75f
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sphinx/directives/__init__.py
View File

@ -190,6 +190,7 @@ class DefaultDomain(Directive):
# domain_name = domain.name # domain_name = domain.name
# break # break
env.temp_data['default_domain'] = env.domains.get(domain_name) env.temp_data['default_domain'] = env.domains.get(domain_name)
return []
directives.register_directive('default-domain', DefaultDomain) directives.register_directive('default-domain', DefaultDomain)

7
sphinx/domains/std.py
View File

@ -103,7 +103,7 @@ class Target(Directive):
def run(self): def run(self):
env = self.state.document.settings.env env = self.state.document.settings.env
# normalize whitespace in fullname like XRefRole does # normalize whitespace in fullname like XRefRole does
fullname = ws_re.sub('', self.arguments[0].strip()) fullname = ws_re.sub(' ', self.arguments[0].strip())
targetname = '%s-%s' % (self.name, fullname) targetname = '%s-%s' % (self.name, fullname)
node = nodes.target('', '', ids=[targetname]) node = nodes.target('', '', ids=[targetname])
self.state.document.note_explicit_target(node) self.state.document.note_explicit_target(node)
@ -118,7 +118,10 @@ class Target(Directive):
inode = addnodes.index(entries=[(indextype, indexentry, inode = addnodes.index(entries=[(indextype, indexentry,
targetname, targetname)]) targetname, targetname)])
ret.insert(0, inode) ret.insert(0, inode)
env.domaindata['std']['objects'][self.name, fullname] = \ name = self.name
if ':' in self.name:
_, name = self.name.split(':', 1)
env.domaindata['std']['objects'][name, fullname] = \
env.docname, targetname env.docname, targetname
return ret return ret

5
sphinx/ext/intersphinx.py
View File

@ -158,8 +158,9 @@ def load_mappings(app):
if update: if update:
env.intersphinx_inventory = {} env.intersphinx_inventory = {}
for _, invdata in cache.itervalues(): for _, invdata in cache.itervalues():
if invdata: for type, objects in invdata.iteritems():
env.intersphinx_inventory.update(invdata) env.intersphinx_inventory.setdefault(
type, {}).update(objects)
def missing_reference(app, env, node, contnode): def missing_reference(app, env, node, contnode):

2
sphinx/themes/basic/layout.html
View File

@ -91,7 +91,7 @@
<link rel="stylesheet" href="{{ pathto('_static/' + style, 1) }}" type="text/css" /> <link rel="stylesheet" href="{{ pathto('_static/' + style, 1) }}" type="text/css" />
<link rel="stylesheet" href="{{ pathto('_static/pygments.css', 1) }}" type="text/css" /> <link rel="stylesheet" href="{{ pathto('_static/pygments.css', 1) }}" type="text/css" />
{%- for cssfile in css_files %} {%- for cssfile in css_files %}
<link rel="stylesheet" href="{{ pathto('_static/' + cssfile, 1) }}" type="text/css" /> <link rel="stylesheet" href="{{ pathto(cssfile, 1) }}" type="text/css" />
{%- endfor %} {%- endfor %}
{%- if not embedded %} {%- if not embedded %}
<script type="text/javascript"> <script type="text/javascript">