Merge pull request #4178 from minrk/data_javascript

add missing data_javascript

IPython/nbconvert/templates/html_basic.tpl

@@ -1,142 +1,148 b''
 {%- extends 'display_priority.tpl' -%}
 
 
 {% block codecell %}
 <div class="cell border-box-sizing code_cell vbox">
 {{ super() }}
 </div>
 {%- endblock codecell %}
 
 {% block input_group -%}
 <div class="input hbox">
 {{ super() }}
 </div>
 {% endblock input_group %}
 
 {% block output_group %}
 <div class="vbox output_wrapper">
 <div class="output vbox">
 {{ super() }}
 </div>
 </div>
 {% endblock output_group %}
 
 {% block in_prompt -%}
 <div class="prompt input_prompt">
 In&nbsp;[{{ cell.prompt_number }}]:
 </div>
 {%- endblock in_prompt %}
 
 {# 
   output_prompt doesn't do anything in HTML,
   because there is a prompt div in each output area (see output block)
 #}
 {% block output_prompt %}
 {% endblock output_prompt %}
 
 {% block input %}
 <div class="input_area box-flex1">
 {{ cell.input | highlight2html }}
 </div>
 {%- endblock input %}
 
 {% block output %}
 <div class="hbox output_area">
 {%- if output.output_type == 'pyout' -%}
     <div class="prompt output_prompt">
     Out[{{ cell.prompt_number }}]:
 {%- else -%}
     <div class="prompt">
 {%- endif -%}
     </div>
 {{ super() }}
 </div>
 {% endblock output %}
 
 {% block markdowncell scoped %}
 <div class="text_cell_render border-box-sizing rendered_html">
 {{ cell.source | strip_math_space | markdown2html | strip_files_prefix }}
 </div>
 {%- endblock markdowncell %}
 
 {% block headingcell scoped %}
 <div class="text_cell_render border-box-sizing rendered_html">
 {{ ("#" * cell.level + cell.source) | replace('\n', ' ') | strip_math_space | markdown2html | strip_files_prefix | add_anchor }}
 </div>
 {% endblock headingcell %}
 
 {% block rawcell scoped %}
 {{ cell.source }}
 {% endblock rawcell %}
 
 {% block unknowncell scoped %}
 unknown type  {{ cell.type }}
 {% endblock unknowncell %}
 
 {% block pyout -%}
 <div class="box-flex1 output_subarea output_pyout">
 {% 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>
 </div>
 {%- endblock stream_stdout %}
 
 {% block stream_stderr -%}
 <div class="box-flex1 output_subarea output_stream output_stderr">
 <pre>
 {{ output.text | ansi2html }}
 </pre>
 </div>
 {%- endblock stream_stderr %}
 
 {% block data_svg -%}
 {{ output.svg }}
 {%- endblock data_svg %}
 
 {% block data_html -%}
 <div class="output_html rendered_html">
 {{ output.html }}
 </div>
 {%- endblock data_html %}
 
 {% block data_png %}
 <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 %}
 
 {% block pyerr -%}
 <div class="box-flex1 output_subarea output_pyerr">
 <pre>{{ super() }}</pre>
 </div>
 {%- endblock pyerr %}
 
 {%- block traceback_line %}
 {{ line | ansi2html }}
 {%- endblock traceback_line %}
 
 {%- block data_text %}
 <pre>
 {{ output.text | ansi2html }}
 </pre>
 {%- endblock -%}
 
+{%- block data_javascript %}
+<script type="text/javascript">
+{{ output.javascript }}
+</script>
+{%- endblock -%}
+
 {%- block display_data scoped -%}
 <div class="box-flex1 output_subarea output_display_data">
 {{ super() }}
 </div>
 {%- endblock display_data -%}
  No newline at end of file

IPython/nbconvert/templates/latex/skeleton/display_priority.tplx

@@ -1,39 +1,42 b''
 ((= autogenerated file do not edit =))
 ((*- extends 'null.tplx' -*))
 
 ((=display data priority=))
 
 
 ((*- block data_priority scoped -*))
     ((*- for type in output | filter_data_type -*))
         ((*- if type in ['pdf']*))
             ((*- block data_pdf -*))
             ((*- endblock -*))
         ((*- endif -*))
         ((*- if type in ['svg']*))
             ((*- block data_svg -*))
             ((*- endblock -*))
         ((*- endif -*))
         ((*- if type in ['png']*))
             ((*- block data_png -*))
             ((*- endblock -*))
         ((*- endif -*))
         ((*- if type in ['html']*))
             ((*- block data_html -*))
             ((*- endblock -*))
         ((*- endif -*))
         ((*- if type in ['jpeg']*))
             ((*- block data_jpg -*))
             ((*- endblock -*))
         ((*- endif -*))
         ((*- if type in ['text']*))
             ((*- block data_text -*))
             ((*- endblock -*))
         ((*- endif -*))
-
         ((*- if type in ['latex']*))
             ((*- block data_latex -*))
             ((*- endblock -*))
         ((*- endif -*))
+        ((*- if type in ['javascript']*))
+            ((*- block data_javascript -*))
+            ((*- endblock -*))
+        ((*- endif -*))
     ((*- endfor -*))
 ((*- endblock data_priority -*))

IPython/nbconvert/templates/skeleton/Makefile

@@ -1,23 +1,23 b''
 
 
-all: tex/null.tplx tex/display_priority.tplx
+all: ../latex/skeleton/null.tplx ../latex/skeleton/display_priority.tplx
 
 # convert jinja syntax to tex
 # cf http://flask.pocoo.org/snippets/55/
-tex/%.tplx: %.tpl
+../latex/skeleton/%.tplx: %.tpl
 	@echo 'generating tex equivalent of $^: $@'
 	@echo '((= autogenerated file do not edit =))' > $@
 	@sed \
 		-e 's/{%/((*/g' \
 		-e 's/%}/*))/g' \
 		-e 's/{{/(((/g' \
 		-e 's/}}/)))/g' \
 		-e 's/{#/((=/g' \
 		-e 's/#}/=))/g' \
 		-e "s/tpl'/tplx'/g" \
 		$^ >> $@
 
 
 clean:
 	@echo "cleaning generated tplx files..."
-	@rm tex/*
+	@rm ../latex/skeleton/*

IPython/nbconvert/templates/skeleton/display_priority.tpl

@@ -1,38 +1,41 b''
 {%- extends 'null.tpl' -%}
 
 {#display data priority#}
 
 
 {%- block data_priority scoped -%}
     {%- for type in output | filter_data_type -%}
         {%- if type in ['pdf']%}
             {%- block data_pdf -%}
             {%- endblock -%}
         {%- endif -%}
         {%- if type in ['svg']%}
             {%- block data_svg -%}
             {%- endblock -%}
         {%- endif -%}
         {%- if type in ['png']%}
             {%- block data_png -%}
             {%- endblock -%}
         {%- endif -%}
         {%- if type in ['html']%}
             {%- block data_html -%}
             {%- endblock -%}
         {%- endif -%}
         {%- if type in ['jpeg']%}
             {%- block data_jpg -%}
             {%- endblock -%}
         {%- endif -%}
         {%- if type in ['text']%}
             {%- block data_text -%}
             {%- endblock -%}
         {%- endif -%}
-
         {%- if type in ['latex']%}
             {%- block data_latex -%}
             {%- endblock -%}
         {%- endif -%}
+        {%- if type in ['javascript']%}
+            {%- block data_javascript -%}
+            {%- endblock -%}
+        {%- endif -%}
     {%- endfor -%}
 {%- endblock data_priority -%}