IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merged in michaeljones/sphinx (pull request #3)

Browse Source
This commit is contained in:
Georg Brandl 2011-07-09 12:06:17 +02:00
commit c1084af66e
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sphinx/environment.py
View File

@ -1376,12 +1376,13 @@ class BuildEnvironment:
toplevel[1][:] = subtrees toplevel[1][:] = subtrees
# resolve all sub-toctrees # resolve all sub-toctrees
for toctreenode in toc.traverse(addnodes.toctree): for toctreenode in toc.traverse(addnodes.toctree):
i = toctreenode.parent.index(toctreenode) + 1 if not ( toctreenode.get('hidden', False) and not includehidden ):
for item in _entries_from_toctree(toctreenode, i = toctreenode.parent.index(toctreenode) + 1
subtree=True): for item in _entries_from_toctree(toctreenode,
toctreenode.parent.insert(i, item) subtree=True):
i += 1 toctreenode.parent.insert(i, item)
toctreenode.parent.remove(toctreenode) i += 1
toctreenode.parent.remove(toctreenode)
if separate: if separate:
entries.append(toc) entries.append(toc)
else: else:
@ -1740,3 +1741,4 @@ class BuildEnvironment:
if 'orphan' in self.metadata[docname]: if 'orphan' in self.metadata[docname]:
continue continue
self.warn(docname, 'document isn\'t included in any toctree') self.warn(docname, 'document isn\'t included in any toctree')