From a224df9deae81aac5528fae4391b511e63a54b9f Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sat, 12 Nov 2011 13:02:44 +0530 Subject: [PATCH] Update manual geenration code for sphinx 1.1 --- src/calibre/manual/conf.py | 2 +- src/calibre/manual/custom.py | 2 +- src/calibre/manual/epub.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/calibre/manual/conf.py b/src/calibre/manual/conf.py index 02ab3fede9..b0f2cd4365 100644 --- a/src/calibre/manual/conf.py +++ b/src/calibre/manual/conf.py @@ -114,7 +114,7 @@ html_short_title = 'Start' html_logo = 'resources/logo.png' epub_author = 'Kovid Goyal' -epub_cover = 'epub_cover.jpg' +kovid_epub_cover = 'epub_cover.jpg' epub_publisher = 'Kovid Goyal' epub_identifier = 'http://manual.calibre-ebook.com' epub_scheme = 'url' diff --git a/src/calibre/manual/custom.py b/src/calibre/manual/custom.py index 4788889972..390b5aa931 100644 --- a/src/calibre/manual/custom.py +++ b/src/calibre/manual/custom.py @@ -251,7 +251,7 @@ def template_docs(app): update_cli_doc('template_ref.rst', raw, info) def setup(app): - app.add_config_value('epub_cover', None, False) + app.add_config_value('kovid_epub_cover', None, False) app.add_builder(EPUBHelpBuilder) app.connect('doctree-read', substitute) app.connect('builder-inited', generate_docs) diff --git a/src/calibre/manual/epub.py b/src/calibre/manual/epub.py index 1aadbe9f91..5a20aea530 100644 --- a/src/calibre/manual/epub.py +++ b/src/calibre/manual/epub.py @@ -55,8 +55,8 @@ class EPUBHelpBuilder(EpubBuilder): open(opf, 'wb').write(raw) def build_epub(self, outdir, *args, **kwargs): - if self.config.epub_cover: - self.add_cover(outdir, self.config.epub_cover) + if self.config.kovid_epub_cover: + self.add_cover(outdir, self.config.kovid_epub_cover) self.fix_duplication_bugs(outdir) EpubBuilder.build_epub(self, outdir, *args, **kwargs)