[Python-checkins] r66606 - in doctools/trunk: CHANGES sphinx/environment.py sphinx/roles.py

[georg.brandl]

Author: georg.brandl
Date: Wed Sep 24 19:09:48 2008
New Revision: 66606

Log:
Add cmember role (#3875).


Modified:
   doctools/trunk/CHANGES
   doctools/trunk/sphinx/environment.py
   doctools/trunk/sphinx/roles.py

Modified: doctools/trunk/CHANGES
==============================================================================
--- doctools/trunk/CHANGES	(original)
+++ doctools/trunk/CHANGES	Wed Sep 24 19:09:48 2008
@@ -107,6 +107,8 @@
   - In quickstart, if the selected root path already contains a Sphinx
     project, complain and abort.
 
+  - Added ``cmember`` role for consistency.
+
 
 Release 0.4.2 (Jul 29, 2008)
 ============================

Modified: doctools/trunk/sphinx/environment.py
==============================================================================
--- doctools/trunk/sphinx/environment.py	(original)
+++ doctools/trunk/sphinx/environment.py	Wed Sep 24 19:09:48 2008
@@ -902,8 +902,8 @@
                 refnode.children = [nodes.Text(newtitle)]
         return newnode
 
-    descroles = frozenset(('data', 'exc', 'func', 'class', 'const', 'attr',
-                           'meth', 'cfunc', 'cdata', 'ctype', 'cmacro', 'obj'))
+    descroles = frozenset(('data', 'exc', 'func', 'class', 'const', 'attr', 'obj',
+                           'meth', 'cfunc', 'cmember', 'cdata', 'ctype', 'cmacro'))
 
     def resolve_references(self, doctree, fromdocname, builder):
         reftarget_roles = set(('token', 'term', 'option'))

Modified: doctools/trunk/sphinx/roles.py
==============================================================================
--- doctools/trunk/sphinx/roles.py	(original)
+++ doctools/trunk/sphinx/roles.py	Wed Sep 24 19:09:48 2008
@@ -212,6 +212,7 @@
     'meth': xfileref_role,
     'obj': xfileref_role,
     'cfunc' : xfileref_role,
+    'cmember': xfileref_role,
     'cdata' : xfileref_role,
     'ctype' : xfileref_role,
     'cmacro' : xfileref_role,