fix some stream/pyout/pyerr

templates/basichtml.tpl

@@ -1,121 +1,132 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">
 <div class="hbox output_area">
 {{ super() }}
 </div>
 </div>
 </div>
 {% endblock output_group %}
 
 
 {% block in_prompt -%}
 <div class="prompt input_prompt">In&nbsp;[{{cell.prompt_number}}]:</div>
 {%- endblock in_prompt %}
 
 {% block output_prompt -%}
 <div class="prompt output_prompt">
 {%- if cell.haspyout -%}
 Out[{{cell.prompt_number}}]:
 {%- endif -%}
 </div>
 {% endblock output_prompt %}
 
 {% block input %}
 <div class="input_area box-flex1">
 {{cell.input | highlight }}
 </div>
 {%- endblock input %}
 
 
 {% block markdowncell scoped %}
 <div class="text_cell_render border-box-sizing rendered_html">
 {{ cell.source | markdown| rm_fake}}
 </div>
 {%- endblock markdowncell %}
 
 {% block headingcell scoped %}
 <div class="text_cell_render border-box-sizing rendered_html">
 <h{{cell.level}}>
   {{cell.source}}
 </h{{cell.level}}>
 </div>
 {% endblock headingcell %}
 
 {% block rawcell scoped %}
 {{ cell.source }}
 {% endblock rawcell %}
 
 {% block unknowncell scoped %}
 unknown type  {{cell.type}}
 {% endblock unknowncell %}
 
 
 {% block pyout -%}
 <div class="output_subarea output_pyout">
 {% block data_priority scoped %}{{ super()}}{% endblock %}
 </div>
 {%- endblock pyout %}
 
-{% block stream -%}
+{% block stream_stdout -%}
 <div class="output_subarea output_stream output_stdout">
 <pre>{{output.text |ansi2html}}</pre>
 </div>
-{%- endblock stream %}
+{%- endblock stream_stdout %}
+
+{% block stream_stderr -%}
+<div class="output_subarea output_stream output_stderr">
+<pre>{{output.text |ansi2html}}</pre>
+</div>
+{%- endblock stream_stderr %}
 
 {% block data_svg -%}
 {{output.svg}}
-</div>
 {%- endblock data_svg %}
 
 
-{% block data_html %}
+{% 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}}"></img>
-</div>
 {%- endblock data_png %}
 
 
 {% block data_jpg %}
 <img src="data:image/jpeg;base64,{{output.jpeg}}"></img>
-</div>
 {%- endblock data_jpg %}
 
 
 {% block data_latex %}
 {{output.latex}}
 {%- endblock data_latex %}
 
 {% block pyerr -%}
 <div class="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 display_data scoped -%}
+<div class="output_subarea output_display_data">
+{{super()}}
+</div>
+{%- endblock display_data -%}

templates/null.tpl

@@ -1,81 +1,89 b''
 {#
 
 DO NOT USE THIS AS A BASE WORK,
 IF YOU ARE COPY AND PASTING THIS FILE
 YOU ARE PROBABLY DOING THINGS WRONG.
 
 Null template, Does nothing except defining a basic structure
 To layout the diferents blocks of a notebook.
 
 Subtemplates can Override Blocks to define their custom reresentation.
 
 If one of the block you do overrite is not a leave block, consider
 calling super.
 
 {%- block nonLeaveBlock -%}
     #add stuff at beginning
     {{ super() }}
     #add stuff at end
 {%- endblock nonLeaveBlock -%}
 
 consider calling super even if block is leave block, we might insert more block later.
 
 #}
 {%- block header -%}
 {%- endblock header -%}
 {%- block body -%}
 {%- for worksheet in worksheets -%}
     {%- for cell in worksheet.cells -%}
         {%- block any_cell scoped -%}
             {%- if cell.type in ['code'] -%}
                 {%- block codecell scoped -%}
                     {%- block input_group -%}
                         {%- block in_prompt -%}{%- endblock in_prompt -%}
                         {%- block input -%}{%- endblock input -%}
                     {%- endblock input_group -%}
                         {%- if cell.outputs -%}
                     {%- block output_group -%}
                             {%- block output_prompt -%}{%- endblock output_prompt -%}
                             {%- block outputs -%}
                                 {%- for output in cell.outputs -%}
                                     {%- if output.output_type in ['pyout'] -%}
                                         {%- block pyout scoped -%}{%- endblock pyout -%}
                                     {%- elif output.output_type in ['stream'] -%}
-                                    {%- block stream scoped -%}{%- endblock 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 -%}
                                 {%- endfor -%}
                             {%- endblock outputs -%}
                     {%- endblock output_group -%}
                         {%- endif -%}
                 {%- endblock codecell -%}
             {%- elif cell.type in ['markdown'] -%}
                 {%- block markdowncell scoped-%}
                 {%- endblock markdowncell -%}
             {%- elif cell.type in ['heading'] -%}
                 {%- block headingcell scoped-%}
                 {%- endblock headingcell -%}
             {%- elif cell.type in ['raw'] -%}
                 {%- block rawcell scoped-%}
                 {%- endblock rawcell -%}
             {%- else -%}
                 {%- block unknowncell scoped-%}
                 {%- endblock unknowncell -%}
             {%- endif -%}
         {%- endblock any_cell -%}
     {%- endfor -%}
 {%- endfor -%}
 {%- endblock body -%}
 
 {%- block footer -%}
 {%- endblock footer -%}