Skip to content

Commit ad9f5fa

Browse files
committed
Backwards compatibility: retain the existing template name interface for LaTeXWriter.render.
1 parent 3c374e5 commit ad9f5fa

File tree

1 file changed

+11
-8
lines changed

1 file changed

+11
-8
lines changed

sphinx/writers/latex.py

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,7 @@ def astext(self) -> str:
437437
'body': ''.join(self.body),
438438
'indices': self.generate_indices(),
439439
})
440-
return self.render('latex.tex', self.elements)
440+
return self.render('latex.tex.jinja', self.elements)
441441

442442
def hypertarget(self, id: str, withdoc: bool = True, anchor: bool = True) -> str:
443443
if withdoc:
@@ -517,13 +517,16 @@ def generate(content: list[tuple[str, list[IndexEntry]]], collapsed: bool) -> No
517517
def render(self, template_name: str, variables: dict[str, Any]) -> str:
518518
renderer = LaTeXRenderer(latex_engine=self.config.latex_engine)
519519
for template_dir in self.config.templates_path:
520-
for template_suffix in ('_t', '.jinja'):
521-
template = path.join(self.builder.confdir, template_dir,
522-
template_name + template_suffix)
523-
if path.exists(template):
524-
return renderer.render(template, variables)
520+
template = path.join(self.builder.confdir, template_dir,
521+
template_name)
522+
if path.exists(template):
523+
return renderer.render(template, variables)
524+
elif template_name.endswith('.jinja'):
525+
legacy_template = template[:-len('.jinja')] + '_t'
526+
if path.exists(legacy_template):
527+
return renderer.render(legacy_template, variables)
525528

526-
return renderer.render(template_name + '.jinja', variables)
529+
return renderer.render(template_name, variables)
527530

528531
@property
529532
def table(self) -> Table | None:
@@ -1034,7 +1037,7 @@ def depart_table(self, node: Element) -> None:
10341037
assert self.table is not None
10351038
labels = self.hypertarget_to(node)
10361039
table_type = self.table.get_table_type()
1037-
table = self.render(table_type + '.tex',
1040+
table = self.render(table_type + '.tex.jinja',
10381041
{'table': self.table, 'labels': labels})
10391042
self.body.append(BLANKLINE)
10401043
self.body.append(table)

0 commit comments

Comments
 (0)