Merge pull request #101 from juhasch/feature/markdown

render markdown output in rst
jupyter · Sep 15, 2015 · eb5273f · eb5273f
2 parents e111266 + 4b0253d
commit eb5273f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/nbconvert/templates/rst.tpl b/nbconvert/templates/rst.tpl
@@ -49,6 +49,10 @@
 .. image:: {{ output.metadata.filenames['image/jpeg'] | urlencode }}
 {% endblock data_jpg %}
 
+{% block data_markdown %}
+{{ output.data['text/markdown'] | markdown2rst }}
+{% endblock data_markdown %}
+
 {% block data_latex %}
 .. math::
 

diff --git a/nbconvert/utils/base.py b/nbconvert/utils/base.py
@@ -13,7 +13,7 @@ class NbConvertBase(LoggingConfigurable):
     Useful for display data priority that might be use by many transformers
     """
 
-    display_data_priority = List(['text/html', 'application/pdf', 'text/latex', 'image/svg+xml', 'image/png', 'image/jpeg', 'text/plain'],
+    display_data_priority = List(['text/html', 'application/pdf', 'text/latex', 'image/svg+xml', 'image/png', 'image/jpeg', 'text/markdown', 'text/plain'],
             config=True,
               help= """
                     An ordered list of preferred output type, the first