fix fileext and html multidisplay

profile/base_html.nbcv

@@ -1,8 +1,10 b''
 c = get_config()
 
 
 c.ConverterTemplate.extract_figures=False
 c.ConverterTemplate.template_file='basichtml'
 c.ConverterTemplate.tex_environement=False
 
+c.NbconvertApp.fileext='html'
+
 c.ExtractFigureTransformer.enabled = False

profile/full_html.nbcv

@@ -1,8 +1,10 b''
 c = get_config()
 
 
 c.ConverterTemplate.extract_figures=False
 c.ConverterTemplate.template_file='fullhtml'
 c.ConverterTemplate.tex_environement=False
 
+c.NbconvertApp.fileext='html'
+
 c.ExtractFigureTransformer.enabled = False

profile/latex_base.nbcv

@@ -1,10 +1,11 b''
 c = get_config()
 
 c.ConverterTemplate.extract_figures=True
 c.ConverterTemplate.template_file='latex_base'
 c.ConverterTemplate.tex_environement=True
 c.ConverterTemplate.display_data_priority=['latex', 'svg', 'png', 'jpg', 'jpeg' , 'text']
 c.ExtractFigureTransformer.display_data_priority=['latex', 'svg', 'png', 'jpg', 'jpeg']
+c.NbconvertApp.fileext='tex'
 
 c.ExtractFigureTransformer.extra_ext_map={'svg':'pdf'}
 c.ExtractFigureTransformer.enabled=True

profile/python.nbcv

@@ -1,5 +1,7 b''
 c = get_config()
 
 c.ConverterTemplate.extract_figures=False
 c.ConverterTemplate.template_file='python'
 c.ConverterTemplate.tex_environement=False
+
+c.NbconvertApp.fileext='py'

runme.py

@@ -1,135 +1,137 b''
 #!/usr/bin/env python
 """
 ================================================================================
 
 |,---.     |    |                 ,   .|                                   |
 ||---',   .|--- |---.,---.,---.   |\  ||---.,---.,---.,---..    ,,---.,---.|---
 ||    |   ||    |   ||   ||   |   | \ ||   ||    |   ||   | \  / |---'|    |
 ``    `---|`---'`   '`---'`   '   `  `'`---'`---'`---'`   '  `'  `---'`    `---'
       `---'
 ================================================================================
 
 Highly experimental for now
 
 """
 #-----------------------------------------------------------------------------
 # Imports
 #-----------------------------------------------------------------------------
 from __future__ import print_function
 import sys
 import io
 import os
 
 from converters.template import *
 from converters.template import ConverterTemplate
 from converters.html import ConverterHTML
 # From IPython
 
 # All the stuff needed for the configurable things
 from IPython.config.application import Application
 from IPython.config.loader import ConfigFileNotFound
 from IPython.utils.traitlets import List, Unicode, Type, Bool, Dict, CaselessStrEnum
 
 from converters.transformers import (ConfigurableTransformers,Foobar,ExtractFigureTransformer)
 
 
 class NbconvertApp(Application):
 
     stdout = Bool(True, config=True)
     write = Bool(False, config=True)
 
