diff --git a/nbconvert/exporters/exporter.py b/nbconvert/exporters/exporter.py index 85374dd..8760977 100755 --- a/nbconvert/exporters/exporter.py +++ b/nbconvert/exporters/exporter.py @@ -172,7 +172,7 @@ class Exporter(Configurable): @property def default_config(self): if self._default_config: - return deepcopy(self._default_config) + return Config(deepcopy(self._default_config)) else : return Config({}) diff --git a/nbconvert/exporters/latex.py b/nbconvert/exporters/latex.py index 2676d60..be72bd4 100755 --- a/nbconvert/exporters/latex.py +++ b/nbconvert/exporters/latex.py @@ -21,6 +21,7 @@ import os # IPython imports from IPython.utils.traitlets import Unicode +from IPython.config import Config # other libs/dependencies from jinja2 import Environment, FileSystemLoader @@ -74,11 +75,10 @@ class LatexExporter(exporter.Exporter): #Extension that the template files use. template_extension = Unicode(".tplx", config=True) - _default_config = Config({ - 'ExtractFigureTransformer' : { + _default_config = Config({ 'display_data_priority' : ['latex', 'svg', 'png', 'jpg', 'jpeg' , 'text'], - 'extra_ext_map':{'svg':'pdf'} - } + 'extra_ext_map':{'svg':'pdf'}, + 'ExtractFigureTransformer' : Config({'enabled':True}) }) def __init__(self, transformers=None, filters=None, config=None, **kw): @@ -104,11 +104,11 @@ class LatexExporter(exporter.Exporter): c = self.default_config if config : - c.update(config) + c._merge(Config(config)) super(LatexExporter, self).__init__(transformers, filters, config=c, **kw) - self.extract_figure_transformer.extra_ext_map={'svg':'pdf'} + #self.extract_figure_transformer.extra_ext_map={'svg':'pdf'} def _register_filters(self): diff --git a/nbconvert/exporters/rst.py b/nbconvert/exporters/rst.py index 6eb4aaf..f3c73d6 100644 --- a/nbconvert/exporters/rst.py +++ b/nbconvert/exporters/rst.py @@ -43,7 +43,7 @@ class RstExporter(exporter.Exporter): c = self.default_config if config : - c.update(config) + c._merge(config) super(RstExporter, self).__init__(transformers=transformers, filters=filters,