From d1a666aef9ba8f1c18722b20d635b632d00a25cd Mon Sep 17 00:00:00 2001 From: Jonathan Waltman Date: Mon, 7 Jan 2013 01:29:53 -0600 Subject: [PATCH] Use default values for latex_documents, man_pages, and texinfo_documents if not set in conf.py. --- CHANGES | 6 ++++++ sphinx/config.py | 21 ++++++++++++++++++--- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index d7ec12a3a..ad71b6cfe 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,12 @@ 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 their unusual CSS classes (admonition-see-also), inconsistent LaTeX admonition title ("See Also" instead of "See also"), and spurious indentation diff --git a/sphinx/config.py b/sphinx/config.py index b91bd0b11..45105f26f 100644 --- a/sphinx/config.py +++ b/sphinx/config.py @@ -144,7 +144,11 @@ class Config(object): epub_max_image_width = (0, 'env'), # 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_appendices = ([], None), latex_use_parts = (False, None), @@ -167,11 +171,22 @@ class Config(object): text_newlines = ('unix', 'env'), # 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), # 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_elements = ({}, None), texinfo_domain_indices = (True, None),