summaryrefslogtreecommitdiff
path: root/sphinx/application.py
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2009-07-05 12:24:27 +0200
committerGeorg Brandl <georg@python.org>2009-07-05 12:24:27 +0200
commit79aeac18027dc955cddf4657944aa7bd2661b47d (patch)
tree8a6a70cd7ffedbb03b6830f08548d072f77d96db /sphinx/application.py
parent9b7ad337720fd49371ca9757b5f928fd9eeb6722 (diff)
downloadsphinx-79aeac18027dc955cddf4657944aa7bd2661b47d.tar.gz
Move domain-specific code around a bit; builtin domains are now completely in sphinx.domains. Test suite does not pass yet.
Diffstat (limited to 'sphinx/application.py')
-rw-r--r--sphinx/application.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/sphinx/application.py b/sphinx/application.py
index 9b6cf36f..5e34232c 100644
--- a/sphinx/application.py
+++ b/sphinx/application.py
@@ -20,7 +20,7 @@ from docutils import nodes
from docutils.parsers.rst import directives, roles
import sphinx
-from sphinx.roles import make_xref_role, simple_link_func
+from sphinx.roles import XRefRole
from sphinx.config import Config
from sphinx.errors import SphinxError, SphinxWarning, ExtensionError
from sphinx.domains import domains
@@ -310,14 +310,16 @@ class Sphinx(object):
parse_node)
directives.register_directive(directivename,
directive_dwim(GenericDesc))
- role_func = make_xref_role(simple_link_func, innernodeclass=ref_nodeclass)
+ # XXX support more options?
+ role_func = XRefRole('', innernodeclass=ref_nodeclass)
roles.register_local_role(rolename, role_func)
def add_crossref_type(self, directivename, rolename, indextemplate='',
ref_nodeclass=None):
additional_xref_types[directivename] = (rolename, indextemplate, None)
directives.register_directive(directivename, directive_dwim(Target))
- role_func = make_xref_role(simple_link_func, innernodeclass=ref_nodeclass)
+ # XXX support more options
+ role_func = XRefRole('', innernodeclass=ref_nodeclass)
roles.register_local_role(rolename, role_func)
def add_transform(self, transform):