Revert "change-isolation: undo modifications to LaTeX, imgmath writer template detection and rendering"

This reverts commit 2a5a9a0.

Conflicts:
	sphinx/ext/imgmath.py
	sphinx/writers/latex.py

Author: jayaddison

sphinx/ext/imgmath.py

@@ -103,14 +103,15 @@ def generate_latex_macro(image_format: str,
     }
 
     if config.imgmath_use_preview:
-        template_name = 'preview.tex_t'
+        template_name = 'preview.tex'
     else:
-        template_name = 'template.tex_t'
+        template_name = 'template.tex'
 
     for template_dir in config.templates_path:
-        template = path.join(confdir, template_dir, template_name)
-        if path.exists(template):
-            return LaTeXRenderer().render(template, variables)
+        for template_suffix in ('_t', '.jinja'):
+            template = path.join(confdir, template_dir, template_name + template_suffix)
+            if path.exists(template):
+                return LaTeXRenderer().render(template, variables)
 
     return LaTeXRenderer(templates_path).render(template_name + '.jinja', variables)
 

sphinx/writers/latex.py

@@ -437,7 +437,7 @@ def astext(self) -> str:
             'body': ''.join(self.body),
             'indices': self.generate_indices(),
         })
-        return self.render('latex.tex_t', self.elements)
+        return self.render('latex.tex', self.elements)
 
     def hypertarget(self, id: str, withdoc: bool = True, anchor: bool = True) -> str:
         if withdoc:
@@ -517,10 +517,11 @@ def generate(content: list[tuple[str, list[IndexEntry]]], collapsed: bool) -> No
     def render(self, template_name: str, variables: dict[str, Any]) -> str:
         renderer = LaTeXRenderer(latex_engine=self.config.latex_engine)
         for template_dir in self.config.templates_path:
-            template = path.join(self.builder.confdir, template_dir,
-                                 template_name)
-            if path.exists(template):
-                return renderer.render(template, variables)
+            for template_suffix in ('_t', '.jinja'):
+                template = path.join(self.builder.confdir, template_dir,
+                                     template_name + template_suffix)
+                if path.exists(template):
+                    return renderer.render(template, variables)
 
         return renderer.render(template_name + '.jinja', variables)
 
@@ -1033,7 +1034,7 @@ def depart_table(self, node: Element) -> None:
         assert self.table is not None
         labels = self.hypertarget_to(node)
         table_type = self.table.get_table_type()
-        table = self.render(table_type + '.tex_t',
+        table = self.render(table_type + '.tex',
                             {'table': self.table, 'labels': labels})
         self.body.append(BLANKLINE)
         self.body.append(table)