Author: georg.brandl Date: Sun Jun 22 21:37:40 2008 New Revision: 64469 Log: Add changelog entry and fix feature.^ Modified: doctools/trunk/CHANGES doctools/trunk/sphinx/builder.py Modified: doctools/trunk/CHANGES ============================================================================== --- doctools/trunk/CHANGES (original) +++ doctools/trunk/CHANGES Sun Jun 22 21:37:40 2008 @@ -48,6 +48,9 @@ - The directories in the `html_static_path` can now contain subdirectories. + - The module index now isn't collapsed if the number of submodules + is larger than the number of toplevel modules. + * The image directive now supports specifying the extension as ``.*``, which makes the builder select the one that matches best. Thanks to Sebastian Wiesner. Modified: doctools/trunk/sphinx/builder.py ============================================================================== --- doctools/trunk/sphinx/builder.py (original) +++ doctools/trunk/sphinx/builder.py Sun Jun 22 21:37:40 2008 @@ -535,13 +535,13 @@ # apply heuristics when to collapse modindex at page load: # only collapse if number of toplevel modules is larger than # number of submodules - collapse = len(modules) - num_toplevels > num_toplevels + collapse = len(modules) - num_toplevels < num_toplevels modindexcontext = dict( modindexentries = modindexentries, platforms = platforms, letters = letters, - collapse = collapse, + collapse_modindex = collapse, ) self.info(' modindex', nonl=1) self.handle_page('modindex', modindexcontext, 'modindex.html')