+    fileext = Unicode('txt', config=True)
+
     aliases = {
             'stdout':'NbconvertApp.stdout',
             'write':'NbconvertApp.write',
             }
 
     flags= {}
     flags['no-stdout'] = (
         {'NbconvertApp' : {'stdout' : False}},
     """the doc for this flag
 
     """
     )
 
     def __init__(self, **kwargs):
         super(NbconvertApp, self).__init__(**kwargs)
         self.classes.insert(0,ConverterTemplate)
         # register class here to have help with help all
         self.classes.insert(0,ExtractFigureTransformer)
         self.classes.insert(0,Foobar)
         # ensure those are registerd
 
     def load_config_file(self, profile_name):
         try:
             Application.load_config_file(
                 self,
                 profile_name+'.nbcv',
                 path=[os.path.join(os.getcwdu(),'profile')]
             )
         except ConfigFileNotFound:
             self.log.warn("Config file for profile '%s' not found, giving up ",profile_name)
             exit(1)
 
 
     def initialize(self, argv=None):
         self.parse_command_line(argv)
         cl_config = self.config
         profile_file = sys.argv[1]
         self.load_config_file(profile_file)
         self.update_config(cl_config)
 
 
 
     def run(self):
         """Convert a notebook to html in one step"""
         template_file = (self.extra_args or [None])[0]
         ipynb_file = (self.extra_args or [None])[1]
 
         template_file = sys.argv[1]
 
         C = ConverterTemplate(config=self.config)
         C.read(ipynb_file)
 
         output,resources = C.convert()
         if self.stdout :
             print(output.encode('utf-8'))
 
         out_root = ipynb_file[:-6].replace('.','_').replace(' ','_')
 
         keys = resources.keys()
         if self.write :
-            with io.open(os.path.join(out_root+'.'+'ext'),'w') as f:
+            with io.open(os.path.join(out_root+'.'+self.fileext),'w') as f:
                         f.write(output)
         if keys :
             if self.write and not os.path.exists(out_root+'_files'):
                 os.mkdir(out_root+'_files')
             for key in keys:
                 if self.write:
                     with io.open(os.path.join(out_root+'_files',key),'wb') as f:
                         print(' writing to ',os.path.join(out_root,key))
                         f.write(resources[key])
             if self.stdout:
                 print('''
 ====================== Keys in Resources ==================================
 ''')
                 print(resources.keys())
                 print("""
 ===========================================================================
 you are responsible from writing those data do a file in the right place if
 they need to be.
 ===========================================================================
                   """)
 
 def main():
     """Convert a notebook to html in one step"""
     app = NbconvertApp.instance()
     app.description = __doc__
     app.initialize()
     app.start()
     app.run()
 #-----------------------------------------------------------------------------
 # Script main
 #-----------------------------------------------------------------------------
 
 if __name__ == '__main__':
     main()

templates/basichtml.tpl

@@ -1,132 +1,147 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_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">
+<div class="output vbox">
 {%- if cell.haspyout -%}
 Out[{{cell.prompt_number}}]:
 {%- endif -%}
 </div>
+</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">
+<div class="hbox output_area">
+<div class="prompt"></div>
+<div class="box-flex1 output_subarea output_pyout">
 {% block data_priority scoped %}{{ super()}}{% endblock %}
 </div>
+</div>
 {%- endblock pyout %}
 
 {% block stream_stdout -%}
-<div class="output_subarea output_stream output_stdout">
+<div class="hbox output_area">
+<div class="prompt"></div>
+<div class="box-flex1 output_subarea output_stream output_stdout">
 <pre>{{output.text |ansi2html}}</pre>
 </div>
+</div>
 {%- endblock stream_stdout %}
 
 {% block stream_stderr -%}
-<div class="output_subarea output_stream output_stderr">
+<div class="hbox output_area">
+<div class="prompt"></div>
+<div class="box-flex1 output_subarea output_stream output_stderr">
 <pre>{{output.text |ansi2html}}</pre>
 </div>
+</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}}"></img>
 {%- endblock data_png %}
 
 
 {% block data_jpg %}
 <img src="data:image/jpeg;base64,{{output.jpeg}}"></img>
 {%- endblock data_jpg %}
 
 
 {% block data_latex %}
 {{output.latex}}
 {%- endblock data_latex %}
 
 {% block pyerr -%}
-<div class="output_subarea output_pyerr">
+<div class="hbox output_area">
+<div class="prompt"></div>
+<div class="box-flex1 output_subarea output_pyerr">
 <pre>{{super()}}</pre>
 </div>
+</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">
+<div class="hbox output_area">
+<div class="prompt"></div>
+<div class="box-flex1 output_subarea output_display_data">
 {{super()}}
 </div>
+</div>
 {%- endblock display_data -%}