Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Let LaTeX build always overwrite destination when copying assets #12668

Merged
merged 2 commits into from
Jul 23, 2024
+34 −9
Merged

Let LaTeX build always overwrite destination when copying assets #12668

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bc4b10a
Let LaTeX build always overwrite destination when copying assets
jfbu Jul 23, 2024
efa2f70
formatting
AA-Turner Jul 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 34 additions & 9 deletions sphinx/builders/latex/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,20 +411,32 @@ def copy_support_files(self) -> None:
staticdirname = path.join(package_dir, 'texinputs')
for filename in os.listdir(staticdirname):
if not filename.startswith('.'):
copy_asset_file(path.join(staticdirname, filename),
self.outdir, context=context)
copy_asset_file(
path.join(staticdirname, filename),
self.outdir,
context=context,
force=True,
)

# use pre-1.6.x Makefile for make latexpdf on Windows
if os.name == 'nt':
staticdirname = path.join(package_dir, 'texinputs_win')
copy_asset_file(path.join(staticdirname, 'Makefile.jinja'),
self.outdir, context=context)
copy_asset_file(
path.join(staticdirname, 'Makefile.jinja'),
self.outdir,
context=context,
force=True,
)

@progress_message(__('copying additional files'))
def copy_latex_additional_files(self) -> None:
for filename in self.config.latex_additional_files:
logger.info(' ' + filename, nonl=True)
copy_asset_file(path.join(self.confdir, filename), self.outdir)
copy_asset_file(
self.confdir / filename,
self.outdir,
force=True,
)

def copy_image_files(self) -> None:
if self.images:
Expand All @@ -434,15 +446,22 @@ def copy_image_files(self) -> None:
stringify_func=stringify_func):
dest = self.images[src]
try:
copy_asset_file(path.join(self.srcdir, src),
path.join(self.outdir, dest))
copy_asset_file(
self.srcdir / src,
self.outdir / dest,
force=True,
)
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)
copy_asset_file(path.join(self.confdir, self.config.latex_logo), self.outdir)
copy_asset_file(
self.confdir / self.config.latex_logo,
self.outdir,
force=True,
)

def write_message_catalog(self) -> None:
formats = self.config.numfig_format
Expand All @@ -457,7 +476,13 @@ def write_message_catalog(self) -> None:
context['addtocaptions'] = r'\addto\captions%s' % self.babel.get_language()

filename = path.join(package_dir, 'templates', 'latex', 'sphinxmessages.sty.jinja')
copy_asset_file(filename, self.outdir, context=context, renderer=LaTeXRenderer())
copy_asset_file(
filename,
self.outdir,
context=context,
renderer=LaTeXRenderer(),
force=True,
)


def validate_config_values(app: Sphinx, config: Config) -> None:
Expand Down