add raw_format to Exporter classes

sets their values in resources

IPython/nbconvert/exporters/exporter.py

@@ -1,5 +1,5 b''
-"""This module defines Exporter, a highly configurable converter
-that uses Jinja2 to export notebook files into different formats.
+"""This module defines a base Exporter class. For Jinja template-based export,
+see templateexporter.py.
 """
 
 #-----------------------------------------------------------------------------

IPython/nbconvert/exporters/html.py

@@ -1,6 +1,4 b''
-"""
-Exporter that exports Basic HTML.
-"""
+"""HTML Exporter class"""
 
 #-----------------------------------------------------------------------------
 # Copyright (c) 2013, the IPython Development Team.
@@ -40,7 +38,10 b' class HTMLExporter(TemplateExporter):'
 
     default_template = Unicode('full', config=True, help="""Flavor of the data 
         format to use.  I.E. 'full' or 'basic'""")
-
+    
+    def _raw_format_default(self):
+        return 'html'
+    
     @property
     def default_config(self):
         c = Config({

IPython/nbconvert/exporters/latex.py

@@ -1,9 +1,5 b''
-"""
-Exporter that allows Latex Jinja templates to work.  Contains logic to
-appropriately prepare IPYNB files for export to LaTeX.  Including but 
-not limited to escaping LaTeX, fixing math region tags, using special
-tags to circumvent Jinja/Latex syntax conflicts.
-"""
+"""LaTeX Exporter class"""
+
 #-----------------------------------------------------------------------------
 # Copyright (c) 2013, the IPython Development Team.
 #
@@ -67,6 +63,9 b' class LatexExporter(TemplateExporter):'
     #Extension that the template files use.    
     template_extension = Unicode(".tplx", config=True)
 
+    def _raw_format_default(self):
+        return 'latex'
+
 
     @property
     def default_config(self):

IPython/nbconvert/exporters/markdown.py

@@ -1,6 +1,5 b''
-"""
-Exporter that will export your ipynb to Markdown.
-"""
+"""Markdown Exporter class"""
+
 #-----------------------------------------------------------------------------
 # Copyright (c) 2013, the IPython Development Team.
 #
@@ -31,6 +30,12 b' class MarkdownExporter(TemplateExporter):'
         'md', config=True, 
         help="Extension of the file that should be written to disk")
 
+    def _raw_format_default(self):
+        return 'markdown'
+    
+    def _raw_formats_default(self):
+        return ['md', 'markdown', 'html']
+
     @property
     def default_config(self):
         c = Config({'ExtractOutputPreprocessor':{'enabled':True}})

IPython/nbconvert/exporters/python.py

@@ -1,6 +1,5 b''
-"""
-Python exporter which exports Notebook code into a PY file.
-"""
+"""Python script Exporter class"""
+
 #-----------------------------------------------------------------------------
 # Copyright (c) 2013, the IPython Development Team.
 #
@@ -29,3 +28,10 b' class PythonExporter(TemplateExporter):'
     file_extension = Unicode(
         'py', config=True, 
         help="Extension of the file that should be written to disk")
+
+    def _raw_format_default(self):
+        return 'python'
+    
+    def _raw_formats_default(self):
+        return ['py', 'python']
+

IPython/nbconvert/exporters/rst.py

@@ -1,6 +1,5 b''
-"""
-Exporter for exporting notebooks to restructured text.
-"""
+"""restructuredText Exporter class"""
+
 #-----------------------------------------------------------------------------
 # Copyright (c) 2013, the IPython Development Team.
 #
@@ -31,6 +30,12 b' class RSTExporter(TemplateExporter):'
         'rst', config=True, 
         help="Extension of the file that should be written to disk")
 
+    def _raw_format_default(self):
+        return 'rst'
+    
+    def _raw_formats_default(self):
+        return ['rst', 'restructuredtext']
+
     @property
     def default_config(self):
         c = Config({'ExtractOutputPreprocessor':{'enabled':True}})

IPython/nbconvert/exporters/slides.py

@@ -1,6 +1,4 b''
-"""
-Contains slide show exporter
-"""
+"""HTML slide show Exporter class"""
 
 #-----------------------------------------------------------------------------
 # Copyright (c) 2013, the IPython Development Team.
@@ -19,16 +17,14 b' from IPython.utils.traitlets import Unicode'
 from IPython.nbconvert import preprocessors
 from IPython.config import Config
 
-from .templateexporter import TemplateExporter
+from .html import HTMLExporter
 
 #-----------------------------------------------------------------------------
 # Classes
 #-----------------------------------------------------------------------------
 
-class SlidesExporter(TemplateExporter):
-    """
-    Exports slides
-    """
+class SlidesExporter(HTMLExporter):
+    """Exports HTML slides with reveal.js"""
     
     file_extension = Unicode(
         'slides.html', config=True, 
@@ -41,15 +37,9 b' class SlidesExporter(TemplateExporter):'
     @property
     def default_config(self):
         c = Config({
-            'CSSHTMLHeaderPreprocessor':{
-                'enabled':True
+            'RevealHelpPreprocessor': {
+                'enabled': True,
                 },
-            'RevealHelpPreprocessor':{
-                'enabled':True,
-                },                
-            'HighlightMagicsPreprocessor': {
-                'enabled':True
-                }
             })
         c.merge(super(SlidesExporter,self).default_config)
         return c

IPython/nbconvert/exporters/templateexporter.py

@@ -1,4 +1,4 b''
-"""This module defines Exporter, a highly configurable converter
+"""This module defines TemplateExporter, a highly configurable converter
 that uses Jinja2 to export notebook files into different formats.
 """
 
@@ -126,6 +126,13 b' class TemplateExporter(Exporter):'
         help="""Dictionary of filters, by name and namespace, to add to the Jinja
         environment.""")
 
+    raw_format = Unicode('')
+    raw_formats = List(config=True,
+        help="""formats of raw cells to be included in this Exporter's output."""
+    )
+    def _raw_formats_default(self):
+        return [self.raw_format]
+
 
     def __init__(self, config=None, extra_loaders=None, **kw):
         """
@@ -202,6 +209,8 b' class TemplateExporter(Exporter):'
           preprocessors and filters.
         """
         nb_copy, resources = super(TemplateExporter, self).from_notebook_node(nb, resources, **kw)
+        resources.setdefault('raw_format', self.raw_format)
+        resources.setdefault('raw_formats', self.raw_formats)
 
         self._load_template()