add .j2 extension

nbconvert/exporters/latex.py

@@ -32,17 +32,10 @@ def _file_extension_default(self):
     def _template_data_paths_default(self):
         return jupyter_path("nbconvert", "templates", "latex")
 
-    @default('template_extension')
-    def _template_extension_default(self):
-        return '.tex'
-
     @default('template_name')
     def _template_name_default(self):
         return 'latex'
 
-    #Extension that the template files use.
-    template_extension = Unicode(".tex").tag(config=True)
-
     output_mimetype = 'text/latex'
 
     def default_filters(self):

nbconvert/exporters/pdf.py

@@ -73,6 +73,11 @@ class PDFExporter(LatexExporter):
     def _file_extension_default(self):
         return '.pdf'
 
+
+    @default('template_extension')
+    def _template_extension_default(self):
+        return '.tex.j2'
+
     def run_command(self, command_list, filename, count, log_function, raise_on_failure=None):
         """Run command_list count times.
 

nbconvert/exporters/slides.py

@@ -170,7 +170,7 @@ def _file_extension_default(self):
 
     @default('template_extension')
     def _template_extension_default(self):
-        return '.html'
+        return '.html.j2'
 
     output_mimetype = 'text/html'
 

nbconvert/exporters/templateexporter.py

@@ -220,7 +220,10 @@ def _raw_template_changed(self, change):
     template_extension = Unicode(".tpl").tag(config=True, affects_environment=True)
     @default('template_extension')
     def _template_extension_default(self):
-        return self.file_extension
+        if self.file_extension:
+            return self.file_extension + ".j2"
+        else:
+            return self.file_extension
 
     @default('template_file')
     def _template_file_default(self):

nbconvert/exporters/tests/test_latex.py

@@ -116,7 +116,7 @@ def test_prompt_number_color_ipython(self):
         """
         my_loader_tplx = DictLoader({'my_template': 
             """
-            ((* extends 'style_ipython.tex' *))
+            ((* extends 'style_ipython.tex.j2' *))
 
             ((* block docclass *))
             \documentclass[11pt]{article}

nbconvert/exporters/tests/test_templateexporter.py

@@ -22,7 +22,7 @@
 
 import pytest
 
-raw_template = """{%- extends 'index.rst' -%}
+raw_template = """{%- extends 'index.rst.j2' -%}
 {%- block in_prompt -%}
 blah
 {%- endblock in_prompt -%}
@@ -163,7 +163,7 @@ def __init__(self, *args, **kwargs):
         output_init, _ = exporter_init.from_notebook_node(nb)
         assert "blah" in output_init
         exporter_init.raw_template = ''
-        assert exporter_init.template_file == "index.rst"
+        assert exporter_init.template_file == "index.rst.j2"
         output_init, _ = exporter_init.from_notebook_node(nb)
         assert "blah" not in output_init
 
@@ -180,7 +180,7 @@ def test_raw_template_dynamic_attr(self):
         class AttrDynamicExporter(TemplateExporter):
             @default('default_template_file')
             def _template_file_default(self):
-                return "index.rst"
+                return "index.rst.j2"
 
             @default('raw_template')
             def _raw_template_default(self):
@@ -190,7 +190,7 @@ def _raw_template_default(self):
         output_attr_dynamic, _ = exporter_attr_dynamic.from_notebook_node(nb)
         assert "blah" in output_attr_dynamic
         exporter_attr_dynamic.raw_template = ''
-        assert exporter_attr_dynamic.template_file == "index.rst"
+        assert exporter_attr_dynamic.template_file == "index.rst.j2"
         output_attr_dynamic, _ = exporter_attr_dynamic.from_notebook_node(nb)
         assert "blah" not in output_attr_dynamic
 
@@ -211,13 +211,13 @@ def _raw_template_default(self):
 
             @default('default_template_file')
             def _template_file_default(self):
-                return 'index.rst'
+                return 'index.rst.j2'
 
         exporter_attr_dynamic = AttrDynamicExporter(template_name='rst')
         output_attr_dynamic, _ = exporter_attr_dynamic.from_notebook_node(nb)
         assert "blah" in output_attr_dynamic
         exporter_attr_dynamic.raw_template = ''
-        assert exporter_attr_dynamic.template_file == 'index.rst'
+        assert exporter_attr_dynamic.template_file == 'index.rst.j2'
         output_attr_dynamic, _ = exporter_attr_dynamic.from_notebook_node(nb)
         assert "blah" not in output_attr_dynamic
 
@@ -270,7 +270,7 @@ def test_raw_template_deassignment(self):
         output_deassign, _ = exporter_deassign.from_notebook_node(nb)
         assert "blah" in output_deassign
         exporter_deassign.raw_template = ''
-        assert exporter_deassign.template_file == 'index.rst'
+        assert exporter_deassign.template_file == 'index.rst.j2'
         output_deassign, _ = exporter_deassign.from_notebook_node(nb)
         assert "blah" not in output_deassign
 
@@ -289,7 +289,7 @@ def test_raw_template_dereassignment(self):
         output_dereassign, _ = exporter_dereassign.from_notebook_node(nb)
         assert "baz" in output_dereassign
         exporter_dereassign.raw_template = ''
-        assert exporter_dereassign.template_file == 'index.rst'
+        assert exporter_dereassign.template_file == 'index.rst.j2'
         output_dereassign, _ = exporter_dereassign.from_notebook_node(nb)
         assert "blah" not in output_dereassign
 
@@ -318,7 +318,7 @@ def test_exclude_code_cell(self):
         }
         c_no_io = Config(no_io)
         exporter_no_io = TemplateExporter(config=c_no_io, template_name='markdown')
-        exporter_no_io.template_file = 'index.md'
+        exporter_no_io.template_file = 'index.md.j2'
         nb_no_io, resources_no_io = exporter_no_io.from_filename(self._get_notebook())
 
         assert not resources_no_io['global_content_filter']['include_input']
@@ -336,7 +336,7 @@ def test_exclude_code_cell(self):
         }
         c_no_code = Config(no_code)
         exporter_no_code = TemplateExporter(config=c_no_code, template_name='markdown')
-        exporter_no_code.template_file = 'index.md'
+        exporter_no_code.template_file = 'index.md.j2'
         nb_no_code, resources_no_code = exporter_no_code.from_filename(self._get_notebook())
 
         assert not resources_no_code['global_content_filter']['include_code']
@@ -376,7 +376,7 @@ def test_exclude_markdown(self):
 
         c_no_md = Config(no_md)
         exporter_no_md = TemplateExporter(config=c_no_md, template_name='python')
-        exporter_no_md.template_file = 'index.py'
+        exporter_no_md.template_file = 'index.py.j2'
         nb_no_md, resources_no_md = exporter_no_md.from_filename(self._get_notebook())
 
         assert not resources_no_md['global_content_filter']['include_markdown']
@@ -424,5 +424,5 @@ def _make_exporter(self, config=None):
         if not exporter.template_file:
             # give it a default if not specified
             exporter.template_name = 'python'
-            exporter.template_file = 'index.py'
+            exporter.template_file = 'index.py.j2'
         return exporter

nbconvert/tests/fake_exporters.py

@@ -22,4 +22,4 @@ def _file_extension_default(self):
 
     @default('template_extension')
     def _template_extension_default(self):
-        return '.html'
+        return '.html.j2'

share/jupyter/nbconvert/templates/classic/index.html → share/jupyter/nbconvert/templates/classic/index.html.j2

@@ -1,5 +1,5 @@
-{%- extends 'base.html' -%}
-{% from 'mathjax.html' import mathjax %}
+{%- extends 'base.html.j2' -%}
+{% from 'mathjax.html.j2' import mathjax %}
 
 
 {%- block header -%}

share/jupyter/nbconvert/templates/lab/index.html → share/jupyter/nbconvert/templates/lab/index.html.j2

@@ -1,5 +1,4 @@
-{%- extends 'classic/index.html' -%}
-
+{%- extends 'classic/index.html.j2' -%}
 
 {%- block html_head_css -%}
 {{ resources.include_css("static/index.css") }}

share/jupyter/nbconvert/templates/latex/base.tex → share/jupyter/nbconvert/templates/latex/base.tex.j2

@@ -4,7 +4,7 @@
 This template defines defines a default docclass, the inheriting class should
 override this.-=))
 
-((*- extends 'document_contents.tex' -*))
+((*- extends 'document_contents.tex.j2' -*))
 
 %===============================================================================
 % Abstract overrides

share/jupyter/nbconvert/templates/latex/index.tex → share/jupyter/nbconvert/templates/latex/index.tex.j2

@@ -1,7 +1,7 @@
 
 ((=- Default to the notebook output style -=))
 ((*- if not cell_style is defined -*))
-    ((* set cell_style = 'style_jupyter.tex' *))
+    ((* set cell_style = 'style_jupyter.tex.j2' *))
 ((*- endif -*))
 
 ((=- Inherit from the specified cell style. -=))

share/jupyter/nbconvert/templates/latex/report.tex → share/jupyter/nbconvert/templates/latex/report.tex.j2

@@ -1,7 +1,7 @@
 
 % Default to the notebook output style
 ((* if not cell_style is defined *))
-    ((* set cell_style = 'style_ipython.tex' *))
+    ((* set cell_style = 'style_ipython.tex.j2' *))
 ((* endif *))
 
 % Inherit from the specified cell style.

share/jupyter/nbconvert/templates/latex/style_bw_ipython.tex → share/jupyter/nbconvert/templates/latex/style_bw_ipython.tex.j2

@@ -1,6 +1,6 @@
 ((= Black&white ipython input/output style =))
 
-((*- extends 'base.tex' -*))
+((*- extends 'base.tex.j2' -*))
 
 %===============================================================================
 % Input

share/jupyter/nbconvert/templates/latex/style_bw_python.tex → share/jupyter/nbconvert/templates/latex/style_bw_python.tex.j2

@@ -1,6 +1,6 @@
 ((= Black&white Python input/output style =))
 
-((*- extends 'base.tex' -*))
+((*- extends 'base.tex.j2' -*))
 
 %===============================================================================
 % Input

share/jupyter/nbconvert/templates/latex/style_ipython.tex → share/jupyter/nbconvert/templates/latex/style_ipython.tex.j2

@@ -1,6 +1,6 @@
-((= IPython input/output style =))
+ style_bw_python.\TeX((= IPython input/output style =))
 
-((*- extends 'base.tex' -*))
+((*- extends 'base.tex.j2' -*))
 
 % Custom definitions
 ((* block definitions *))

share/jupyter/nbconvert/templates/latex/style_jupyter.tex → share/jupyter/nbconvert/templates/latex/style_jupyter.tex.j2

@@ -1,5 +1,5 @@
 ((=- IPython input/output style -=))
-((*- extends 'base.tex' -*))
+((*- extends 'base.tex.j2' -*))
 
 ((*- block packages -*))
     \usepackage[breakable]{tcolorbox}

share/jupyter/nbconvert/templates/latex/style_python.tex → share/jupyter/nbconvert/templates/latex/style_python.tex.j2

@@ -1,6 +1,6 @@
 ((= Python input/output style =))
 
-((*- extends 'base.tex' -*))
+((*- extends 'base.tex.j2' -*))
 
 % Custom definitions
 ((* block definitions *))

share/jupyter/nbconvert/templates/reveal/index.html → share/jupyter/nbconvert/templates/reveal/index.html.j2

@@ -1,5 +1,5 @@
-{%- extends 'classic/index.html' -%}
-{% from 'mathjax.html' import mathjax %}
+{%- extends 'classic/index.html.j2' -%}
+{% from 'mathjax.html.j2' import mathjax %}
 
 {%- block any_cell scoped -%}
 {%- if cell.metadata.get('slide_start', False) -%}