From 2b3c80d12efc4cf3f4b8ab382e7cce81658d11f3 2013-05-15 15:44:05
From: Jonathan Frederic <jdfreder@calpoly.edu>
Date: 2013-05-15 15:44:05
Subject: [PATCH] Made exporter names match template names.

---

diff --git a/nbconvert/api/html.py b/nbconvert/api/basichtml.py
similarity index 90%
rename from nbconvert/api/html.py
rename to nbconvert/api/basichtml.py
index 9fe3060..8e65354 100644
--- a/nbconvert/api/html.py
+++ b/nbconvert/api/basichtml.py
@@ -21,7 +21,7 @@ from IPython.utils.traitlets import Unicode
 #-----------------------------------------------------------------------------
 # Classes
 #-----------------------------------------------------------------------------
-class HtmlExporter(exporter.Exporter):
+class BasicHtmlExporter(exporter.Exporter):
 
     file_extension = Unicode(
         'html', config=True, 
@@ -29,13 +29,13 @@ class HtmlExporter(exporter.Exporter):
         )
 
     template_file = Unicode(
-            'fullhtml', config=True,
+            'basichtml', config=True,
             help="Name of the template file to use")
 
     def _register_transformers(self):
         
         #Register the transformers of the base class.
-        super(HtmlExporter, self)._register_transformers()
+        super(BasicHtmlExporter, self)._register_transformers()
         
         #Register latex transformer
         self.register_transformer(nbconvert.transformers.csshtmlheader.CSSHtmlHeaderTransformer)
diff --git a/nbconvert/api/fullhtml.py b/nbconvert/api/fullhtml.py
new file mode 100644
index 0000000..db55652
--- /dev/null
+++ b/nbconvert/api/fullhtml.py
@@ -0,0 +1,27 @@
+"""TODO: Docstring
+"""
+
+#-----------------------------------------------------------------------------
+# Copyright (c) 2013, the 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
+#-----------------------------------------------------------------------------
+
+# local import
+import basichtml.BasicHtmlExporter
+from IPython.utils.traitlets import Unicode
+
+#-----------------------------------------------------------------------------
+# Classes
+#-----------------------------------------------------------------------------
+class FullHtmlExporter(basichtml.BasicHtmlExporter):
+
+    template_file = Unicode(
+            'fullhtml', config=True,
+            help="Name of the template file to use")    
\ No newline at end of file
diff --git a/nbconvert/api/python_armor.py b/nbconvert/api/python_armor.py
new file mode 100644
index 0000000..61ed281
--- /dev/null
+++ b/nbconvert/api/python_armor.py
@@ -0,0 +1,27 @@
+"""TODO: Docstring
+"""
+
+#-----------------------------------------------------------------------------
+# Copyright (c) 2013, the 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
+#-----------------------------------------------------------------------------
+
+# local import
+import python.PythonExporter
+from IPython.utils.traitlets import Unicode
+
+#-----------------------------------------------------------------------------
+# Classes
+#-----------------------------------------------------------------------------
+class PythonArmorExporter(python.PythonExporter):
+
+    template_file = Unicode(
+            'python_armor', config=True,
+            help="Name of the template file to use")
diff --git a/nbconvert/api/sphinx.py b/nbconvert/api/sphinx_howto.py
similarity index 92%
rename from nbconvert/api/sphinx.py
rename to nbconvert/api/sphinx_howto.py
index 8b97822..c258c2c 100644
--- a/nbconvert/api/sphinx.py
+++ b/nbconvert/api/sphinx_howto.py
@@ -18,7 +18,7 @@ from nbconvert.transformers.sphinx import SphinxTransformer
 #-----------------------------------------------------------------------------
 # Classes
 #-----------------------------------------------------------------------------
-class SphinxExporter(latex.LatexExporter):
+class SphinxHowtoExporter(latex.LatexExporter):
 
     template_file = Unicode(
             'sphinx_howto', config=True,
@@ -27,7 +27,7 @@ class SphinxExporter(latex.LatexExporter):
     def _register_transformers(self):
         
         #Register the transformers of the base class.
-        super(SphinxExporter, self)._register_transformers()
+        super(SphinxHowtoExporter, self)._register_transformers()
         
         #Register sphinx latex transformer
         self.register_transformer(SphinxTransformer) 
diff --git a/nbconvert/api/sphinx_manual.py b/nbconvert/api/sphinx_manual.py
new file mode 100644
index 0000000..1db831e
--- /dev/null
+++ b/nbconvert/api/sphinx_manual.py
@@ -0,0 +1,25 @@
+
+#-----------------------------------------------------------------------------
+# Copyright (c) 2013, the 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
+#-----------------------------------------------------------------------------
+
+# local import
+import sphinx_howto.SphinxHowtoExporter
+from IPython.utils.traitlets import Unicode
+#-----------------------------------------------------------------------------
+# Classes
+#-----------------------------------------------------------------------------
+class SphinxManualExporter(sphinx_howto.SphinxHowtoExporter):
+
+    template_file = Unicode(
+            'sphinx_manual', config=True,
+            help="Name of the template file to use")
+    
\ No newline at end of file
diff --git a/nbconvert/templates/python-armor.tpl b/nbconvert/templates/python_armor.tpl
similarity index 100%
rename from nbconvert/templates/python-armor.tpl
rename to nbconvert/templates/python_armor.tpl