[Python-checkins] r64732 - in doctools/trunk: doc/concepts.rst sphinx/directives/desc.py sphinx/static/searchtools.js sphinx/texinputs/howto.cls sphinx/texinputs/manual.cls

Sat Jul 5 16:48:10 CEST 2008

Author: georg.brandl
Date: Sat Jul 5 16:48:10 2008
New Revision: 64732
Log:
Merged revisions 64725-64726,64730 via svnmerge from 
svn+ssh://pythondev@svn.python.org/doctools/branches/0.4.x
........
 r64725 | georg.brandl | 2008年07月05日 12:31:43 +0200 (2008年7月05日) | 2 lines
 
 Add note about :maxdepth: in toctrees and latex.
........
 r64726 | georg.brandl | 2008年07月05日 12:55:07 +0200 (2008年7月05日) | 2 lines
 
 Add object names for e.g. :ivar:.
........
 r64730 | georg.brandl | 2008年07月05日 16:34:35 +0200 (2008年7月05日) | 2 lines
 
 Fix another IE problem.
........
Modified:
 doctools/trunk/ (props changed)
 doctools/trunk/doc/concepts.rst
 doctools/trunk/sphinx/directives/desc.py
 doctools/trunk/sphinx/static/searchtools.js
 doctools/trunk/sphinx/texinputs/howto.cls
 doctools/trunk/sphinx/texinputs/manual.cls
Modified: doctools/trunk/doc/concepts.rst
==============================================================================

--- doctools/trunk/doc/concepts.rst	(original)
+++ doctools/trunk/doc/concepts.rst	Sat Jul 5 16:48:10 2008
@@ -33,7 +33,7 @@
 individual TOCs (including "sub-TOC trees") of the documents given in the
 directive body (whose path is relative to the document the directive occurs
 in). A numeric ``maxdepth`` option may be given to indicate the depth of the
- tree; by default, all levels are included.
+ tree; by default, all levels are included. [#]_
 
 Consider this example (taken from the Python docs' library reference index)::
 
@@ -132,6 +132,12 @@
 
 .. rubric:: Footnotes
 
+.. [#] The ``maxdepth`` option does not apply to the LaTeX writer, where the
+ whole table of contents will always be presented at the begin of the
+ document, and its depth is controlled by the ``tocdepth`` counter, which
+ you can reset in your :confval:`latex_preamble` config value using
+ e.g. ``\setcounter{tocdepth}{2}``.
+
 .. [#] A note on available globbing syntax: you can use the standard shell
 constructs ``*``, ``?``, ``[...]`` and ``[!...]`` with the feature that
 these all don't match slashes. A double star ``**`` can be used to match
Modified: doctools/trunk/sphinx/directives/desc.py
==============================================================================
--- doctools/trunk/sphinx/directives/desc.py	(original)
+++ doctools/trunk/sphinx/directives/desc.py	Sat Jul 5 16:48:10 2008
@@ -151,8 +151,9 @@
 elif typ == 'type':
 param_types[obj] = fbody.astext()
 else:
+ fieldname = typ + ' ' + obj
 nfield = nodes.field()
- nfield += nodes.field_name(typ, typ)
+ nfield += nodes.field_name(fieldname, fieldname)
 nfield += nodes.field_body()
 nfield[1] += fbody.children
 new_list += nfield
Modified: doctools/trunk/sphinx/static/searchtools.js
==============================================================================
--- doctools/trunk/sphinx/static/searchtools.js	(original)
+++ doctools/trunk/sphinx/static/searchtools.js	Sat Jul 5 16:48:10 2008
@@ -393,7 +393,7 @@
 }
 displayNextItem();
 });
- },
+ }
 
 }
 
Modified: doctools/trunk/sphinx/texinputs/howto.cls
==============================================================================
--- doctools/trunk/sphinx/texinputs/howto.cls	(original)
+++ doctools/trunk/sphinx/texinputs/howto.cls	Sat Jul 5 16:48:10 2008
@@ -14,7 +14,7 @@
 
 
 % Set some sane defaults for section numbering depth and TOC depth. You can
-% reset these counter in your preamble.
+% reset these counters in your preamble.
 %
 \setcounter{secnumdepth}{2}
 
Modified: doctools/trunk/sphinx/texinputs/manual.cls
==============================================================================
--- doctools/trunk/sphinx/texinputs/manual.cls	(original)
+++ doctools/trunk/sphinx/texinputs/manual.cls	Sat Jul 5 16:48:10 2008
@@ -14,7 +14,7 @@
 
 
 % Set some sane defaults for section numbering depth and TOC depth. You can
-% reset these counter in your preamble.
+% reset these counters in your preamble.
 %
 \setcounter{secnumdepth}{2}
 \setcounter{tocdepth}{1}
