From 5acd1eecec3434f17ebcdb922f6cb7adc594993a 2013-02-13 19:30:07
From: Matthias BUSSONNIER <bussonniermatthias@gmail.com>
Date: 2013-02-13 19:30:07
Subject: [PATCH] some improvement

---

diff --git a/converters/template.py b/converters/template.py
index 1d66567..1b718ce 100755
--- a/converters/template.py
+++ b/converters/template.py
@@ -92,7 +92,7 @@ def header_body():
     header.append(pygments_css)
     return header
 
-
+# todo, make the key part configurable.
 def _new_figure(data, fmt, count):
     """Create a new figure file in the given format.
 
@@ -158,48 +158,55 @@ texenv.filters['markdown'] = markdown
 texenv.filters['highlight'] = highlight
 texenv.filters['ansi2html'] = ansi2html
 texenv.filters['markdown2latex'] = markdown2latex
-markdown2latex
-
-
-def haspyout_transformer(nb,_):
-    for worksheet in 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
-    return nb,_
-
-
-def outline_figure_transformer(nb,other):
-    count=0
-    for worksheet in nb.worksheets:
-        for cell in worksheet.cells:
-            cell.type = cell.cell_type
-            for i,out in enumerate(cell.get('outputs', [])):
-                print('loop outputs',out.output_type) 
-                for type in ['html', 'pdf', 'svg', 'latex', 'png', 'jpg', 'jpeg']:
-                    if out.hasattr(type):
-                        figname,data = _new_figure(out[type], type,count)
-                        cell.outputs[i][type] = figname
-                        out[type] = figname
-                        print('set',type, 'to' ,figname)
-                        other[figname] = data
-                        count = count+1
-    return nb,other
 
+def cell_preprocessor(function):
+    """ wrap a function to be executed on all cells of a notebook
+
+    wrapped function  parameters :
+    cell  : the cell
+    other : external resources
+    index : index of the cell
+    """
+    def wrappedfunc(nb,other):
+        for worksheet in nb.worksheets :
+            for index, cell in enumerate(worksheet.cells):
+                worksheet.cells[index],other= function(cell,other,index)
+        return nb,other
+    return wrappedfunc
+
+
+
+@cell_preprocessor
+def haspyout_transformer(cell, other, count):
+    """
+    Add a haspyout flag to cell that have it
+    
+    Easier for templating, where you can't know in advance
+    wether to write the out prompt
 
-def print_transformer(nb,other):
-    count=0
-    for worksheet in nb.worksheets:
-        for cell in worksheet.cells:
-            cell.type = cell.cell_type
-            for i,out in enumerate(cell.get('outputs', [])):
-                print(cell.outputs) 
+    """
+    cell.type = cell.cell_type
+    cell.haspyout = False
+    for out in cell.get('outputs', []):
+        if out.output_type == 'pyout':
+            cell.haspyout = True
+            break
+    return cell,other
+
+
+@cell_preprocessor
+def outline_figure_transformer(cell,other,count):
+    for i,out in enumerate(cell.get('outputs', [])):
+        for type in ['html', 'pdf', 'svg', 'latex', 'png', 'jpg', 'jpeg']:
+            if out.hasattr(type):
+                figname,data = _new_figure(out[type], type,count)
+                cell.outputs[i][type] = figname
+                out['key_'+type] = figname
+                other[figname] = data
+                count = count+1
     return nb,other
 
+
 class ConverterTemplate(Configurable):
     """ A Jinja2 base converter templates"""
 
@@ -210,6 +217,14 @@ class ConverterTemplate(Configurable):
                     to user input before code is run.
                     """
             )
+
+    extract_figures = Bool(False,
+            config=True,
+              help= """
+                    wether to remove figure data from ipynb and store them in auxiliary
+                    dictionnary
+                    """
+            )
     #-------------------------------------------------------------------------
     # Instance-level attributes that are set in the constructor for this
     # class.
@@ -218,8 +233,6 @@ class ConverterTemplate(Configurable):
 
 
     infile_dir = Unicode()
-    def display_data_priority_changed(self, name, old, new):
-        print('== changed', name,old,new)
 
     def filter_data_type(self,output):
         for fmt in self.display_data_priority:
@@ -237,12 +250,11 @@ class ConverterTemplate(Configurable):
 
         """
         self.env = texenv if tex_environement else env
-        self.ext = '.tplx' if tex_environement else '.tpl' 
+        self.ext = '.tplx' if tex_environement else '.tpl'
         self.nb = None
         self.preprocessors = preprocessors
         self.preprocessors.append(haspyout_transformer)
         self.preprocessors.append(outline_figure_transformer)
-        self.preprocessors.append(print_transformer)
         super(ConverterTemplate, self).__init__(config=config, **kw)
         self.env.filters['filter_data_type'] = self.filter_data_type
         self.template = self.env.get_template(tplfile+self.ext)
@@ -251,8 +263,8 @@ class ConverterTemplate(Configurable):
 
     def process(self):
         """
-        preprocess the notebook json for easier use with the templates. 
-        will call all the `preprocessor`s in order before returning it. 
+        preprocess the notebook json for easier use with the templates.
+        will call all the `preprocessor`s in order before returning it.
         """
         nb = self.nb
 
diff --git a/templates/tex/latex_base.tplx b/templates/tex/latex_base.tplx
index e529259..302762e 100644
--- a/templates/tex/latex_base.tplx
+++ b/templates/tex/latex_base.tplx
@@ -36,7 +36,6 @@ it introduces a new line
 \end{codeoutput}((* endblock *))
 
 ((*- block data_png -*))
-++(((output.png)))++
 \begin{center}
 \includegraphics[width=0.7\textwidth]{(((output.png)))}
 \par