upstream/ipython Commit - r11770:6b8a9d57

Redo of fixing templates structure.

damianavila -

r11770:6b8a9d57

parent child

IPython/nbconvert/templates/html_basic.tpl

0 +17 -13

             {%- extends 'display_priority.tpl' -%}
             {% block codecell %}
             <div class="cell border-box-sizing code_cell vbox">
-            {{ super() }}</div>
+            {{ super() }}
+            </div>
             {%- endblock codecell %}
             {% block input_group -%}
             {% endblock output_group %}
             {% block in_prompt -%}
-            <div class="prompt input_prompt">In&nbsp;[{{cell.prompt_number}}]:</div>
+            <div class="prompt input_prompt">
+            In&nbsp;[{{ cell.prompt_number }}]:
+            </div>
             {%- endblock in_prompt %}
             {#
             unknown type  {{ cell.type }}
             {% endblock unknowncell %}
             {% block pyout -%}
             <div class="box-flex1 output_subarea output_pyout">
-            {% block data_priority scoped %}{{ super()}}{% endblock %}
+            {% block data_priority scoped %}
+            {{ super() }}
+            {% endblock %}
             </div>
             {%- endblock pyout %}
             {% block stream_stdout -%}
             <div class="box-flex1 output_subarea output_stream output_stdout">
-            <pre>{{output.text |ansi2html}}</pre>
+            <pre>
+            {{ output.text | ansi2html }}
+            </pre>
             </div>
             {%- endblock stream_stdout %}
             {% block stream_stderr -%}
             <div class="box-flex1 output_subarea output_stream output_stderr">
-            <pre>{{output.text |ansi2html}}</pre>
+            <pre>
+            {{ output.text | ansi2html }}
+            </pre>
             </div>
             {%- endblock stream_stderr %}
             {{ output.svg }}
             {%- endblock data_svg %}
             {% block data_html -%}
             <div class="output_html rendered_html">
             {{ output.html }}
             <img src="data:image/png;base64,{{ output.png }}">
             {%- endblock data_png %}
             {% block data_jpg %}
             <img src="data:image/jpeg;base64,{{ output.jpeg }}">
             {%- endblock data_jpg %}
             {% block data_latex %}
             {{ output.latex }}
             {%- endblock data_latex %}
             {{ line | ansi2html }}
             {%- endblock traceback_line %}
             {%- block data_text %}
-            <pre>{{output.text | ansi2html}}</pre>
+            <pre>
+            {{ output.text | ansi2html }}
+            </pre>
             {%- endblock -%}
             {%- block display_data scoped -%}
             <div class="box-flex1 output_subarea output_display_data">
             {{ super() }}

IPython/nbconvert/templates/html_full.tpl

0 +8 -8

             {%- extends 'html_basic.tpl' -%}
-            {%- block header -%}<!DOCTYPE html>
+            {%- block header -%}
+            <!DOCTYPE html>
             <html>
             <head>
             <meta charset="UTF-8">
             <!-- Custom stylesheet, it must be in the same directory as the html file -->
             <link rel="stylesheet" href="custom.css">
-            <script src="https://c328740.ssl.cf1.rackcdn.com/mathjax/latest/MathJax.js?config=TeX-AMS_HTML" type="text/javascript">
+            <script src="https://c328740.ssl.cf1.rackcdn.com/mathjax/latest/MathJax.js?config=TeX-AMS_HTML" type="text/javascript"></script>
-            </script>
             <script type="text/javascript">
             init_mathjax = function() {
                 if (window.MathJax) {
             </head>
             {%- endblock header -%}
             {% block body %}
-            <body>{{ super() }}
+            <body>
+            {{ super() }}
             </body>
             {%- endblock body %}
             {% block footer %}
-            </html>{% endblock footer %}
+            </html>
+            {% endblock footer %}
  No newline at end of file

IPython/nbconvert/templates/latex/latex_article.tplx

0 +4 0

             ((*- extends 'sphinx.tplx' -*))
             ((* set parentdocumentclass = 'article' *))
             ((* set documentclass = 'howto' *))

IPython/nbconvert/templates/latex/latex_basic.tplx

0 +23 -14

             ((*- extends 'display_priority.tplx' -*))
             \nonstopmode
-            ((* block in_prompt *))((* endblock in_prompt *))
+            ((* block in_prompt *))
+            ((* endblock in_prompt *))
-            ((* block output_prompt *))((* endblock output_prompt *))
+            ((* block output_prompt *))
+            ((* endblock output_prompt *))
-            ((* block codecell *))\begin{codecell}((( super() )))
+            ((* block codecell *))
+            \begin{codecell}
+            ((( super() )))
             \end{codecell}
             ((* endblock *))
             \end{codeinput}
             ((* endblock input *))
             ((= Those Two are for error displaying
             even if the first one seem to do nothing,
             it introduces a new line
             =))
             ((* block pyerr *))
             \begin{traceback}
-            \begin{verbatim}((( super() )))
+            \begin{verbatim}
+            ((( super() )))
             \end{verbatim}
             \end{traceback}
             ((* endblock pyerr *))
             ((* block traceback_line *))
-            ((( line |indent| strip_ansi )))((* endblock traceback_line *))
+            ((( line | indent | strip_ansi )))
+            ((* endblock traceback_line *))
             ((= .... =))
             ((*- block output_group -*))
             \begin{codeoutput}
             ((( super() )))
-            \end{codeoutput}((* endblock *))
+            \end{codeoutput}
+            ((* endblock *))
             ((*- block data_png -*))
             \begin{center}
             ((*- endblock -*))
             ((* block pyout *))
-            ((* block data_priority scoped *))((( super() )))((* endblock *))
+            ((* block data_priority scoped *))
+            ((( super() )))
+            ((* endblock *))
             ((* endblock pyout *))
             ((* block data_text *))
             ((*- if output.latex.startswith('$'): -*)) \begin{equation*}
                 ((( output.latex | strip_dollars )))
                 \end{equation*}
-            ((*- else -*)) ((( output.latex ))) ((*- endif *))
+            ((*- else -*))
+                ((( output.latex )))
+            ((*- endif *))
             ((* endblock *))
             ((* block stream *))
             \end{Verbatim}
             ((* endblock stream *))
-            ((* block markdowncell scoped *))((( cell.source | markdown2latex )))
+            ((* block markdowncell scoped *))
+            ((( cell.source | markdown2latex )))
             ((* endblock markdowncell *))
             ((* block headingcell scoped -*))
             unknown type  ((( cell.type )))
             ((* endblock unknowncell *))
             ((* block body *))
             ((* block bodyBegin *))

IPython/nbconvert/templates/latex/latex_book.tplx

0 +4 0

             ((*- extends 'sphinx.tplx' -*))
             ((* set parentdocumentclass = 'report' *))
             ((* set documentclass = 'manual' *))

IPython/nbconvert/templates/latex/sphinx.tplx

0 +19 -5

             ((*- extends 'display_priority.tplx' -*))
             \nonstopmode
             %==============================================================================
                         \tableofcontents
                     ((* endblock toc *))
-                    ((* endblock bodyBegin *))((( super() )))((* block bodyEnd *))
+                    ((* endblock bodyBegin *))
+                    ((( super() )))
+                    ((* block bodyEnd *))
                     \renewcommand{\indexname}{Index}
                     \printindex
                 ((= It's important to make sure that underscores (which tend to be common
                 in IPYNB file titles) do not make their way into latex.  Sometimes this
                 causes latex to barf. =))
-                ((*- endif -*)){((( cell.source | markdown2latex )))}
+                ((*- endif -*))
+                {((( cell.source | markdown2latex )))}
             ((*- endblock headingcell *))
             %==============================================================================
             %          can't flow off of the page.
             %==============================================================================
             ((* block unknowncell scoped*))
             % Unsupported cell type, no formatting
             ((( cell.source | wrap_text | escape_latex )))
             ((* endblock unknowncell *))
             ((*- endblock -*))
             ((*- block data_latex *))
-                ((* if resources.sphinx.centeroutput *))\begin{center}((* endif -*))((( output.latex | strip_math_space )))((*- if resources.sphinx.centeroutput *))\end{center} ((* endif -*))
+            ((* if resources.sphinx.centeroutput *))
+                \begin{center}
+            ((* endif -*))
+            ((( output.latex | strip_math_space )))
+            ((*- if resources.sphinx.centeroutput *))
+                \end{center}
+            ((* endif -*))
             ((*- endblock -*))
             %==============================================================================
             % Name: conditionally_center_output
             % Purpose: This macro centers the output if the output centering is enabled.
             ((* macro conditionally_center_output(text) -*))
-                ((* if resources.sphinx.centeroutput *)){\centering ((* endif *))((( text )))((* if resources.sphinx.centeroutput *))}((* endif *))
+                ((* if resources.sphinx.centeroutput *))
+                    {\centering
+                ((* endif *))
+                ((( text )))
+                ((* if resources.sphinx.centeroutput *))}
+                ((* endif *))
             ((*- endmacro *))
             % Name: insert_graphics

IPython/nbconvert/templates/markdown.tpl

0 +16 -15

             {% extends 'display_priority.tpl' %}
             {% block in_prompt %}
-            In[{{cell.prompt_number if cell.prompt_number else ' '}}]:{% endblock in_prompt %}
+            In[{{ cell.prompt_number if cell.prompt_number else ' ' }}]:
+            {% endblock in_prompt %}
-            {% block output_prompt %}{% if cell.haspyout %}Out[{{cell.prompt_number}}]:
+            {% block output_prompt %}
-            {%- endif %}{%- endblock output_prompt %}
+            {% if cell.haspyout %}
+            Out[{{ cell.prompt_number }}]:
+            {%- endif %}
+            {%- endblock output_prompt %}
             {% block input %}
             ```
             {% endblock pyerr %}
             {% block traceback_line %}
-            {{ line |indent| strip_ansi }}{% endblock traceback_line %}
+            {{ line | indent | strip_ansi }}
+            {% endblock traceback_line %}
             {% block pyout %}
-            {% block data_priority scoped %}{{ super()}}{% endblock %}
+            {% block data_priority scoped %}
+            {{ super() }}
+            {% endblock %}
             {% endblock pyout %}
             {% block stream %}
             {{ output.text | indent }}
             {% endblock stream %}
             {% block data_svg %}
             [!image]({{ output.svg_filename }})
             {% endblock data_svg %}
             [!image]({{ output.jpg_filename }})
             {% endblock data_jpg %}
             {% block data_latex %}
             $$
             {{ output.latex }}
             {% endblock data_latex %}
             {% block data_text scoped %}
             {{ output.text | indent }}
             {% endblock data_text %}
             {% block markdowncell scoped %}
             {% endblock markdowncell %}
             {% block headingcell scoped %}
             {{ '#' * cell.level }} {{ cell.source | replace('\n', ' ') }}
             {% endblock headingcell %}
-            {% block rawcell scoped %}{{ cell.source  }}
+            {% block rawcell scoped %}
+            {{ cell.source }}
             {% endblock rawcell %}
             {% block unknowncell scoped %}

IPython/nbconvert/templates/python.tpl

0 +9 -10

             {%- extends 'null.tpl' -%}
             {% block in_prompt %}
             # In[{{ cell.prompt_number if cell.prompt_number else ' ' }}]:
             {% endblock in_prompt %}
             {% block output_prompt %}
-            # Out[{{cell.prompt_number}}]:{% endblock output_prompt %}
+            # Out[{{ cell.prompt_number }}]:
+            {% endblock output_prompt %}
-            {% block input %}{{ cell.input | ipython2python }}
+            {% block input %}
+            {{ cell.input | ipython2python }}
             {% endblock input %}
             {# Those Two are for error displaying
             even if the first one seem to do nothing,
             it introduces a new line
             #}
-            {% block pyerr %}{{ super() }}
+            {% block pyerr %}
+            {{ super() }}
             {% endblock pyerr %}
             {% block traceback_line %}
-            {{ line |indent| strip_ansi }}{% endblock traceback_line %}
+            {{ line | indent | strip_ansi }}
+            {% endblock traceback_line %}
             {# .... #}
             {% block pyout %}
             {{ output.text | indent | comment_lines }}
             {% endblock pyout %}
             {{ output.text | indent | comment_lines }}
             {% endblock stream %}
             {% block display_data scoped %}
             # image file:
             {% endblock display_data %}

IPython/nbconvert/templates/reveal_internals/align_reveal_cells.tpl

0 0 -1

             {%- extends 'reveal_internals/reveal_cells.tpl' -%}
             {%- block any_cell scoped -%}
             {%- if cell.metadata.align_type in ['Left'] -%}
                 {{ super() }}

IPython/nbconvert/templates/reveal_internals/reveal_cells.tpl

0 0 -2

             {%- extends 'html_basic.tpl' -%}
             {%- block any_cell scoped -%}
             {%- if cell.metadata.slide_type in ['-', 'slide', 'subslide'] -%}
                 {{ super() }}

IPython/nbconvert/templates/reveal_internals/slides.tpl

0 0 -1

             {%- extends 'reveal_internals/subslides.tpl' -%}
             {%- block any_cell scoped -%}
             {%- if cell.metadata.slide_type in ['slide'] -%}
                 <section>

IPython/nbconvert/templates/reveal_internals/subslides.tpl

0 0 -1

             {%- extends 'reveal_internals/align_reveal_cells.tpl' -%}
             {%- block any_cell scoped -%}
             {%- if cell.metadata.slide_type in ['subslide'] -%}
                 <section>

IPython/nbconvert/templates/rst.tpl

0 +30 -29

             {%- extends 'display_priority.tpl' -%}
             {% block in_prompt -%}
             In[{{ cell.prompt_number if cell.prompt_number else ' ' }}]:
             .. code:: python
             {% endblock in_prompt %}
-            {% block output_prompt %}{% if cell.haspyout -%}
+            {% block output_prompt %}
-            Out[{{cell.prompt_number}}]:{% endif %}{% endblock output_prompt %}
+            {% if cell.haspyout -%}
+                Out[{{ cell.prompt_number }}]:
-            {% block input %}{{ cell.input | indent}}
+            {% endif %}
+            {% endblock output_prompt %}
+            {% block input %}
+            {{ cell.input | indent}}
             {% endblock input %}
-            {% block pyerr %}::
+            {% block pyerr %}
+            ::
             {{ super() }}
             {% endblock pyerr %}
             {% block traceback_line %}
-            {{ line |indent| strip_ansi }}{% endblock traceback_line %}
+            {{ line | indent | strip_ansi }}
+            {% endblock traceback_line %}
             {% block pyout %}
-            {% block data_priority scoped %}{{ super()}}{% endblock %}
+            {% block data_priority scoped %}
+            {{ super() }}
+            {% endblock %}
             {% endblock pyout %}
             {% block stream %}
             {{ output.text | indent }}
             {% endblock stream %}
+            {% block data_svg %}
+            .. image:: {{ output.svg_filename }}
-            {% block data_svg %}.. image:: {{output.svg_filename}}
             {% endblock data_svg %}
-            {% block data_png %}.. image:: {{output.png_filename}}
+            {% block data_png %}
+            .. image:: {{ output.png_filename }}
             {% endblock data_png %}
-            {% block data_jpg %}..jpg image:: {{output.jpg_filename}}
+            {% block data_jpg %}
+            ..jpg image:: {{ output.jpg_filename }}
             {% endblock data_jpg %}
+            {% block data_latex %}
+            .. math::
-            {% block data_latex %}.. math::
             {{ output.latex | indent }}
             {% endblock data_latex %}
-            {% block data_text scoped %}.. parsed-literal::
+            {% block data_text scoped %}
+            .. parsed-literal::
             {{ output.text | indent }}
             {% endblock data_text %}
-            {% block markdowncell scoped %}{{ cell.source | markdown2rst }}
+            {% block markdowncell scoped %}
+            {{ cell.source | markdown2rst }}
             {% endblock markdowncell %}
             {% block headingcell scoped %}
             {{ ("#" * cell.level + cell.source) | replace('\n', ' ') | markdown2rst }}
             {% endblock headingcell %}
-            {% block rawcell scoped %}{{ cell.source  }}
+            {% block rawcell scoped %}
+            {{ cell.source }}
             {% endblock rawcell %}
             {% block unknowncell scoped %}

IPython/nbconvert/templates/skeleton/README.md

0 +1 -1

             This contain skeleton template that you probably don't want
             to inherit directly.
-            do not moify the content of the 'tex' folder which is generated by running 'make' in this folder.
+            do not modify the content of the 'tex' folder which is generated by running 'make' in this folder.

IPython/nbconvert/templates/slides_reveal.tpl

0 +4 -4

             {% block body %}
             <body>
-            <div class="reveal"><div class="slides">
+            <div class="reveal">
+            <div class="slides">
             {{ super() }}
+            </div>
-            </div></div>
+            </div>
             <!--
             Uncomment the following block and the addthis_widget.js (see below inside dependencies)

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages