handle 'application/pdf' in nbconvert

since we shouldn't add a 'pdf' shortcut

IPython/nbconvert/exporters/latex.py

@@ -67,7 +67,7 b' class LatexExporter(TemplateExporter):'
     def default_config(self):
         c = Config({
             'NbConvertBase': {
-                'display_data_priority' : ['latex', 'pdf', 'png', 'jpg', 'svg', 'jpeg', 'text']
+                'display_data_priority' : ['latex', 'application/pdf', 'png', 'jpg', 'svg', 'jpeg', 'text']
                 },
              'ExtractOutputPreprocessor': {
                     'enabled':True

IPython/nbconvert/preprocessors/extractoutput.py

@@ -34,7 +34,7 b' class ExtractOutputPreprocessor(Preprocessor):'
     output_filename_template = Unicode(
         "{unique_key}_{cell_index}_{index}.{extension}", config=True)
 
-    extract_output_types = Set({'png', 'jpg', 'svg', 'pdf'}, config=True)
+    extract_output_types = Set({'png', 'jpg', 'svg', 'pdf', 'application/pdf'}, config=True)
 
     def preprocess_cell(self, cell, resources, cell_index):
         """
@@ -70,7 +70,7 b' class ExtractOutputPreprocessor(Preprocessor):'
                     data = out[out_type]
 
                     #Binary files are base64-encoded, SVG is already XML
-                    if out_type in ('png', 'jpg', 'jpeg', 'pdf'):
+                    if out_type in ('png', 'jpg', 'application/pdf', 'pdf'):
 
                         # data is b64-encoded as text (str, unicode)
                         # decodestring only accepts bytes

IPython/nbconvert/preprocessors/svg2pdf.py

@@ -39,9 +39,11 b' class SVG2PDFPreprocessor(ConvertFiguresPreprocessor):'
     """
     Converts all of the outputs in a notebook from SVG to PDF.
     """
-
-    from_format = Unicode('svg', config=True, help='Format the converter accepts')
-    to_format = Unicode('pdf', config=False, help='Format the converter writes')
+    
+    def _from_format_default(self):
+        return 'svg'
+    def _to_format_default(self):
+        return 'application/pdf'
     
     command = Unicode(config=True,
         help="""The command to use for converting SVG to PDF

IPython/nbconvert/templates/latex/skeleton/display_priority.tplx

@@ -9,7 +9,7 b''
 
 ((*- block data_priority scoped -*))
     ((*- for type in output | filter_data_type -*))
-        ((*- if type in ['pdf']*))
+        ((*- if type in ['pdf', 'application/pdf']*))
             ((*- block data_pdf -*))
             ((*- endblock -*))
         ((*- endif -*))

IPython/nbconvert/templates/skeleton/display_priority.tpl

@@ -5,7 +5,7 b''
 
 {%- block data_priority scoped -%}
     {%- for type in output | filter_data_type -%}
-        {%- if type in ['pdf']%}
+        {%- if type in ['pdf', 'application/pdf']%}
             {%- block data_pdf -%}
             {%- endblock -%}
         {%- endif -%}

IPython/nbconvert/utils/base.py

@@ -22,14 +22,14 b' from IPython.utils.traitlets import Unicode'
 class NbConvertBase(LoggingConfigurable):
     """Global configurable class for shared config
 
-    Usefull for display data priority that might be use by many trasnformers
+    Useful for display data priority that might be use by many transformers
     """
 
-    display_data_priority = List(['html', 'pdf', 'svg', 'latex', 'png', 'jpg', 'jpeg' , 'text'],
+    display_data_priority = List(['html', 'application/pdf', 'pdf', 'svg', 'latex', 'png', 'jpg', 'jpeg' , 'text'],
             config=True,
               help= """
-                    An ordered list of prefered output type, the first
-                    encounterd will usually be used when converting discarding
+                    An ordered list of preferred output type, the first
+                    encountered will usually be used when converting discarding
                     the others.
                     """
             )