try to play with data display priority

templates/display_priority.tpl

@@ -0,0 +1,45 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 -%}
+                ->> pdf
+            {%- endblock -%}
+        {%- endif -%}
+        {%- if type in ['svg']%}
+            {%- block data_svg -%}
+                ->> svg
+            {%- endblock -%}
+        {%- endif -%}
+        {%- if type in ['png']%}
+            {%- block data_png -%}
+                ->> png
+            {%- endblock -%}
+        {%- endif -%}
+        {%- if type in ['html']%}
+            {%- block data_html -%}
+                ->> html
+            {%- endblock -%}
+        {%- endif -%}
+        {%- if type in ['jpeg']%}
+            {%- block data_jpg -%}
+                ->> jpg
+            {%- endblock -%}
+        {%- endif -%}
+        {%- if type in ['text']%}
+            {%- block data_text -%}
+                ->> text
+            {%- endblock -%}
+        {%- endif -%}
+
+        {%- if type in ['latex']%}
+            {%- block data_latex -%}
+                ->> latext
+            {%- endblock -%}
+        {%- endif -%}
+    {%- endfor -%}
+{%- endblock data_priority -%}

converters/template.py

@@ -1,146 +1,157 b''
 """Base classes for the notebook conversion pipeline.
 
 This module defines Converter, from which all objects designed to implement
 a conversion of IPython notebooks to some other format should inherit.
 """
 #-----------------------------------------------------------------------------
 # Copyright (c) 2012, the IPython Development Team.
 #
 # Distributed under the terms of the Modified BSD License.
 #
 # The full license is in the file COPYING.txt, distributed with this software.
 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
 # Imports
 #-----------------------------------------------------------------------------
 
 from __future__ import print_function, absolute_import
 
 # Stdlib imports
 import jinja2
 import codecs
 import io
 import logging
 import os
 from IPython.utils import path
 import pprint
 import re
 from types import FunctionType
 
 from jinja2 import Environment, PackageLoader, FileSystemLoader
-env = Environment(loader=FileSystemLoader('./templates/'))
+env = Environment(
+        loader=FileSystemLoader('./templates/'), 
+        extensions=['jinja2.ext.loopcontrols']
+        )
 
 # IPython imports
 from IPython.nbformat import current as nbformat
 from IPython.config.configurable import Configurable, SingletonConfigurable
 from IPython.utils.traitlets import (List, Unicode, Type, Bool, Dict, CaselessStrEnum,
                                     Any)
 
 # Our own imports
 from IPython.utils.text import indent
 from .utils import remove_ansi
 from markdown import markdown
 from .utils import highlight,ansi2html
 #-----------------------------------------------------------------------------
 # Class declarations
 #-----------------------------------------------------------------------------
 def rm_fake(strng):
     return strng.replace('/files/', '')
 
 class ConversionException(Exception):
     pass
 
 
 def python_comment(string):
     return '# '+'\n# '.join(string.split('\n'))
 
 
 
 def header_body():
         """Return the body of the header as a list of strings."""
 
         from pygments.formatters import HtmlFormatter
 
         header = []
         static = os.path.join(path.get_ipython_package_dir(),
         'frontend', 'html', 'notebook', 'static',
         )
         here = os.path.split(os.path.realpath(__file__))[0]
         css = os.path.join(static, 'css')
         for sheet in [
             # do we need jquery and prettify?
             # os.path.join(static, 'jquery', 'css', 'themes', 'base',
             # 'jquery-ui.min.css'),
             # os.path.join(static, 'prettify', 'prettify.css'),
             os.path.join(css, 'boilerplate.css'),
             os.path.join(css, 'fbm.css'),
             os.path.join(css, 'notebook.css'),
             os.path.join(css, 'renderedhtml.css'),
             # our overrides:
             os.path.join(here, '..', 'css', 'static_html.css'),
         ]:
 
             with io.open(sheet, encoding='utf-8') as f:
                 s = f.read()
                 header.append(s)
 
         pygments_css = HtmlFormatter().get_style_defs('.highlight')
         header.append(pygments_css)
         return header
 
 inlining= {}
 inlining['css'] = header_body()
 
+
+def filter_data_type(output):
+    for fmt in ['html', 'pdf', 'svg', 'latex','png', 'jpg','jpeg' , 'text']:
+        if fmt in output:
+            return [fmt]
+
+
+env.filters['filter_data_type'] = filter_data_type
 env.filters['pycomment'] = python_comment
 env.filters['indent'] = indent
 env.filters['rm_fake'] = rm_fake
 env.filters['rm_ansi'] = remove_ansi
 env.filters['markdown'] = markdown
 env.filters['highlight'] = highlight
 env.filters['ansi2html'] = ansi2html
 
 class ConverterTemplate(Configurable):
 
     display_data_priority = ['pdf', 'svg', 'png', 'jpg', 'text']
     #-------------------------------------------------------------------------
     # Instance-level attributes that are set in the constructor for this
     # class.
     #-------------------------------------------------------------------------
     infile = Any()
 
 
     infile_dir = Unicode()
 
     def __init__(self, tplfile='fullhtml', config=None, **kw):
         self.template = env.get_template(tplfile+'.tpl')
         super(ConverterTemplate,self).__init__(config=config)
 
     def _get_prompt_number(self, cell):
         return cell.prompt_number if hasattr(cell, 'prompt_number') \
             else self.blank_symbol
 
 
     def process(self):
         converted_cells = []
         for worksheet in self.nb.worksheets:
             for cell in worksheet.cells:
                 cell.type = cell.cell_type
                 cell.haspyout = False
                 for out in cell.get('outputs',[]):
                     if out.output_type == 'pyout':
                         cell.haspyout = True
                         break
             converted_cells.append(worksheet)
 
         return converted_cells
 
     def convert(self, cell_separator='\n'):
         return self.template.render(worksheets=self.process(), inlining=inlining)
 
 
     def read(self, filename):
         "read and parse notebook into NotebookNode called self.nb"
         with io.open(filename) as f:
             self.nb = nbformat.read(f, 'json')
 

runme.py

@@ -1,10 +1,11 b''
 #!/usr/bin/env python
 # coding: utf-8
+
 from __future__ import print_function
 import sys
 import io
 from converters.template import *
 C = ConverterTemplate(tplfile=sys.argv[1])
-C.read('tests/ipynbref/IntroNumPy.orig.ipynb')
+C.read(sys.argv[2])
 
 print(C.convert().encode('utf-8'))

templates/basichtml.tpl

@@ -1,96 +1,121 b''
-{%- extends 'null.tpl' -%}
+{%- 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">
-<pre>{{output.text | ansi2html}}</pre>
+{% block data_priority scoped %}{{ super()}}{% endblock %}
 </div>
 {%- endblock pyout %}
 
 {% block stream -%}
 <div class="output_subarea output_stream output_stdout">
 <pre>{{output.text |ansi2html}}</pre>
 </div>
 {%- endblock stream %}
 
-{% block display_data -%}
-<div class="output_subarea output_display_data">
+{% block data_svg -%}
 {{output.svg}}
 </div>
-{%- endblock display_data %}
+{%- endblock data_svg %}
 
 
+{% block data_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 -%}

templates/null.tpl

@@ -1,78 +1,81 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 -%}
                                     {%- elif output.output_type in ['display_data'] -%}
-                                        {%- block display_data scoped -%}{%- endblock 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 -%}