Removed ActivatableTransformer and moved enabled key into base.

IPython/nbconvert/transformers/__init__.py

@@ -1,5 +1,4 b''
 # Class base Transformers
-from .activatable import ActivatableTransformer
 from .base import ConfigurableTransformer
 from .convertfigures import ConvertFiguresTransformer
 from .svg2pdf import Svg2PdfTransformer

IPython/nbconvert/transformers/base.py

@@ -17,6 +17,7 b' It exposes a convenient class to inherit from to access configurability.'
 #-----------------------------------------------------------------------------
 
 from ..utils.config import GlobalConfigurable
+from IPython.utils.traitlets import Bool
 
 #-----------------------------------------------------------------------------
 # Classes and Functions
@@ -33,6 +34,9 b' class ConfigurableTransformer(GlobalConfigurable):'
 
     you can overwrite transform_cell to apply a transformation independently on each cell
     or __call__ if you prefer your own logic. See corresponding docstring for informations.
+
+    Disabled by default and can be enabled via the config by
+        'c.YourTransformerName.enabled = True'
     """
     
     enabled = Bool(False, config=True)
@@ -53,7 +57,11 b' class ConfigurableTransformer(GlobalConfigurable):'
 
        
     def __call__(self, nb, resources):
+        if self.enabled:
         return self.call(nb,resources)
+        else:
+            return nb, resources
+
 
     def call(self, nb, resources):
         """

IPython/nbconvert/transformers/convertfigures.py

@@ -15,13 +15,13 b' one format to another.'
 # Imports
 #-----------------------------------------------------------------------------
 
-from .activatable import ActivatableTransformer
+from .base import ConfigurableTransformer
 
 #-----------------------------------------------------------------------------
 # Classes
 #-----------------------------------------------------------------------------
 
-class ConvertFiguresTransformer(ActivatableTransformer):
+class ConvertFiguresTransformer(ConfigurableTransformer):
     """
     Converts all of the outputs in a notebook from one format to another.
     """

IPython/nbconvert/transformers/csshtmlheader.py

@@ -19,7 +19,7 b' from pygments.formatters import HtmlFormatter'
         
 from IPython.utils import path
 
-from .activatable import ActivatableTransformer
+from .base import ConfigurableTransformer
 
 from IPython.utils.traitlets import Unicode
         
@@ -27,7 +27,7 b' from IPython.utils.traitlets import Unicode'
 # Classes and functions
 #-----------------------------------------------------------------------------
 
-class CSSHTMLHeaderTransformer(ActivatableTransformer):
+class CSSHTMLHeaderTransformer(ConfigurableTransformer):
     """
     Transformer used to pre-process notebook for HTML output.  Adds IPython notebook
     front-end CSS and Pygments CSS to HTML output.

IPython/nbconvert/transformers/extractfigure.py

@@ -15,13 +15,13 b" notebook file. The extracted figures are returned in the 'resources' dictionary"
 
 import sys
 from IPython.utils.traitlets import Dict, Unicode
-from .activatable import ActivatableTransformer
+from .base import ConfigurableTransformer
 
 #-----------------------------------------------------------------------------
 # Classes
 #-----------------------------------------------------------------------------
 
-class ExtractFigureTransformer(ActivatableTransformer):
+class ExtractFigureTransformer(ConfigurableTransformer):
     """
     Extracts all of the figures from the notebook file.  The extracted 
     figures are returned in the 'resources' dictionary.

IPython/nbconvert/transformers/latex.py

@@ -17,14 +17,14 b' from __future__ import print_function, absolute_import'
 
 # Our own imports
 # Needed to override transformer
-from .activatable import (ActivatableTransformer)
+from .base import (ConfigurableTransformer)
 from IPython.nbconvert import filters
 
 #-----------------------------------------------------------------------------
 # Classes
 #-----------------------------------------------------------------------------
 
-class LatexTransformer(ActivatableTransformer):
+class LatexTransformer(ConfigurableTransformer):
     """
     Converter for latex destined documents.
     """

IPython/nbconvert/transformers/sphinx.py

@@ -33,7 +33,7 b' from pygments.formatters import LatexFormatter'
 from IPython.utils.traitlets import Unicode, Bool
 
 # Needed to override transformer
-from .activatable import (ActivatableTransformer) #TODO
+from .base import (ConfigurableTransformer)
 
 from IPython.nbconvert.utils import console  
 
@@ -41,7 +41,7 b' from IPython.nbconvert.utils import console'
 # Classes and functions
 #-----------------------------------------------------------------------------
 
-class SphinxTransformer(ActivatableTransformer):
+class SphinxTransformer(ConfigurableTransformer):
     """
     Sphinx utility transformer.