[Python-checkins] r56665 - doctools/trunk/sphinx/directives.py doctools/trunk/sphinx/roles.py

[georg.brandl]

Author: georg.brandl
Date: Thu Aug  2 14:25:10 2007
New Revision: 56665

Modified:
   doctools/trunk/sphinx/directives.py
   doctools/trunk/sphinx/roles.py
Log:
Don't interpret markup in productionlists.


Modified: doctools/trunk/sphinx/directives.py
==============================================================================
--- doctools/trunk/sphinx/directives.py	(original)
+++ doctools/trunk/sphinx/directives.py	Thu Aug  2 14:25:10 2007
@@ -397,6 +397,28 @@
 
 # ------ production list (for the reference) ---------------------------------------
 
+token_re = re.compile('`([a-z_]+)`')
+
+def token_xrefs(text, env):
+    retnodes = []
+    pos = 0
+    for m in token_re.finditer(text):
+        if m.start() > pos:
+            txt = text[pos:m.start()]
+            retnodes.append(nodes.Text(txt, txt))
+        refnode = addnodes.pending_xref(m.group(1))
+        refnode['reftype'] = 'token'
+        refnode['reftarget'] = m.group(1)
+        refnode['modname'] = env.currmodule
+        refnode['classname'] = env.currclass
+        refnode += nodes.literal(m.group(1), m.group(1), classes=['xref'])
+        retnodes.append(refnode)
+        pos = m.end()
+    if pos < len(text):
+        retnodes.append(nodes.Text(text[pos:], text[pos:]))
+    print retnodes
+    return retnodes
+
 def productionlist_directive(name, arguments, options, content, lineno,
                              content_offset, block_text, state, state_machine):
     env = state.document.settings.env
@@ -404,8 +426,6 @@
     messages = []
     i = 0
 
-    # use token as the default role while in production list
-    roles._roles[''] = roles._role_registry['token']
     for rule in arguments[0].split('\n'):
         if i == 0 and ':' not in rule:
             # production group
@@ -423,11 +443,8 @@
                 subnode['ids'].append(idname)
             state.document.note_implicit_target(subnode, subnode)
             env.note_token(subnode['tokenname'])
-        inodes, imessages = state.inline_text(tokens, lineno+i)
-        subnode.extend(inodes)
-        messages.extend(imessages)
+        subnode.extend(token_xrefs(tokens, env))
         node.append(subnode)
-    del roles._roles['']
     return [node] + messages
 
 productionlist_directive.content = 0

Modified: doctools/trunk/sphinx/roles.py
==============================================================================
--- doctools/trunk/sphinx/roles.py	(original)
+++ doctools/trunk/sphinx/roles.py	Thu Aug  2 14:25:10 2007
@@ -95,9 +95,6 @@
 def xfileref_role(typ, rawtext, text, lineno, inliner, options={}, content=[]):
     env = inliner.document.settings.env
     text = utils.unescape(text)
-    # 'token' is the default role inside 'productionlist' directives
-    if typ == '':
-        typ = 'token'
     if typ in ('func', 'meth', 'cfunc') and \
            env.config.get('add_function_parentheses', True):
         text += '()'