From b43bd7d335988b2e63a16dd1025ae40091cfbce6 Mon Sep 17 00:00:00 2001 From: hidaruma Date: Sun, 22 Dec 2019 17:41:26 +0900 Subject: [PATCH] mv lines about copying logo into copying images --- sphinx/builders/latex/__init__.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/sphinx/builders/latex/__init__.py b/sphinx/builders/latex/__init__.py index 926e44a03..5018e1f15 100644 --- a/sphinx/builders/latex/__init__.py +++ b/sphinx/builders/latex/__init__.py @@ -360,12 +360,6 @@ class LaTeXBuilder(Builder): copy_asset_file(path.join(staticdirname, 'Makefile_t'), self.outdir, context=context) - # the logo is handled differently - if self.config.latex_logo: - if not path.isfile(path.join(self.confdir, self.config.latex_logo)): - raise SphinxError(__('logo file %r does not exist') % self.config.latex_logo) - else: - copy_asset_file(path.join(self.confdir, self.config.latex_logo), self.outdir) @progress_message(__('copying additional files')) def copy_latex_additional_files(self) -> None: @@ -386,6 +380,11 @@ class LaTeXBuilder(Builder): except Exception as err: logger.warning(__('cannot copy image file %r: %s'), path.join(self.srcdir, src), err) + if self.config.latex_logo: + if not path.isfile(path.join(self.confdir, self.config.latex_logo)): + raise SphinxError(__('logo file %r does not exist') % self.config.latex_logo) + else: + copy_asset_file(path.join(self.confdir, self.config.latex_logo), self.outdir) def write_message_catalog(self) -> None: formats = self.config.numfig_format