diff --git a/IPython/nbconvert/templates/latex/skeleton/cell_input.tplx b/IPython/nbconvert/templates/latex/skeleton/cell_input.tplx deleted file mode 100644 index 0009e76..0000000 --- a/IPython/nbconvert/templates/latex/skeleton/cell_input.tplx +++ /dev/null @@ -1,6 +0,0 @@ -((= Auto-generated template file, DO NOT edit directly! - To edit this file, please refer to ../../skeleton/README.md =)) - - -((*- block in_prompt -*))((*- endblock in_prompt -*)) -((*- block input -*))((*- endblock input -*)) \ No newline at end of file diff --git a/IPython/nbconvert/templates/latex/skeleton/cell_outputs.tplx b/IPython/nbconvert/templates/latex/skeleton/cell_outputs.tplx deleted file mode 100644 index 4b353c3..0000000 --- a/IPython/nbconvert/templates/latex/skeleton/cell_outputs.tplx +++ /dev/null @@ -1,35 +0,0 @@ -((= Auto-generated template file, DO NOT edit directly! - To edit this file, please refer to ../../skeleton/README.md =)) - - -((*- block output_prompt -*))((*- endblock output_prompt -*)) -((*- block outputs scoped -*)) - ((*- for output in cell.outputs -*)) - ((*- block output scoped -*)) - ((*- if output.output_type in ['pyout'] -*)) - ((*- block pyout scoped -*))((*- endblock pyout -*)) - ((*- elif output.output_type in ['stream'] -*)) - ((*- block stream scoped -*)) - ((*- if output.stream in ['stdout'] -*)) - ((*- block stream_stdout scoped -*)) - ((*- endblock stream_stdout -*)) - ((*- elif output.stream in ['stderr'] -*)) - ((*- block stream_stderr scoped -*)) - ((*- endblock stream_stderr -*)) - ((*- endif -*)) - ((*- endblock stream -*)) - ((*- elif output.output_type in ['display_data'] -*)) - ((*- block display_data scoped -*)) - ((*- block data_priority scoped -*)) - ((*- endblock data_priority -*)) - ((*- endblock display_data -*)) - ((*- elif output.output_type in ['pyerr'] -*)) - ((*- block pyerr scoped -*)) - ((*- for line in output.traceback -*)) - ((*- block traceback_line scoped -*))((*- endblock traceback_line -*)) - ((*- endfor -*)) - ((*- endblock pyerr -*)) - ((*- endif -*)) - ((*- endblock output -*)) - ((*- endfor -*)) -((*- endblock outputs -*)) \ No newline at end of file diff --git a/IPython/nbconvert/templates/latex/skeleton/null.tplx b/IPython/nbconvert/templates/latex/skeleton/null.tplx index 7bad538..33bc591 100644 --- a/IPython/nbconvert/templates/latex/skeleton/null.tplx +++ b/IPython/nbconvert/templates/latex/skeleton/null.tplx @@ -4,11 +4,11 @@ ((= -DO NOT USE THIS AS A BASE WORK, +DO NOT USE THIS AS A BASE, IF YOU ARE COPY AND PASTING THIS FILE -YOU ARE PROBABLY DOING THINGS WRONG. +YOU ARE PROBABLY DOING THINGS INCORRECTLY. -Null template, Does nothing except defining a basic structure +Null template, does nothing except defining a basic structure To layout the different blocks of a notebook. Subtemplates can override blocks to define their custom representation. @@ -34,11 +34,42 @@ consider calling super even if it is a leave block, we might insert more blocks ((*- if cell.cell_type in ['code'] -*)) ((*- block codecell scoped -*)) ((*- block input_group -*)) - ((*- include 'cell_input.tplx' -*)) + ((*- block in_prompt -*))((*- endblock in_prompt -*)) + ((*- block input -*))((*- endblock input -*)) ((*- endblock input_group -*)) ((*- if cell.outputs -*)) ((*- block output_group -*)) - ((*- include 'cell_outputs.tplx' -*)) + ((*- block output_prompt -*))((*- endblock output_prompt -*)) + ((*- block outputs scoped -*)) + ((*- for output in cell.outputs -*)) + ((*- block output scoped -*)) + ((*- if output.output_type in ['pyout'] -*)) + ((*- block pyout scoped -*))((*- endblock pyout -*)) + ((*- elif output.output_type in ['stream'] -*)) + ((*- block stream scoped -*)) + ((*- if output.stream in ['stdout'] -*)) + ((*- block stream_stdout scoped -*)) + ((*- endblock stream_stdout -*)) + ((*- elif output.stream in ['stderr'] -*)) + ((*- block stream_stderr scoped -*)) + ((*- endblock stream_stderr -*)) + ((*- endif -*)) + ((*- endblock stream -*)) + ((*- elif output.output_type in ['display_data'] -*)) + ((*- block display_data scoped -*)) + ((*- block data_priority scoped -*)) + ((*- endblock data_priority -*)) + ((*- endblock display_data -*)) + ((*- elif output.output_type in ['pyerr'] -*)) + ((*- block pyerr scoped -*)) + ((*- for line in output.traceback -*)) + ((*- block traceback_line scoped -*))((*- endblock traceback_line -*)) + ((*- endfor -*)) + ((*- endblock pyerr -*)) + ((*- endif -*)) + ((*- endblock output -*)) + ((*- endfor -*)) + ((*- endblock outputs -*)) ((*- endblock output_group -*)) ((*- endif -*)) ((*- endblock codecell -*)) diff --git a/IPython/nbconvert/templates/skeleton/cell_input.tpl b/IPython/nbconvert/templates/skeleton/cell_input.tpl deleted file mode 100644 index 6f460d5..0000000 --- a/IPython/nbconvert/templates/skeleton/cell_input.tpl +++ /dev/null @@ -1,2 +0,0 @@ -{%- block in_prompt -%}{%- endblock in_prompt -%} -{%- block input -%}{%- endblock input -%} \ No newline at end of file diff --git a/IPython/nbconvert/templates/skeleton/cell_outputs.tpl b/IPython/nbconvert/templates/skeleton/cell_outputs.tpl deleted file mode 100644 index 6bdfce6..0000000 --- a/IPython/nbconvert/templates/skeleton/cell_outputs.tpl +++ /dev/null @@ -1,31 +0,0 @@ -{%- block output_prompt -%}{%- endblock output_prompt -%} -{%- block outputs scoped -%} - {%- for output in cell.outputs -%} - {%- block output scoped -%} - {%- if output.output_type in ['pyout'] -%} - {%- block pyout scoped -%}{%- endblock pyout -%} - {%- elif output.output_type in ['stream'] -%} - {%- block stream scoped -%} - {%- if output.stream in ['stdout'] -%} - {%- block stream_stdout scoped -%} - {%- endblock stream_stdout -%} - {%- elif output.stream in ['stderr'] -%} - {%- block stream_stderr scoped -%} - {%- endblock stream_stderr -%} - {%- endif -%} - {%- endblock stream -%} - {%- elif output.output_type in ['display_data'] -%} - {%- block display_data scoped -%} - {%- block data_priority scoped -%} - {%- endblock data_priority -%} - {%- endblock display_data -%} - {%- elif output.output_type in ['pyerr'] -%} - {%- block pyerr scoped -%} - {%- for line in output.traceback -%} - {%- block traceback_line scoped -%}{%- endblock traceback_line -%} - {%- endfor -%} - {%- endblock pyerr -%} - {%- endif -%} - {%- endblock output -%} - {%- endfor -%} -{%- endblock outputs -%} \ No newline at end of file diff --git a/IPython/nbconvert/templates/skeleton/null.tpl b/IPython/nbconvert/templates/skeleton/null.tpl index 32f1d72..24066f2 100644 --- a/IPython/nbconvert/templates/skeleton/null.tpl +++ b/IPython/nbconvert/templates/skeleton/null.tpl @@ -30,11 +30,42 @@ consider calling super even if it is a leave block, we might insert more blocks {%- if cell.cell_type in ['code'] -%} {%- block codecell scoped -%} {%- block input_group -%} - {%- include 'cell_input.tpl' -%} + {%- block in_prompt -%}{%- endblock in_prompt -%} + {%- block input -%}{%- endblock input -%} {%- endblock input_group -%} {%- if cell.outputs -%} {%- block output_group -%} - {%- include 'cell_outputs.tpl' -%} + {%- block output_prompt -%}{%- endblock output_prompt -%} + {%- block outputs scoped -%} + {%- for output in cell.outputs -%} + {%- block output scoped -%} + {%- if output.output_type in ['pyout'] -%} + {%- block pyout scoped -%}{%- endblock pyout -%} + {%- elif output.output_type in ['stream'] -%} + {%- block stream scoped -%} + {%- if output.stream in ['stdout'] -%} + {%- block stream_stdout scoped -%} + {%- endblock stream_stdout -%} + {%- elif output.stream in ['stderr'] -%} + {%- block stream_stderr scoped -%} + {%- endblock stream_stderr -%} + {%- endif -%} + {%- endblock stream -%} + {%- elif output.output_type in ['display_data'] -%} + {%- block display_data scoped -%} + {%- block data_priority scoped -%} + {%- endblock data_priority -%} + {%- endblock display_data -%} + {%- elif output.output_type in ['pyerr'] -%} + {%- block pyerr scoped -%} + {%- for line in output.traceback -%} + {%- block traceback_line scoped -%}{%- endblock traceback_line -%} + {%- endfor -%} + {%- endblock pyerr -%} + {%- endif -%} + {%- endblock output -%} + {%- endfor -%} + {%- endblock outputs -%} {%- endblock output_group -%} {%- endif -%} {%- endblock codecell -%}