Merge pull request #7459 from minrk/nbconvert-markdown

support markdown output in nbconvert

IPython/nbconvert/exporters/html.py

@@ -1,16 +1,7 b''
 """HTML Exporter class"""
 
-#-----------------------------------------------------------------------------
-# Copyright (c) 2013, the IPython Development Team.
-#
+# Copyright (c) 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
-#-----------------------------------------------------------------------------
 
 import os
 
@@ -46,7 +37,7 b' class HTMLExporter(TemplateExporter):'
     def default_config(self):
         c = Config({
             'NbConvertBase': {
-                'display_data_priority' : ['text/javascript', 'text/html', 'application/pdf', 'image/svg+xml', 'text/latex', 'image/png', 'image/jpeg', 'text/plain']
+                'display_data_priority' : ['text/javascript', 'text/html', 'text/markdown', 'application/pdf', 'image/svg+xml', 'text/latex', 'image/png', 'image/jpeg', 'text/plain']
                 },
             'CSSHTMLHeaderPreprocessor':{
                 'enabled':True

IPython/nbconvert/templates/html/basic.tpl

@@ -123,6 +123,12 b' unknown type {{ cell.type }}'
 </div>
 {%- endblock data_html %}
 
+{% block data_markdown scoped -%}
+<div class="output_markdown rendered_html output_subarea {{extra_class}}">
+{{ output.data['text/markdown'] | markdown2html }}
+</div>
+{%- endblock data_markdown %}
+
 {% block data_png scoped %}
 <div class="output_png output_subarea {{extra_class}}">
 {%- if 'image/png' in output.metadata.get('filenames', {}) %}

IPython/nbconvert/templates/latex/skeleton/display_priority.tplx

@@ -21,6 +21,9 b''
         ((*- elif type == 'text/html' -*))
             ((*- block data_html -*))
             ((*- endblock -*))
+        ((*- elif type == 'text/markdown' -*))
+            ((*- block data_markdown -*))
+            ((*- endblock -*))
         ((*- elif type == 'image/jpeg' -*))
             ((*- block data_jpg -*))
             ((*- endblock -*))

IPython/nbconvert/templates/markdown.tpl

@@ -50,6 +50,10 b''
 {{ output.data['text/html'] }}
 {% endblock data_html %}
 
+{% block data_markdown scoped %}
+{{ output.data['text/markdown'] }}
+{% endblock data_markdown %}
+
 {% block data_text scoped %}
 {{ output.data['text/plain'] | indent }}
 {% endblock data_text %}

IPython/nbconvert/templates/skeleton/display_priority.tpl

@@ -17,6 +17,9 b''
         {%- elif type == 'text/html' -%}
             {%- block data_html -%}
             {%- endblock -%}
+        {%- elif type == 'text/markdown' -%}
+            {%- block data_markdown -%}
+            {%- endblock -%}
         {%- elif type == 'image/jpeg' -%}
             {%- block data_jpg -%}
             {%- endblock -%}