Static templates: also support .jinja files

doc/development/theming.rst

@@ -248,11 +248,13 @@ so-called "static templates", like this:
 
 If the name of a file in the ``static/`` directory of a theme (or in the user's
 static path) ends with ``.jinja`` or ``_t``, it will be processed by the
-template engine.  The suffix will be removed from the final file name.  For
-example, the *classic* theme has a file ``static/classic.css.jinja`` which uses
-templating to put the color options into the stylesheet.  When a documentation
-project is built with the classic theme, the output directory will contain a
-``_static/classic.css`` file where all template tags have been processed.
+template engine.  The suffix will be removed from the final file name.
+
+For example, a theme with a ``static/theme_styles.css.jinja`` file could use
+templating to put options into the stylesheet.
+When a documentation project is built with that theme,
+the output directory will contain a ``_static/theme_styles.css`` file
+where all template tags have been processed.
 
 .. versionchanged:: 7.3
 

doc/latex.rst

@@ -1836,6 +1836,11 @@ Miscellany
    .. versionadded:: 1.6
       currently all template variables are unstable and undocumented.
 
+   .. versionchanged:: 7.4
+      Added support for the ``.jinja`` file extension, which is preferred.
+      The old file names remain supported.
+      (``latex.tex_t``, ``longtable.tex_t``, ``tabulary.tex_t``, and ``tabular.tex_t``)
+
 .. raw:: latex
 
    \endgroup

sphinx/builders/_epub_base.py

@@ -615,7 +615,7 @@ def build_content(self) -> None:
                                             html.escape(self.refnodes[0]['refuri'])))
 
         # write the project file
-        copy_asset_file(path.join(self.template_dir, 'content.opf_t'), self.outdir, metadata)  # NoQA: E501
+        copy_asset_file(path.join(self.template_dir, 'content.opf_t'), self.outdir, metadata)
 
     def new_navpoint(self, node: dict[str, Any], level: int, incr: bool = True) -> NavPoint:
         """Create a new entry in the toc from the node at given level."""

sphinx/builders/changes.py

@@ -140,7 +140,7 @@ def hl(no: int, line: str) -> str:
                 f.write(self.templates.render('changes/rstsource.html', ctx))
         themectx = {'theme_' + key: val for (key, val) in
                     self.theme.get_options({}).items()}
-        copy_asset_file(path.join(package_dir, 'themes', 'default', 'static', 'default.css_t'),  # NoQA: E501
+        copy_asset_file(path.join(package_dir, 'themes', 'default', 'static', 'default.css_t'),
                         self.outdir, context=themectx, renderer=self.templates)
         copy_asset_file(path.join(package_dir, 'themes', 'basic', 'static', 'basic.css'),
                         self.outdir)

sphinx/util/fileutil.py

@@ -23,7 +23,7 @@ def _template_basename(filename: str | os.PathLike[str]) -> str | None:
     basename = os.path.basename(filename)
     if basename.lower().endswith('_t'):
         return str(filename)[:-2]
-    elif basename.lower().endswith(".jinja"):
+    elif basename.endswith('.jinja'):
         return str(filename)[:-6]
     return None
 

tests/test_util/test_util_fileutil.py

@@ -104,10 +104,10 @@ def excluded(path):
 
 
 def test_template_basename():
-    assert not _template_basename("asset.txt")
-    assert _template_basename("asset.txt.jinja") == "asset.txt"
-    assert _template_basename("sidebar.html.jinja") == "sidebar.html"
+    assert _template_basename('asset.txt') is None
+    assert _template_basename('asset.txt.jinja') == 'asset.txt'
+    assert _template_basename('sidebar.html.jinja') == 'sidebar.html'
 
 
 def test_legacy_template_basename():
-    assert _template_basename("asset.txt_t") == "asset.txt"
+    assert _template_basename('asset.txt_t') == 'asset.txt'