renaming: .tplx->.tex .tpl->.j2, article.tex->index.tex

jupyter · Aug 20, 2019 · cc487ef · cc487ef
1 parent ba2d46f
commit cc487ef
Show file tree

Hide file tree

Showing 23 changed files with 33 additions and 51 deletions.
diff --git a/nbconvert/exporters/script.py b/nbconvert/exporters/script.py
@@ -18,7 +18,7 @@ class ScriptExporter(TemplateExporter):
 
     @default('template_file')
     def _template_file_default(self):
-        return 'script.tpl'
+        return 'script.j2'
 
     @default('template_name')
     def _template_name_default(self):

diff --git a/nbconvert/exporters/tests/test_latex.py b/nbconvert/exporters/tests/test_latex.py
@@ -53,23 +53,6 @@ def test_export_book(self):
         assert len(output) > 0
 
 
-    @onlyif_cmds_exist('pandoc')
-    def test_export_basic(self):
-        """
-        Can a LatexExporter export using 'article' template?
-        """
-        (output, resources) = LatexExporter(template_file='article').from_filename(self._get_notebook())
-        assert len(output) > 0
-
-
-    @onlyif_cmds_exist('pandoc')
-    def test_export_article(self):
-        """
-        Can a LatexExporter export using 'article' template?
-        """
-        (output, resources) = LatexExporter(template_file='article').from_filename(self._get_notebook())
-        assert len(output) > 0
-
     @onlyif_cmds_exist('pandoc')
     def test_very_long_cells(self):
         """
@@ -104,7 +87,7 @@ def test_very_long_cells(self):
             with open(nbfile, 'w') as f:
                 write(nb, f, 4)
 
-            (output, resources) = LatexExporter(template_file='article').from_filename(nbfile)
+            (output, resources) = LatexExporter().from_filename(nbfile)
             assert len(output) > 0
 
     @onlyif_cmds_exist('pandoc')
@@ -133,7 +116,7 @@ def test_prompt_number_color_ipython(self):
         """
         my_loader_tplx = DictLoader({'my_template': 
             """
-            ((* extends 'style_ipython.tplx' *))
+            ((* extends 'style_ipython.tex' *))
 
             ((* block docclass *))
             \documentclass[11pt]{article}
@@ -184,7 +167,7 @@ def test_in_memory_template_tplx(self):
         # Loads in an in memory latex template (.tplx) using jinja2.DictLoader
         # creates a class that uses this template with the template_file argument
         # converts an empty notebook using this mechanism
-        my_loader_tplx = DictLoader({'my_template': "{%- extends 'article' -%}"})
+        my_loader_tplx = DictLoader({'my_template': "{%- extends 'index' -%}"})
 
         class MyExporter(LatexExporter):
             template_file = 'my_template'

diff --git a/share/jupyter/nbconvert/templates/asciidoc/index.asciidoc b/share/jupyter/nbconvert/templates/asciidoc/index.asciidoc
@@ -1,4 +1,4 @@
-{% extends 'display_priority.tpl' %}
+{% extends 'display_priority.j2' %}
 
 
 {% block input %}

diff --git a/share/jupyter/nbconvert/templates/base/base.html b/share/jupyter/nbconvert/templates/base/base.html
@@ -1,4 +1,4 @@
-{%- extends 'display_priority.tpl' -%}
+{%- extends 'display_priority.j2' -%}
 
 
 {% block codecell %}

diff --git a/...nvert/templates/base/display_priority.tpl → ...onvert/templates/base/display_priority.j2 b/...nvert/templates/base/display_priority.tpl → ...onvert/templates/base/display_priority.j2
@@ -1,4 +1,4 @@
-{%- extends 'null.tpl' -%}
+{%- extends 'null.j2' -%}
 
 {#display data priority#}
 

diff --git a/...jupyter/nbconvert/templates/base/null.tpl → .../jupyter/nbconvert/templates/base/null.j2 b/...jupyter/nbconvert/templates/base/null.tpl → .../jupyter/nbconvert/templates/base/null.j2
diff --git a/share/jupyter/nbconvert/templates/lab/base.html b/share/jupyter/nbconvert/templates/lab/base.html
@@ -1,4 +1,4 @@
-{%- extends 'display_priority.tpl' -%}
+{%- extends 'display_priority.j2' -%}
 
 {% block codecell %}
 {%- if not cell.outputs -%}

diff --git a/share/jupyter/nbconvert/templates/latex/article.tex b/share/jupyter/nbconvert/templates/latex/article.tex
diff --git a/share/jupyter/nbconvert/templates/latex/base.tex b/share/jupyter/nbconvert/templates/latex/base.tex
@@ -3,7 +3,7 @@
 functions.  Figures, data_text,
 This template does not define a docclass, the inheriting class must define this.=))
 
-((*- extends 'document_contents.tplx' -*))
+((*- extends 'document_contents.tex' -*))
 
 %===============================================================================
 % Abstract overrides

diff --git a/...ert/templates/latex/display_priority.tplx → ...nvert/templates/latex/display_priority.j2 b/...ert/templates/latex/display_priority.tplx → ...nvert/templates/latex/display_priority.j2
@@ -2,7 +2,7 @@
     To edit this file, please refer to ../../skeleton/README.md =))
 
 
-((*- extends 'null.tplx' -*))
+((*- extends 'null.j2' -*))
 
 ((=display data priority=))
 

diff --git a/...rt/templates/latex/document_contents.tplx → ...ert/templates/latex/document_contents.tex b/...rt/templates/latex/document_contents.tplx → ...ert/templates/latex/document_contents.tex
@@ -1,4 +1,4 @@
-((*- extends 'display_priority.tplx' -*))
+((*- extends 'display_priority.j2' -*))
 
 %===============================================================================
 % Support blocks

diff --git a/share/jupyter/nbconvert/templates/latex/index.tex b/share/jupyter/nbconvert/templates/latex/index.tex
@@ -1 +1,17 @@
-((* extends 'article.tex' *))
+
+((=- Default to the notebook output style -=))
+((* if not cell_style is defined *))
+    ((* set cell_style = 'style_jupyter.tex' *))
+((* endif *))
+
+((=- Inherit from the specified cell style. -=))
+((* extends cell_style *))
+
+
+%===============================================================================
+% Latex Article
+%===============================================================================
+
+((* block docclass *))
+\documentclass[11pt]{article}
+((* endblock docclass *))
diff --git a/...pyter/nbconvert/templates/latex/null.tplx → ...jupyter/nbconvert/templates/latex/null.j2 b/...pyter/nbconvert/templates/latex/null.tplx → ...jupyter/nbconvert/templates/latex/null.j2
diff --git a/share/jupyter/nbconvert/templates/latex/report.tex b/share/jupyter/nbconvert/templates/latex/report.tex
@@ -1,7 +1,7 @@
 
 % Default to the notebook output style
 ((* if not cell_style is defined *))
-    ((* set cell_style = 'style_ipython.tplx' *))
+    ((* set cell_style = 'style_ipython.tex' *))
 ((* endif *))
 
 % Inherit from the specified cell style.

diff --git a/...ert/templates/latex/style_bw_ipython.tplx → ...vert/templates/latex/style_bw_ipython.tex b/...ert/templates/latex/style_bw_ipython.tplx → ...vert/templates/latex/style_bw_ipython.tex
diff --git a/...vert/templates/latex/style_bw_python.tplx → ...nvert/templates/latex/style_bw_python.tex b/...vert/templates/latex/style_bw_python.tplx → ...nvert/templates/latex/style_bw_python.tex
diff --git a/...onvert/templates/latex/style_ipython.tplx → ...convert/templates/latex/style_ipython.tex b/...onvert/templates/latex/style_ipython.tplx → ...convert/templates/latex/style_ipython.tex
diff --git a/...onvert/templates/latex/style_jupyter.tplx → ...convert/templates/latex/style_jupyter.tex b/...onvert/templates/latex/style_jupyter.tplx → ...convert/templates/latex/style_jupyter.tex
diff --git a/...convert/templates/latex/style_python.tplx → ...bconvert/templates/latex/style_python.tex b/...convert/templates/latex/style_python.tplx → ...bconvert/templates/latex/style_python.tex
diff --git a/share/jupyter/nbconvert/templates/markdown/index.md b/share/jupyter/nbconvert/templates/markdown/index.md
@@ -1,4 +1,4 @@
-{% extends 'display_priority.tpl' %}
+{% extends 'display_priority.j2' %}
 
 
 {% block in_prompt %}

diff --git a/share/jupyter/nbconvert/templates/python/index.py b/share/jupyter/nbconvert/templates/python/index.py
@@ -1,4 +1,4 @@
-{%- extends 'null.tpl' -%}
+{%- extends 'null.j2' -%}
 
 {%- block header -%}
 #!/usr/bin/env python

diff --git a/share/jupyter/nbconvert/templates/rst/index.rst b/share/jupyter/nbconvert/templates/rst/index.rst
@@ -1,4 +1,4 @@
-{%- extends 'display_priority.tpl' -%}
+{%- extends 'display_priority.j2' -%}
 
 
 {% block in_prompt %}

diff --git a/...ter/nbconvert/templates/script/script.tpl → ...yter/nbconvert/templates/script/script.j2 b/...ter/nbconvert/templates/script/script.tpl → ...yter/nbconvert/templates/script/script.j2
@@ -1,4 +1,4 @@
-{%- extends 'null.tpl' -%}
+{%- extends 'null.j2' -%}
 
 {% block input %}
 {{ cell.source }}