Part way through adding 'flavor' support

IPython/nbconvert/exporters/__init__.py

@@ -1,11 +1,7 b''
-from .basichtml import BasicHTMLExporter
+from .html import HTMLExporter
 from .export import *
 from .exporter import Exporter
-from .fullhtml import FullHTMLExporter
-from .reveal import RevealExporter
 from .latex import LatexExporter
 from .markdown import MarkdownExporter
 from .python import PythonExporter
 from .rst import RSTExporter
-from .sphinx_howto import SphinxHowtoExporter
-from .sphinx_manual import SphinxManualExporter

IPython/nbconvert/exporters/export.py

@@ -19,15 +19,11 b' from IPython.nbformat.v3.nbbase import NotebookNode'
 from IPython.config import Config
 
 from .exporter import Exporter
-from .basichtml import BasicHTMLExporter
-from .fullhtml import FullHTMLExporter
+from .html import HTMLExporter
 from .latex import LatexExporter
 from .markdown import MarkdownExporter
 from .python import PythonExporter
-from .reveal import RevealExporter
 from .rst import RSTExporter
-from .sphinx_howto import SphinxHowtoExporter
-from .sphinx_manual import SphinxManualExporter
 
 #-----------------------------------------------------------------------------
 # Classes
@@ -69,14 +65,10 b' def DocDecorator(f):'
 
 __all__ = [
     'export',
-    'export_sphinx_manual',
-    'export_sphinx_howto',
-    'export_basic_html',
-    'export_full_html',
+    'export_html',
     'export_latex',
     'export_markdown',
     'export_python',
-    'export_reveal',
     'export_rst',
     'export_by_name',
     'get_export_names',
@@ -126,35 +118,11 b' def export(exporter, nb, **kw):'
 
 
 @DocDecorator
-def export_sphinx_manual(nb, **kw):
-    """
-    Export a notebook object to Sphinx Manual LaTeX
-    """
-    return export(SphinxManualExporter, nb, **kw)
-
-
-@DocDecorator
-def export_sphinx_howto(nb, **kw):
-    """
-    Export a notebook object to Sphinx HowTo LaTeX
-    """
-    return export(SphinxHowtoExporter, nb, **kw)
-
-
-@DocDecorator
-def export_basic_html(nb, **kw):
+def export_html(nb, **kw):
     """
     Export a notebook object to Basic HTML
     """
-    return export(BasicHTMLExporter, nb, **kw)
-
-
-@DocDecorator
-def export_full_html(nb, **kw):
-    """
-    Export a notebook object to Full HTML
-    """
-    return export(FullHTMLExporter, nb, **kw)
+    return export(HTMLExporter, nb, **kw)
 
 
 @DocDecorator
@@ -182,14 +150,6 b' def export_python(nb, **kw):'
 
 
 @DocDecorator
-def export_reveal(nb, **kw):
-    """
-    Export a notebook object to a Reveal.js presentation
-    """
-    return export(RevealExporter, nb, **kw)
-
-
-@DocDecorator
 def export_rst(nb, **kw):
     """
     Export a notebook object to reStructuredText

IPython/nbconvert/exporters/exporter.py

@@ -86,16 +86,17 b' class Exporter(Configurable):'
     transformers provided by default suffice, there is no need to inherit from
     this class.  Instead, override the template_file and file_extension
     traits via a config file.
-    
-    {filters}
     """
     
     # finish the docstring
     __doc__ = __doc__.format(filters = '- '+'\n    - '.join(default_filters.keys()))
 
 
+    flavor = Unicode(config=True, help="""Flavor of the data format to use.  
+        I.E. 'full' or 'basic'""")
+
     template_file = Unicode(
-            '', config=True,
+            config=True,
             help="Name of the template file to use")
 
     file_extension = Unicode(
@@ -155,6 +156,9 b' class Exporter(Configurable):'
         extra_loaders : list[of Jinja Loaders]
             ordered list of Jinja loder to find templates. Will be tried in order
             before the default FileSysteme ones.
+        flavor : str
+            Flavor to use when exporting.  This determines what template to use
+            if one hasn't been specifically provided.
         """
         
         #Call the base class constructor
@@ -165,6 +169,7 b' class Exporter(Configurable):'
         super(Exporter, self).__init__(config=c, **kw)
 
         #Init
+        self._init_template(**kw)
         self._init_environment(extra_loaders=extra_loaders)
         self._init_transformers()
         self._init_filters()
@@ -329,6 +334,25 b' class Exporter(Configurable):'
             raise TypeError('filter')
 
         
+    def _init_template(self, **kw):
+        """
+        Make sure a template name is specified.  If one isn't specified, try to
+        build one from the information we know.
+        """
+
+        # Set the template_file if it has not been set explicitly.
+        if not self.template_file:
+
+            # Build the template file name from the name of the exporter and the
+            # flavor (if available).  The flavor can be set on the traitlet
+            # or passed in as a kw arg.  The flavor specified in kw overrides
+            # what is set in the flavor traitlet.
+            if self.flavor or 'flavor' in kw:
+                self.template_file = self.__name__ + '_' + kw.get('flavor', self.flavor)
+            else:
+                self.template_file = self.__name__
+        
+
     def _init_environment(self, extra_loaders=None):
         """
         Create the Jinja templating environment.

IPython/nbconvert/exporters/html.py

@@ -24,7 +24,7 b' from .exporter import Exporter'
 # Classes
 #-----------------------------------------------------------------------------
 
-class BasicHTMLExporter(Exporter):
+class HTMLExporter(Exporter):
     """
     Exports a basic HTML document.  This exporter assists with the export of
     HTML.  Inherit from it if you are writing your own HTML template and need
@@ -37,6 +37,18 b' class BasicHTMLExporter(Exporter):'
         help="Extension of the file that should be written to disk"
         )
 
-    template_file = Unicode(
-            'basichtml', config=True,
-            help="Name of the template file to use")
+    flavor = Unicode('full', config=True, help="""Flavor of the data format to 
+        use.  I.E. 'full' or 'basic'""")
+
+    @property
+    def default_config(self):
+        c = Config({
+            'CSSHTMLHeaderTransformer':{
+                'enabled':True
+                },
+            'RevealHelpTransformer':{
+                'enabled':True,
+                },                
+            })
+        c.merge(super(RevealExporter,self).default_config)
+        return c

IPython/nbconvert/exporters/latex.py

@@ -44,9 +44,8 b' class LatexExporter(Exporter):'
         'tex', config=True, 
         help="Extension of the file that should be written to disk")
 
-    template_file = Unicode(
-        'base', config=True,
-        help="Name of the template file to use")
+    flavor = Unicode('article', config=True, help="""Flavor of the data format to 
+        use.  I.E. 'full' or 'basic'""")
 
     #Latex constants
     default_template_path = Unicode(
@@ -68,6 +67,7 b' class LatexExporter(Exporter):'
     #Extension that the template files use.    
     template_extension = Unicode(".tplx", config=True)
 
+
     @property
     def default_config(self):
         c = Config({
@@ -83,6 +83,9 b' class LatexExporter(Exporter):'
              'LatexTransformer': {
                     'enabled':True
                  }
+             'SphinxTransformer': {
+                    'enabled':True
+                 }
          })
         c.merge(super(LatexExporter,self).default_config)
         return c

IPython/nbconvert/exporters/markdown.py

@@ -29,7 +29,3 b' class MarkdownExporter(Exporter):'
     file_extension = Unicode(
         'md', config=True, 
         help="Extension of the file that should be written to disk")
-
-    template_file = Unicode(
-            'markdown', config=True,
-            help="Name of the template file to use")

IPython/nbconvert/exporters/python.py

@@ -29,7 +29,3 b' class PythonExporter(Exporter):'
     file_extension = Unicode(
         'py', config=True, 
         help="Extension of the file that should be written to disk")
-
-    template_file = Unicode(
-            'python', config=True,
-            help="Name of the template file to use")

IPython/nbconvert/exporters/rst.py

@@ -31,10 +31,6 b' class RSTExporter(Exporter):'
         'rst', config=True, 
         help="Extension of the file that should be written to disk")
 
-    template_file = Unicode(
-            'rst', config=True,
-            help="Name of the template file to use")
-
     @property
     def default_config(self):
         c = Config({'ExtractOutputTransformer':{'enabled':True}})