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

Use default values for latex_documents, man_pages, and texinfo_documents if not set in conf.py.

Browse Source
This commit is contained in:
Jonathan Waltman 2013-01-07 01:29:53 -06:00
parent 0ef7a0a7a3
commit d1a666aef9
2 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGES
View File

@ -1,6 +1,12 @@
Release 1.2 (in development) Release 1.2 (in development)
============================ ============================
* The :confval:`latex_documents`, :confval:`texinfo_documents`, and
:confval:`man_pages` configuration values will be set to default values based
on the :confval:`master_doc` if not explicitly set in :file:`conf.py`.
Previously, if these values were not set, no output would be genereted by
their respective builders.
* PR#99: Strip down seealso directives to normal admonitions. This removes * PR#99: Strip down seealso directives to normal admonitions. This removes
their unusual CSS classes (admonition-see-also), inconsistent LaTeX their unusual CSS classes (admonition-see-also), inconsistent LaTeX
admonition title ("See Also" instead of "See also"), and spurious indentation admonition title ("See Also" instead of "See also"), and spurious indentation

21
sphinx/config.py
View File

@ -144,7 +144,11 @@ class Config(object):
epub_max_image_width = (0, 'env'), epub_max_image_width = (0, 'env'),
# LaTeX options # LaTeX options
latex_documents = ([], None), latex_documents = (lambda self: [(self.master_doc,
make_filename(self.project) + '.tex',
self.project,
'', 'manual')],
None),
latex_logo = (None, None), latex_logo = (None, None),
latex_appendices = ([], None), latex_appendices = ([], None),
latex_use_parts = (False, None), latex_use_parts = (False, None),
@ -167,11 +171,22 @@ class Config(object):
text_newlines = ('unix', 'env'), text_newlines = ('unix', 'env'),
# manpage options # manpage options
man_pages = ([], None), man_pages = (lambda self: [(self.master_doc,
make_filename(self.project).lower(),
'%s %s' % (self.project, self.release),
[], 1)],
None),
man_show_urls = (False, None), man_show_urls = (False, None),
# Texinfo options # Texinfo options
texinfo_documents = ([], None), texinfo_documents = (lambda self: [(self.master_doc,
make_filename(self.project).lower(),
self.project, '',
make_filename(self.project),
'The %s reference manual.' %
make_filename(self.project),
'Python')],
None),
texinfo_appendices = ([], None), texinfo_appendices = ([], None),
texinfo_elements = ({}, None), texinfo_elements = ({}, None),
texinfo_domain_indices = (True, None), texinfo_domain_indices = (True, None),