[Zope-Checkins] CVS: Zope/lib/python/docutils/readers - __init__.py:1.2.10.1 pep.py:1.2.10.1 standalone.py:1.2.10.1

[Chris McDonough]

Update of /cvs-repository/Zope/lib/python/docutils/readers
In directory cvs.zope.org:/tmp/cvs-serv17213/lib/python/docutils/readers

Modified Files:
      Tag: Zope-2_7-branch
	__init__.py pep.py standalone.py 
Log Message:
Merge changes from HEAD since the release of Zope 2.7a1 into the Zope-2_7-branch in preparation for release of Zope 2.7b1.


=== Zope/lib/python/docutils/readers/__init__.py 1.2 => 1.2.10.1 ===


=== Zope/lib/python/docutils/readers/pep.py 1.2 => 1.2.10.1 ===
--- Zope/lib/python/docutils/readers/pep.py:1.2	Sat Feb  1 04:26:15 2003
+++ Zope/lib/python/docutils/readers/pep.py	Mon Jul 21 12:38:19 2003
@@ -11,10 +11,6 @@
 __docformat__ = 'reStructuredText'
 
 
-import sys
-import os
-import re
-from docutils import nodes
 from docutils.readers import standalone
 from docutils.transforms import peps, references
 from docutils.parsers import rst
@@ -23,7 +19,7 @@
 class Inliner(rst.states.Inliner):
 
     """
-    Extend `rst.Inliner` to for local PEP references.
+    Extend `rst.Inliner` for local PEP references.
     """
 
     pep_url = rst.states.Inliner.pep_url_local


=== Zope/lib/python/docutils/readers/standalone.py 1.2 => 1.2.10.1 ===
--- Zope/lib/python/docutils/readers/standalone.py:1.2	Sat Feb  1 04:26:15 2003
+++ Zope/lib/python/docutils/readers/standalone.py	Mon Jul 21 12:38:19 2003
@@ -25,6 +25,19 @@
     document = None
     """A single document tree."""
 
+    settings_spec = (
+        'Standalone Reader',
+        None,
+        (('Disable the promotion of a lone top-level section title to '
+          'document title (and subsequent section title to document '
+          'subtitle promotion; enabled by default).',
+          ['--no-doc-title'],
+          {'dest': 'doctitle_xform', 'action': 'store_false', 'default': 1}),
+         ('Disable the bibliographic field list transform (enabled by '
+          'default).',
+          ['--no-doc-info'],
+          {'dest': 'docinfo_xform', 'action': 'store_false', 'default': 1}),))
+
     default_transforms = (references.Substitutions,
                           frontmatter.DocTitle,
                           frontmatter.DocInfo,