deal with worksheets

converters/template.py

@@ -1,107 +1,102
 """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
 import pprint
 import re
 from types import FunctionType
 
 from jinja2 import Environment, PackageLoader, FileSystemLoader
 env = Environment(loader=FileSystemLoader('./templates/'))
 
 # 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
 #-----------------------------------------------------------------------------
 # Class declarations
 #-----------------------------------------------------------------------------
 def rm_fake(strng):
     return strng.replace('/files/', '')
 
 class ConversionException(Exception):
     pass
 
 
 def python_comment(string):
     return '# '+'\n# '.join(string.split('\n'))
 
 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
 
 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
-                converted_cells.append(cell)
-                continue
-                if cell.cell_type in ('code'):
-                    converted_cells.append({'type':'code','source':cell.input})
-                else :
-                    converted_cells.append({'type':cell.cell_type,'source': python_comment(cell.source)})
+            converted_cells.append(worksheet)
 
         return converted_cells
 
     def convert(self, cell_separator='\n'):
-        return self.template.render(cells=self.process()) 
+        return self.template.render(worksheets=self.process())
 
 
     def read(self, filename):
         "read and parse notebook into NotebookNode called self.nb"
         with open(filename) as f:
             self.nb = nbformat.read(f, 'json')
 

templates/basic.tpl

@@ -1,27 +1,29
 {%- block header -%}
 {%- endblock header -%}
 {%- block body -%}
-{%- for cell in cells -%}
-    {%- block any_cell scoped -%}
-        {%- if cell.type in ['code'] -%}
-            {%- block codecell scoped-%}
-            {%- 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 -%}
+{%- for worksheet in worksheets -%}
+    {%- for cell in worksheet.cells -%}
+        {%- block any_cell scoped -%}
+            {%- if cell.type in ['code'] -%}
+                {%- block codecell scoped-%}
+                {%- 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 -%}

templates/null.tpl

@@ -1,57 +1,55
 {%- extends 'basic.tpl' -%}
 
 {#
 
 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 nt 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 codecell scoped  %}
 {% block in_prompt %}{% endblock in_prompt %}
 {% block input %}{% endblock input %}
 {% if cell.outputs %}
 {% block output_prompt %}{% endblock output_prompt %}
 {%- 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 %}
     {%- 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 -%}
-{% endif %}
+{% endif -%}
+{%- endblock codecell %}
 
-{% endblock codecell %}
-
-{% block markdowncell scoped %}
-{% endblock markdowncell %}
+{% block markdowncell scoped %}{% endblock markdowncell %}
 
 {% block headingcell scoped %}
 {% endblock headingcell %}
 
 {% block rawcell scoped %}
 {% endblock rawcell %}
 
 {% block unknowncell scoped %}
 {% endblock unknowncell %}

templates/python-armor.tpl

@@ -1,9 +1,31
 {%- extends 'python.tpl' -%}
 
-{% block any_cell %}
+{#% block any_cell %}
 ==============================
 =======start {{cell.type}}=========
 {{ super() }}
 ======= end {{cell.type}} =========
-=============================={% endblock any_cell %}
+=============================={% endblock any_cell %#}
+
+
+
+{% block markdowncell %}---- Start MD ----{{ super() }}
+---- End MD ----
+{% endblock markdowncell %}
+
+{% block codecell %}---- Start Code ----{{ super() }}
+---- End Code ----
+{% endblock codecell %}
+
+{% block headingcell scoped %}---- Start heading ----{{ super() }}
+---- End heading ----
+{% endblock headingcell %}
+
+{% block rawcell scoped %}---- Start Raw ----
+{{ super() }}
+---- End Raw ----{% endblock rawcell %}
+
+{% block unknowncell scoped %}
+unknown type  {{cell.type}}
+{% endblock unknowncell %}
 

templates/python.tpl

@@ -1,54 +1,40
 {%- extends 'null.tpl' -%}
 
 {% block in_prompt %}
 # In[{{cell.prompt_number if cell.prompt_number else ' '}}]:{% endblock in_prompt %}
 
 {% block traceback_line %}
 {{ line |indent| rm_ansi }}
 {% endblock traceback_line %}
 
 
 {% block pyout %}
 {{ output.text| indent | pycomment}}{% endblock pyout %}
 
 {% block stream %}
 {{ output.text| indent | pycomment}}
 {% endblock stream %}
 
 {% block output_prompt %}# Out[{{cell.prompt_number}}]:{% endblock output_prompt %}
 
 
 {% block input %}{{ cell.input }}{% endblock input %}
 
 {% block display_data scoped %}
 # image file:{% endblock display_data %}
 
-{#
-{%  block codecell scoped  %}
-# In[{{cell.prompt_number if cell.prompt_number else ' '}}]:
-{% if cell.outputs %}
-{%- for output in cell.outputs -%}
-    {%- if output.output_type in ['pyout','stream']%}
-
-    {%- elif output.output_type in ['display_data'] %}
-{{"# image file: fucking display_data"}}
-{%- endfor -%}
-{% endif %}
-
-{% endblock codecell %}
-#}
-
 {% block markdowncell scoped %}
-{{ cell.source | pycomment | rm_fake}}{% endblock markdowncell %}
+{{ cell.source | pycomment }}
+{% endblock markdowncell %}
 
 {% block headingcell scoped %}
 {{ '#' * cell.level }}{{ cell.source | pycomment}}
 {% endblock headingcell %}
 
 {% block rawcell scoped %}
 {{ cell.source | pycomment }}
 {% endblock rawcell %}
 
 {% block unknowncell scoped %}
 unknown type  {{cell.type}}
 {% endblock unknowncell %}