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

Observe the deprecated *_use_modindex config values.

Browse Source
This commit is contained in:
Georg Brandl 2010-02-20 14:28:58 +01:00
parent ed6562960c
commit 1b5fbd6fa1
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sphinx/builders/html.py
View File

@ -241,6 +241,10 @@ class StandaloneHTMLBuilder(Builder):
if isinstance(indices_config, list): if isinstance(indices_config, list):
if indexname not in indices_config: if indexname not in indices_config:
continue continue
# deprecated config value
if indexname == 'py-modindex' and \
not self.config.html_use_modindex:
continue
if domain.has_index_entries(indexinfo[0]): if domain.has_index_entries(indexinfo[0]):
self.domain_indices.append((domain.name,) + indexinfo) self.domain_indices.append((domain.name,) + indexinfo)

6
sphinx/writers/latex.py
View File

@ -268,7 +268,7 @@ class LaTeXTranslator(nodes.NodeVisitor):
if entry[4]: if entry[4]:
# add "extra" info # add "extra" info
ret.append(' \\emph{(%s)}' % self.encode(entry[4])) ret.append(' \\emph{(%s)}' % self.encode(entry[4]))
ret.append(', \\pageref{%s}' % self.idescape(entry[3])) ret.append(', \\pageref{%s}\n' % self.idescape(entry[3]))
ret.append('\\end{theindex}\n') ret.append('\\end{theindex}\n')
ret = [] ret = []
@ -281,6 +281,10 @@ class LaTeXTranslator(nodes.NodeVisitor):
if isinstance(indices_config, list): if isinstance(indices_config, list):
if indexname not in indices_config: if indexname not in indices_config:
continue continue
# deprecated config value
if indexname == 'py-modindex' and \
not self.builder.config.latex_use_modindex:
continue
if not domain.has_index_entries(indexinfo[0], if not domain.has_index_entries(indexinfo[0],
self.builder.docnames): self.builder.docnames):
continue continue