[Python-checkins] r67025 - in doctools/trunk: CHANGES doc/rest.rst sphinx/environment.py

[georg.brandl]

Author: georg.brandl
Date: Sat Oct 25 18:53:29 2008
New Revision: 67025

Log:
Don't disable alphabetical and roman lists anymore.


Modified:
   doctools/trunk/CHANGES
   doctools/trunk/doc/rest.rst
   doctools/trunk/sphinx/environment.py

Modified: doctools/trunk/CHANGES
==============================================================================
--- doctools/trunk/CHANGES	(original)
+++ doctools/trunk/CHANGES	Sat Oct 25 18:53:29 2008
@@ -25,6 +25,9 @@
 
   - Added ``cmember`` role for consistency.
 
+  - Lists enumerated by letters or roman numerals are now handled like in
+    standard reST.
+
 * HTML output and templates:
 
   - Incompatible change: The "root" relation link (top left in the

Modified: doctools/trunk/doc/rest.rst
==============================================================================
--- doctools/trunk/doc/rest.rst	(original)
+++ doctools/trunk/doc/rest.rst	Sat Oct 25 18:53:29 2008
@@ -67,12 +67,6 @@
    #. This is a numbered list.
    #. It has two items too.
 
-Note that Sphinx disables the use of enumerated lists introduced by alphabetic
-or roman numerals, such as ::
-
-   A. First item
-   B. Second item
-
 
 Nested lists are possible, but be aware that they must be separated from the
 parent list items by blank lines::

Modified: doctools/trunk/sphinx/environment.py
==============================================================================
--- doctools/trunk/sphinx/environment.py	(original)
+++ doctools/trunk/sphinx/environment.py	Sat Oct 25 18:53:29 2008
@@ -41,13 +41,6 @@
 from docutils.transforms import Transform
 from docutils.transforms.parts import ContentsFilter
 
-# monkey-patch reST parser to disable alphabetic and roman enumerated lists
-from docutils.parsers.rst.states import Body
-Body.enum.converters['loweralpha'] = \
-    Body.enum.converters['upperalpha'] = \
-    Body.enum.converters['lowerroman'] = \
-    Body.enum.converters['upperroman'] = lambda x: None
-
 from sphinx import addnodes
 from sphinx.util import get_matching_docs, SEP
 from sphinx.directives import additional_xref_types