Merged upstream master

IPython/nbconvert/exporters/tests/base.py

@@ -0,0 +1,30 b''
+"""
+Module with tests base for exporters
+"""
+
+#-----------------------------------------------------------------------------
+# 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
+#-----------------------------------------------------------------------------
+
+import os
+
+from ...tests.base import TestsBase
+
+#-----------------------------------------------------------------------------
+# Class
+#-----------------------------------------------------------------------------
+
+class ExportersTestsBase(TestsBase):
+    """Contains base test functions for exporters"""
+
+    def _get_notebook(self):
+        return os.path.join(self._get_files_path(), 'notebook2.ipynb')
+                
  No newline at end of file

IPython/nbconvert/exporters/tests/cheese.py

@@ -0,0 +1,48 b''
+"""
+Contains CheeseTransformer
+"""
+#-----------------------------------------------------------------------------
+# 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
+#-----------------------------------------------------------------------------
+
+from ...transformers.base import Transformer
+
+#-----------------------------------------------------------------------------
+# Classes
+#-----------------------------------------------------------------------------
+
+class CheeseTransformer(Transformer):
+    """
+    Adds a cheese tag to the resources object
+    """
+
+
+    def __init__(self, **kw):
+        """
+        Public constructor
+        """
+        super(CheeseTransformer, self).__init__(**kw)
+
+
+    def call(self, nb, resources):
+        """
+        Sphinx transformation to apply on each notebook.
+        
+        Parameters
+        ----------
+        nb : NotebookNode
+            Notebook being converted
+        resources : dictionary
+            Additional resources used in the conversion process.  Allows
+            transformers to pass variables into the Jinja engine.
+        """
+        resources['cheese'] = 'real'
+        return nb, resources

IPython/nbconvert/exporters/tests/files/notebook2.ipynb

@@ -0,0 +1,177 b''
+{
+ "metadata": {
+  "name": "notebook2"
+ },
+ "nbformat": 3,
+ "nbformat_minor": 0,
+ "worksheets": [
+  {
+   "cells": [
+    {
+     "cell_type": "heading",
+     "level": 1,
+     "metadata": {},
+     "source": [
+      "NumPy and Matplotlib examples"
+     ]
+    },
+    {
+     "cell_type": "markdown",
+     "metadata": {},
+     "source": [
+      "First import NumPy and Matplotlib:"
+     ]
+    },
+    {
+     "cell_type": "code",
+     "collapsed": false,
+     "input": [
+      "%pylab inline"
+     ],
+     "language": "python",
+     "metadata": {},
+     "outputs": [
+      {
+       "output_type": "stream",
+       "stream": "stdout",
+       "text": [
+        "\n",
+        "Welcome to pylab, a matplotlib-based Python environment [backend: module://IPython.kernel.zmq.pylab.backend_inline].\n",
+        "For more information, type 'help(pylab)'.\n"
+       ]
+      }
+     ],
+     "prompt_number": 1
+    },
+    {
+     "cell_type": "code",
+     "collapsed": false,
+     "input": [
+      "import numpy as np"
+     ],
+     "language": "python",
+     "metadata": {},
+     "outputs": [],
+     "prompt_number": 2
+    },
+    {
+     "cell_type": "markdown",
+     "metadata": {},
+     "source": [
+      "Now we show some very basic examples of how they can be used."
+     ]
+    },
+    {
+     "cell_type": "code",
+     "collapsed": false,
+     "input": [
+      "a = np.random.uniform(size=(100,100))"
+     ],
+     "language": "python",
+     "metadata": {},
+     "outputs": [],
+     "prompt_number": 6
+    },
+    {
+     "cell_type": "code",
+     "collapsed": false,
+     "input": [
+      "a.shape"
+     ],
+     "language": "python",
+     "metadata": {},
+     "outputs": [
+      {
+       "metadata": {},
+       "output_type": "pyout",
+       "prompt_number": 7,
+       "text": [
+        "(100, 100)"
+       ]
+      }
+     ],
+     "prompt_number": 7
+    },
+    {
+     "cell_type": "code",
+     "collapsed": false,
+     "input": [
+      "evs = np.linalg.eigvals(a)"
+     ],
+     "language": "python",
+     "metadata": {},
+     "outputs": [],
+     "prompt_number": 8
+    },
+    {
+     "cell_type": "code",
+     "collapsed": false,
+     "input": [
+      "evs.shape"
+     ],
+     "language": "python",
+     "metadata": {},
+     "outputs": [
+      {
+       "metadata": {},
+       "output_type": "pyout",
+       "prompt_number": 10,
+       "text": [
+        "(100,)"
+       ]
+      }
+     ],
+     "prompt_number": 10
+    },
+    {
+     "cell_type": "markdown",
+     "metadata": {},
+     "source": [
+      "Here is a cell that has both text and PNG output:"
+     ]
+    },
+    {
+     "cell_type": "code",
+     "collapsed": false,
+     "input": [
+      "hist(evs.real)"
+     ],
+     "language": "python",
+     "metadata": {},
+     "outputs": [
+      {
+       "metadata": {},
+       "output_type": "pyout",
+       "prompt_number": 14,
+       "text": [
+        "(array([95,  4,  0,  0,  0,  0,  0,  0,  0,  1]),\n",
+        " array([ -2.93566063,   2.35937011,   7.65440086,  12.9494316 ,\n",
+        "        18.24446235,  23.53949309,  28.83452384,  34.12955458,\n",
+        "        39.42458533,  44.71961607,  50.01464682]),\n",
+        " <a list of 10 Patch objects>)"
+       ]
+      },
+      {
+       "metadata": {},
+       "output_type": "display_data",
+       "png": "iVBORw0KGgoAAAANSUhEUgAAAXgAAAD9CAYAAAC2l2x5AAAABHNCSVQICAgIfAhkiAAAAAlwSFlz\nAAALEgAACxIB0t1+/AAAEhdJREFUeJzt3X1olfX/x/HXtVbT8CZDmsK6KmrubEu3U2xnZOpxLBnG\nOqsIE7RoE3QRZkT/yEAjcIh/LIs6i/BEGSU1CkxT0+pkFp1zMmsxZ5uUTIXoxm95lmdlef3+8Nep\ndbtz7exs16fnAw7sXNs5n/c14nmurl3naDmO4wgAYJy8sR4AADA6CDwAGIrAA4ChCDwAGIrAA4Ch\nCDwAGOofA9/U1KTCwkLNnj07vS2ZTCoUCsm2bTU2NmpgYCD9vccee0zFxcUqKyvTgQMHRm9qAMC/\n+sfA33PPPdq9e/eQbeFwWLZtq6+vT0VFRero6JAkffXVV3ryySf15ptvKhwOa/Xq1aM3NQDgX/1j\n4OfNm6dp06YN2RaPx9Xc3KyCggI1NTUpFotJkmKxmOrr62XbthYsWCDHcZRMJkdvcgDAP8r4HHwi\nkZDP55Mk+Xw+xeNxSecDX1pamv65kpKS9PcAALmXn+kDMvlkA8uyhrUNAPDvMv1kmYyP4KuqqtTT\n0yNJ6unpUVVVlSQpEAjo8OHD6Z87cuRI+nt/NaRXb+vWrRvzGZh/7Odgfu/dvDy747j7yLCMAx8I\nBBSJRJRKpRSJRFRTUyNJqq6u1p49e9Tf369oNKq8vDxNnjzZ1VAAgJH7x8AvXbpUN9xwg3p7e3X5\n5ZfrmWeeUUtLi/r7+1VSUqKTJ09q1apVkqTCwkK1tLSotrZW9957rzZv3pyTHQAA/DXLcXvs73ZB\ny3L9vxvjQTQaVTAYHOsxXGP+scX8Y8fLs0vu2kngAcAD3LSTjyoAAEMReAAwFIEHAEMReAAwFIEH\nAEP9ZwM/Zcqlsixr1G9Tplw61rsK4D/qP3uZ5PnPxMnFHONjfwF4G5dJAgDSCDwAGIrAA4ChCDwA\nGIrAA4ChCDwAGIrAA4ChCDwAGIrAA4ChCDwAGIrAA4ChCDwAGIrAA4ChCDwAGIrAA4ChCDwAGIrA\nA4ChCDwAGIrAA4ChCDwAGIrAA4ChCDwAGIrAA4ChCDwAGIrAA4ChCDwAGIrAA4ChXAf+6aef1g03\n3KDrr79ea9askSQlk0mFQiHZtq3GxkYNDAxkbVAAQGZcBf7UqVPasGGD9u7dq0Qiod7eXu3Zs0fh\ncFi2bauvr09FRUXq6OjI9rwAgGFyFfiJEyfKcRx9//33SqVSOnPmjC655BLF43E1NzeroKBATU1N\nisVi2Z4XADBMrgMfDod15ZVXasaMGZo7d64CgYASiYR8Pp8kyefzKR6PZ3VYAMDw5bt50Ndff62W\nlhYdPnxY06ZN0x133KEdO3bIcZxhPX79+vXpr4PBoILBoJsxAMBY0WhU0Wh0RM9hOcOt8u/s3LlT\nW7du1bZt2yRJ4XBYx44d09GjR9Xa2iq/36+DBw+qra1NnZ2dQxe0rGG/EIwmy7Ik5WKO8bG/ALzN\nTTtdnaKZN2+ePvzwQ506dUo//vijdu3apUWLFikQCCgSiSiVSikSiaimpsbN0wMAssBV4KdMmaLW\n1lbdeuutuvHGG1VRUaGFCxeqpaVF/f39Kikp0cmTJ7Vq1apszwsAGCZXp2hGtCCnaAAgYzk7RQMA\nGP8IPAAYisADgKEIPAAYisADgKEIPAAYisADgKEIPAAYisADgKEIPAAYisADgKEIPAAYisADgKEI\nPAAYisADgKEIPAAYisADgKEIPAAYisADgKEIPAAYisADgKEIPAAYisADgKEIPAAYisADgKEIPAAY\nisADgKEIPAAYisADgKEIPAAYisADgKEIPAAYisADgKEIPAAYisADgKEIPAAYynXgf/jhB919992a\nNWuWysrKFIvFlEwmFQqFZNu2GhsbNTAwkM1ZAQAZcB34devWybZtdXV1qaurSz6fT+FwWLZtq6+v\nT0VFRero6MjmrACADLgO/L59+7R27VpNmDBB+fn5mjp1quLxuJqbm1VQUKCmpibFYrFszgoAyICr\nwJ84cUKDg4NqaWlRIBDQxo0blUqllEgk5PP5JEk+n0/xeDyrwwIAhi/fzYMGBwfV29urTZs2qa6u\nTitXrtRLL70kx3GG9fj169envw4GgwoGg27GAABjRaNRRaPRET2H5Qy3yn9QWlqqnp4eSdKuXbv0\n3HPP6aefflJra6v8fr8OHjyotrY2dXZ2Dl3Qsob9QjCaLMuSlIs5xsf+AvA2N+10fQ6+uLhYsVhM\n586d086dO1VXV6dAIKBIJKJUKqVIJKKamhq3Tw8AGCHXR/C9vb266667NDg4qLq6Oj388MM6d+6c\nli1bpkOHDum6667T888/r0mTJg1dkCN4AMiYm3a6DrxbBB4AMpfTUzQAgPGNwAOAoQg8ABiKwAOA\n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\n",
+       "text": [
+        "<matplotlib.figure.Figure at 0x108c8f1d0>"
+       ]
+      }
+     ],
+     "prompt_number": 14
+    },
+    {
+     "cell_type": "code",
+     "collapsed": false,
+     "input": [],
+     "language": "python",
+     "metadata": {},
+     "outputs": []
+    }
+   ],
+   "metadata": {}
+  }
+ ]
+}
  No newline at end of file

IPython/nbconvert/exporters/tests/test_basichtml.py

@@ -0,0 +1,39 b''
+"""
+Module with tests for basichtml.py
+"""
+
+#-----------------------------------------------------------------------------
+# 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
+#-----------------------------------------------------------------------------
+
+from .base import ExportersTestsBase
+from ..basichtml import BasicHTMLExporter
+
+#-----------------------------------------------------------------------------
+# Class
+#-----------------------------------------------------------------------------
+
+class TestBasicHTMLExporter(ExportersTestsBase):
+    """Contains test functions for basichtml.py"""
+
+    def test_constructor(self):
+        """
+        Can a BasicHTMLExporter be constructed?
+        """
+        BasicHTMLExporter()
+
+
+    def test_export(self):
+        """
+        Can a BasicHTMLExporter export something?
+        """
+        (output, resources) = BasicHTMLExporter().from_filename(self._get_notebook())
+        assert len(output) > 0
  No newline at end of file

IPython/nbconvert/exporters/tests/test_export.py

@@ -0,0 +1,102 b''
+"""
+Module with tests for export.py
+"""
+
+#-----------------------------------------------------------------------------
+# 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
+#-----------------------------------------------------------------------------
+
+import os
+
+from IPython.nbformat import current as nbformat
+
+from .base import ExportersTestsBase
+from ..export import *
+from ..python import PythonExporter
+
+#-----------------------------------------------------------------------------
+# Class
+#-----------------------------------------------------------------------------
+
+class TestExport(ExportersTestsBase):
+    """Contains test functions for export.py"""
+
+
+    def test_export_wrong_name(self):
+        """
+        Is the right error thrown when a bad template name is used?
+        """
+        try:
+            export_by_name('not_a_name', self._get_notebook())
+        except ExporterNameError as e:
+            pass
+
+
+    def test_export_filename(self):
+        """
+        Can a notebook be exported by filename?
+        """
+        (output, resources) = export_by_name('python', self._get_notebook())
+        assert len(output) > 0
+
+
+    def test_export_nbnode(self):
+        """
+        Can a notebook be exported by a notebook node handle?
+        """
+        with open(self._get_notebook(), 'r') as f:
+            notebook = nbformat.read(f, 'json')
+            (output, resources) = export_by_name('python', notebook)
+        assert len(output) > 0
+
+
+    def test_export_filestream(self):
+        """
+        Can a notebook be exported by a filesteam?
+        """
+        with open(self._get_notebook(), 'r') as f:
+            (output, resources) = export_by_name('python', f)
+        assert len(output) > 0
+
+
+    def test_export_using_exporter(self):
+        """
+        Can a notebook be exported using an instanciated exporter?
+        """
+        (output, resources) = export(PythonExporter(), self._get_notebook())
+        assert len(output) > 0
+
+
+    def test_export_using_exporter_class(self):
+        """
+        Can a notebook be exported using an exporter class type?
+        """
+        (output, resources) = export(PythonExporter, self._get_notebook())
+        assert len(output) > 0
+
+
+    def test_export_resources(self):
+        """
+        Can a notebook be exported along with a custom resources dict?
+        """
+        (output, resources) = export(PythonExporter, self._get_notebook(), resources={})
+        assert len(output) > 0
+
+
+    def test_no_exporter(self):
+        """
+        Is the right error thrown if no exporter is provided?
+        """
+        try:
+            (output, resources) = export(None, self._get_notebook())
+        except TypeError:
+            pass
+                
  No newline at end of file

IPython/nbconvert/exporters/tests/test_exporter.py

@@ -0,0 +1,113 b''
+"""
+Module with tests for exporter.py
+"""
+
+#-----------------------------------------------------------------------------
+# 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
+#-----------------------------------------------------------------------------
+
+from IPython.config import Config
+
+from .base import ExportersTestsBase
+from .cheese import CheeseTransformer
+from ..exporter import Exporter
+
+
+#-----------------------------------------------------------------------------
+# Class
+#-----------------------------------------------------------------------------
+
+class TestExporter(ExportersTestsBase):
+    """Contains test functions for exporter.py"""
+
+
+    def test_constructor(self):
+        """
+        Can an Exporter be constructed?
+        """
+        Exporter()
+
+
+    def test_export(self):
+        """
+        Can an Exporter export something?
+        """
+        exporter = self._make_exporter()
+        (output, resources) = exporter.from_filename(self._get_notebook())
+        assert len(output) > 0
+
+
+    def test_extract_figures(self):
+        """
+        If the ExtractFigureTransformer is enabled, are figures extracted?
+        """
+        config = Config({'ExtractFigureTransformer': {'enabled': True}})
+        exporter = self._make_exporter(config=config)
+        (output, resources) = exporter.from_filename(self._get_notebook())
+        assert resources is not None
+        assert 'figures' in resources
+        assert len(resources['figures']) > 0
+
+
+    def test_transformer_class(self):
+        """
+        Can a transformer be added to the transformers list by class type?
+        """
+        config = Config({'Exporter': {'transformers': [CheeseTransformer]}})
+        exporter = self._make_exporter(config=config)
+        (output, resources) = exporter.from_filename(self._get_notebook())
+        assert resources is not None
+        assert 'cheese' in resources
+        assert resources['cheese'] == 'real'
+
+
+    def test_transformer_instance(self):
+        """
+        Can a transformer be added to the transformers list by instance?
+        """
+        config = Config({'Exporter': {'transformers': [CheeseTransformer()]}})
+        exporter = self._make_exporter(config=config)
+        (output, resources) = exporter.from_filename(self._get_notebook())
+        assert resources is not None
+        assert 'cheese' in resources
+        assert resources['cheese'] == 'real'
+
+
+    def test_transformer_dottedobjectname(self):
+        """
+        Can a transformer be added to the transformers list by dotted object name?
+        """
+        config = Config({'Exporter': {'transformers': ['IPython.nbconvert.exporters.tests.cheese.CheeseTransformer']}})
+        exporter = self._make_exporter(config=config)
+        (output, resources) = exporter.from_filename(self._get_notebook())
+        assert resources is not None
+        assert 'cheese' in resources
+        assert resources['cheese'] == 'real'
+
+
+    def test_transformer_via_method(self):
+        """
+        Can a transformer be added via the Exporter convinience method?
+        """
+        exporter = self._make_exporter()
+        exporter.register_transformer(CheeseTransformer, enabled=True)
+        (output, resources) = exporter.from_filename(self._get_notebook())
+        assert resources is not None
+        assert 'cheese' in resources
+        assert resources['cheese'] == 'real'
+
+
+    def _make_exporter(self, config=None):
+        #Create the exporter instance, make sure to set a template name since
+        #the base Exporter doesn't have a template associated with it.
+        exporter = Exporter(config=config)
+        exporter.template_file = 'python'
+        return exporter        
  No newline at end of file

IPython/nbconvert/exporters/tests/test_fullhtml.py

@@ -0,0 +1,39 b''
+"""
+Module with tests for fullhtml.py
+"""
+
+#-----------------------------------------------------------------------------
+# 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
+#-----------------------------------------------------------------------------
+
+from .base import ExportersTestsBase
+from ..fullhtml import FullHTMLExporter
+
+#-----------------------------------------------------------------------------
+# Class
+#-----------------------------------------------------------------------------
+
+class TestFullHTMLExporter(ExportersTestsBase):
+    """Contains test functions for fullhtml.py"""
+
+    def test_constructor(self):
+        """
+        Can a FullHTMLExporter be constructed?
+        """
+        FullHTMLExporter()
+
+
+    def test_export(self):
+        """
+        Can a FullHTMLExporter export something?
+        """
+        (output, resources) = FullHTMLExporter().from_filename(self._get_notebook())
+        assert len(output) > 0
  No newline at end of file

IPython/nbconvert/exporters/tests/test_latex.py

@@ -0,0 +1,39 b''
+"""
+Module with tests for latex.py
+"""
+
+#-----------------------------------------------------------------------------
+# 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
+#-----------------------------------------------------------------------------
+
+from .base import ExportersTestsBase
+from ..latex import LatexExporter
+
+#-----------------------------------------------------------------------------
+# Class
+#-----------------------------------------------------------------------------
+
+class TestLatexExporter(ExportersTestsBase):
+    """Contains test functions for latex.py"""
+
+    def test_constructor(self):
+        """
+        Can a LatexExporter be constructed?
+        """
+        LatexExporter()
+
+
+    def test_export(self):
+        """
+        Can a LatexExporter export something?
+        """
+        (output, resources) = LatexExporter().from_filename(self._get_notebook())
+        assert len(output) > 0
  No newline at end of file

IPython/nbconvert/exporters/tests/test_markdown.py

@@ -0,0 +1,39 b''
+"""
+Module with tests for markdown.py
+"""
+
+#-----------------------------------------------------------------------------
+# 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
+#-----------------------------------------------------------------------------
+
+from .base import ExportersTestsBase
+from ..markdown import MarkdownExporter
+
+#-----------------------------------------------------------------------------
+# Class
+#-----------------------------------------------------------------------------
+
+class TestMarkdownExporter(ExportersTestsBase):
+    """Contains test functions for markdown.py"""
+
+    def test_constructor(self):
+        """
+        Can a MarkdownExporter be constructed?
+        """
+        MarkdownExporter()
+
+
+    def test_export(self):
+        """
+        Can a MarkdownExporter export something?
+        """
+        (output, resources) = MarkdownExporter().from_filename(self._get_notebook())
+        assert len(output) > 0
  No newline at end of file

IPython/nbconvert/exporters/tests/test_python.py

@@ -0,0 +1,39 b''
+"""
+Module with tests for python.py
+"""
+
+#-----------------------------------------------------------------------------
+# 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
+#-----------------------------------------------------------------------------
+
+from .base import ExportersTestsBase
+from ..python import PythonExporter
+
+#-----------------------------------------------------------------------------
+# Class
+#-----------------------------------------------------------------------------
+
+class TestPythonExporter(ExportersTestsBase):
+    """Contains test functions for python.py"""
+
+    def test_constructor(self):
+        """
+        Can a PythonExporter be constructed?
+        """
+        PythonExporter()
+
+
+    def test_export(self):
+        """
+        Can a PythonExporter export something?
+        """
+        (output, resources) = PythonExporter().from_filename(self._get_notebook())
+        assert len(output) > 0
  No newline at end of file

IPython/nbconvert/exporters/tests/test_reveal.py

@@ -0,0 +1,39 b''
+"""
+Module with tests for reveal.py
+"""
+
+#-----------------------------------------------------------------------------
+# 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
+#-----------------------------------------------------------------------------
+
+from .base import ExportersTestsBase
+from ..reveal import RevealExporter
+
+#-----------------------------------------------------------------------------
+# Class
+#-----------------------------------------------------------------------------
+
+class TestRevealExporter(ExportersTestsBase):
+    """Contains test functions for reveal.py"""
+
+    def test_constructor(self):
+        """
+        Can a RevealExporter be constructed?
+        """
+        RevealExporter()
+
+
+    def test_export(self):
+        """
+        Can a RevealExporter export something?
+        """
+        (output, resources) = RevealExporter().from_filename(self._get_notebook())
+        assert len(output) > 0
  No newline at end of file

IPython/nbconvert/exporters/tests/test_rst.py

@@ -0,0 +1,39 b''
+"""
+Module with tests for rst.py
+"""
+
+#-----------------------------------------------------------------------------
+# 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
+#-----------------------------------------------------------------------------
+
+from .base import ExportersTestsBase
+from ..rst import RSTExporter
+
+#-----------------------------------------------------------------------------
+# Class
+#-----------------------------------------------------------------------------
+
+class TestRSTExporter(ExportersTestsBase):
+    """Contains test functions for rst.py"""
+
+    def test_constructor(self):
+        """
+        Can a RSTExporter be constructed?
+        """
+        RSTExporter()
+
+
+    def test_export(self):
+        """
+        Can a RSTExporter export something?
+        """
+        (output, resources) = RSTExporter().from_filename(self._get_notebook())
+        assert len(output) > 0
  No newline at end of file

IPython/nbconvert/exporters/tests/test_sphinx_howto.py

@@ -0,0 +1,39 b''
+"""
+Module with tests for sphinx_howto.py
+"""
+
+#-----------------------------------------------------------------------------
+# 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
+#-----------------------------------------------------------------------------
+
+from .base import ExportersTestsBase
+from ..sphinx_howto import SphinxHowtoExporter
+
+#-----------------------------------------------------------------------------
+# Class
+#-----------------------------------------------------------------------------
+
+class TestSphinxHowtoExporter(ExportersTestsBase):
+    """Contains test functions for sphinx_howto.py"""
+
+    def test_constructor(self):
+        """
+        Can a SphinxHowtoExporter be constructed?
+        """
+        SphinxHowtoExporter()
+
+
+    def test_export(self):
+        """
+        Can a SphinxHowtoExporter export something?
+        """
+        (output, resources) = SphinxHowtoExporter().from_filename(self._get_notebook())
+        assert len(output) > 0
  No newline at end of file

IPython/nbconvert/exporters/tests/test_sphinx_manual.py

@@ -0,0 +1,39 b''
+"""
+Module with tests for sphinx_manual.py
+"""
+
+#-----------------------------------------------------------------------------
+# 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
+#-----------------------------------------------------------------------------
+
+from .base import ExportersTestsBase
+from ..sphinx_manual import SphinxManualExporter
+
+#-----------------------------------------------------------------------------
+# Class
+#-----------------------------------------------------------------------------
+
+class TestSphinxManualExporter(ExportersTestsBase):
+    """Contains test functions for sphinx_manual.py"""
+
+    def test_constructor(self):
+        """
+        Can a SphinxManualExporter be constructed?
+        """
+        SphinxManualExporter()
+
+
+    def test_export(self):
+        """
+        Can a SphinxManualExporter export something?
+        """
+        (output, resources) = SphinxManualExporter().from_filename(self._get_notebook())
+        assert len(output) > 0
  No newline at end of file

IPython/nbconvert/filters/tests/test_ansi.py

@@ -0,0 +1,91 b''
+"""
+Module with tests for ansi filters
+"""
+
+#-----------------------------------------------------------------------------
+# 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
+#-----------------------------------------------------------------------------
+
+from IPython.utils.coloransi import TermColors
+
+from ...tests.base import TestsBase
+from ..ansi import *
+
+
+#-----------------------------------------------------------------------------
+# Class
+#-----------------------------------------------------------------------------
+
+class TestAnsi(TestsBase):
+    """Contains test functions for ansi.py"""
+
+
+    def test_remove_ansi(self):
+        """
+        remove_ansi test
+        """
+        correct_outputs = {
+            '%s%s%s' % (TermColors.Green, TermColors.White, TermColors.Red)  : '',
+            'hello%s' % TermColors.Blue: 'hello',
+            'he%s%sllo' % (TermColors.Yellow, TermColors.Cyan) : 'hello',
+            '%shello' % TermColors.Blue : 'hello',
+            '{0}h{0}e{0}l{0}l{0}o{0}'.format(TermColors.Red) : 'hello',
+            'hel%slo' % TermColors.Green : 'hello',
+            'hello' : 'hello'}
+
+        for inval, outval in correct_outputs.items():
+            yield self._try_remove_ansi, inval, outval
+
+
+    def _try_remove_ansi(self, inval, outval):
+        assert outval == remove_ansi(inval)
+
+
+    def test_ansi2html(self):
+        """
+        ansi2html test
+        """
+        correct_outputs = {
+            '%s' % (TermColors.Red)  : '<span class="ansired"></span>',
+            'hello%s' % TermColors.Blue: 'hello<span class="ansiblue"></span>',
+            'he%s%sllo' % (TermColors.Green, TermColors.Cyan) : 'he<span class="ansigreen"></span><span class="ansicyan">llo</span>',
+            '%shello' % TermColors.Yellow : '<span class="ansiyellow">hello</span>',
+            '{0}h{0}e{0}l{0}l{0}o{0}'.format(TermColors.White) : '<span class="ansigrey">h</span><span class="ansigrey">e</span><span class="ansigrey">l</span><span class="ansigrey">l</span><span class="ansigrey">o</span><span class="ansigrey"></span>',
+            'hel%slo' % TermColors.Green : 'hel<span class="ansigreen">lo</span>',
+            'hello' : 'hello'}
+
+        for inval, outval in correct_outputs.items():
+            yield self._try_ansi2html, inval, outval
+
+
+    def _try_ansi2html(self, inval, outval):
+        assert self.fuzzy_compare(outval, ansi2html(inval))
+
+
+    def test_ansi2latex(self):
+        """
+        ansi2latex test
+        """
+        correct_outputs = {
+            '%s' % (TermColors.Red)  : r'\red{}',
+            'hello%s' % TermColors.Blue: r'hello\blue{}',
+            'he%s%sllo' % (TermColors.Green, TermColors.Cyan) : r'he\green{}\cyan{llo}',
+            '%shello' % TermColors.Yellow : r'\yellow{hello}',
+            '{0}h{0}e{0}l{0}l{0}o{0}'.format(TermColors.White) : r'\white{h}\white{e}\white{l}\white{l}\white{o}\white{}',
+            'hel%slo' % TermColors.Green : r'hel\green{lo}',
+            'hello' : 'hello'}
+
+        for inval, outval in correct_outputs.items():
+            yield self._try_ansi2latex, inval, outval
+
+
+    def _try_ansi2latex(self, inval, outval):
+        assert self.fuzzy_compare(outval, ansi2latex(inval), case_sensitive=True)

IPython/nbconvert/filters/tests/test_datatypefilter.py

@@ -0,0 +1,46 b''
+"""
+Module with tests for DataTypeFilter
+"""
+
+#-----------------------------------------------------------------------------
+# 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
+#-----------------------------------------------------------------------------
+
+
+from ...tests.base import TestsBase
+from ..datatypefilter import DataTypeFilter
+
+
+#-----------------------------------------------------------------------------
+# Class
+#-----------------------------------------------------------------------------
+
+class TestDataTypeFilter(TestsBase):
+    """Contains test functions for datatypefilter.py"""
+
+
+    def test_constructor(self):
+        """Can an instance of a DataTypeFilter be created?"""
+        DataTypeFilter()
+
+
+    def test_junk_types(self):
+        """Can the DataTypeFilter pickout a useful type from a list of junk types?"""
+        filter = DataTypeFilter()
+        assert filter(["hair", "water", "png", "rock"]) == ["png"]
+        assert filter(["pdf", "hair", "water", "png", "rock"]) == ["pdf"]
+        assert filter(["hair", "water", "rock"]) == []
+
+
+    def test_null(self):
+        """Will the DataTypeFilter fail if no types are passed in?"""
+        filter = DataTypeFilter()
+        assert filter([]) == []

IPython/nbconvert/filters/tests/test_highlight.py

@@ -0,0 +1,35 b''
+"""
+Module with tests for Highlight
+"""
+
+#-----------------------------------------------------------------------------
+# 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
+#-----------------------------------------------------------------------------
+
+
+from ...tests.base import TestsBase
+from ..highlight import *
+
+
+#-----------------------------------------------------------------------------
+# Class
+#-----------------------------------------------------------------------------
+
+class TestHighlight(TestsBase):
+    """Contains test functions for highlight.py"""
+
+
+    def test_highlight(source, language='ipython'):
+        pass
+
+
+    def test_highlight2latex(source, language='ipython'):
+        pass

IPython/nbconvert/tests/base.py

@@ -0,0 +1,178 b''
+#!/usr/bin/env python
+"""
+Contains base test class for nbconvert
+"""
+#-----------------------------------------------------------------------------
+#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
+#-----------------------------------------------------------------------------
+
+import subprocess
+import os
+import glob
+import shutil
+import sys
+
+import IPython
+from IPython.utils.tempdir import TemporaryDirectory
+from IPython.utils import py3compat
+
+#-----------------------------------------------------------------------------
+# Classes and functions
+#-----------------------------------------------------------------------------
+
+class TemporaryWorkingDirectory(TemporaryDirectory):
+    """
+    Creates a temporary directory and sets the cwd to that directory.
+    Automatically reverts to previous cwd upon cleanup.
+    Usage example:
+
+        with TemporaryWorakingDirectory() as tmpdir:
+            ...
+    """
+
+    def __init__(self, **kw):
+        """
+        Constructor
+        """
+        super(TemporaryWorkingDirectory, self).__init__(**kw)
+
+        #Change cwd to new temp dir.  Remember old cwd.
+        self.old_wd = os.getcwd()
+        os.chdir(self.name)
+
+
+    def cleanup(self):
+        """
+        Destructor
+        """
+
+        #Revert to old cwd.
+        os.chdir(self.old_wd)
+
+        #Cleanup
+        super(TemporaryWorkingDirectory, self).cleanup()
+
+
+class TestsBase(object):
+    """Base tests class.  Contains usefull fuzzy comparison and nbconvert
+    functions."""
+
+
+    def fuzzy_compare(self, a, b, newlines_are_spaces=True, tabs_are_spaces=True, 
+                      fuzzy_spacing=True, ignore_spaces=False, 
+                      ignore_newlines=False, case_sensitive=False):
+        """
+        Performs a fuzzy comparison of two strings.  A fuzzy comparison is a
+        comparison that ignores insignificant differences in the two comparands.
+        The significance of certain differences can be specified via the keyword
+        parameters of this method.
+        """
+
+        if newlines_are_spaces:
+            a = a.replace('\n', ' ')
+            b = b.replace('\n', ' ')
+
+        if tabs_are_spaces:
+            a = a.replace('\t', ' ')
+            b = b.replace('\t', ' ')
+
+        if ignore_spaces:
+            a = a.replace(' ', '')
+            b = b.replace(' ', '')
+
+        if fuzzy_spacing:
+            a = self.recursive_replace(a, '  ', ' ')
+            b = self.recursive_replace(b, '  ', ' ')
+
+        if ignore_newlines:
+            a = a.replace('\n', '')
+            b = b.replace('\n', '')
+
+        if not case_sensitive:
+            a = a.lower()
+            b = b.lower()
+
+        return a == b
+
+
+    def recursive_replace(self, text, search, replacement):
+        """
+        Performs a recursive replacement operation.  Replaces all instances
+        of a search string in a text string with a replacement string until
+        the search string no longer exists.  Recursion is needed because the
+        replacement string may generate additional search strings.
+
+        For example:
+           Replace "ii" with "i" in the string "Hiiii" yields "Hii"
+           Another replacement yields "Hi" (the desired output)
+
+        Parameters:
+        -----------
+        text : string
+            Text to replace in.
+        search : string
+            String to search for within "text"
+        replacement : string
+            String to replace "search" with
+        """
+        while search in text:
+            text = text.replace(search, replacement)
+        return text
+
+            
+    def create_temp_cwd(self, copy_filenames=None):
+        temp_dir = TemporaryWorkingDirectory()
+
+        #Copy the files if requested.
+        if not copy_filenames is None:
+            self.copy_files_to(copy_filenames)
+
+        #Return directory handler
+        return temp_dir
+
+
+    def copy_files_to(self, copy_filenames=None, destination=None):
+        
+        #Copy test files into the destination directory.
+        if copy_filenames:
+            for pattern in copy_filenames:
+                for match in glob.glob(os.path.join(self._get_files_path(), pattern)):
+                    if destination is None:
+                        shutil.copyfile(match, os.path.basename(match))
+                    else:
+                        if not os.path.isdir(destination):
+                            os.makedirs(destination)
+                        shutil.copyfile(match, os.path.join(destination, os.path.basename(match)))
+
+
+    def _get_files_path(self):
+
+        #Get the relative path to this module in the IPython directory.
+        names = self.__module__.split('.')[1:-1]
+        names.append('files')
+        
+        #Build a path using the IPython directory and the relative path we just
+        #found.
+        path = IPython.__path__[0]
+        for name in names:
+            path = os.path.join(path, name)
+        return path
+
+
+    def call(self, parameters):
+        output = subprocess.Popen(parameters, stdout=subprocess.PIPE).communicate()[0]
+        
+        #Convert the output to a string if running Python3
+        if py3compat.PY3:
+            return output.decode('utf-8')
+        else:
+            return output
+     
  No newline at end of file

IPython/nbconvert/tests/files/ipython_nbconvert_config.py

@@ -0,0 +1,6 b''
+c = get_config()
+
+#Export all the notebooks in the current directory to the sphinx_howto format.
+c.NbConvertApp.notebooks = ['notebook1.ipynb']
+c.NbConvertApp.export_format = 'python'
+

IPython/nbconvert/tests/files/notebook1.ipynb

@@ -0,0 +1,149 b''
+{
+ "metadata": {
+  "name": "notebook1"
+ },
+ "nbformat": 3,
+ "nbformat_minor": 0,
+ "worksheets": [
+  {
+   "cells": [
+    {
+     "cell_type": "heading",
+     "level": 1,
+     "metadata": {},
+     "source": [
+      "A simple SymPy example"
+     ]
+    },
+    {
+     "cell_type": "markdown",
+     "metadata": {},
+     "source": [
+      "First we import SymPy and initialize printing:"
+     ]
+    },
+    {
+     "cell_type": "code",
+     "collapsed": false,
+     "input": [
+      "from sympy import init_printing\n",
+      "from sympy import *\n",
+      " init_printing()"
+     ],
+     "language": "python",
+     "metadata": {},
+     "outputs": [],
+     "prompt_number": 2
+    },
+    {
+     "cell_type": "markdown",
+     "metadata": {},
+     "source": [
+      "Create a few symbols:"
+     ]
+    },
+    {
+     "cell_type": "code",
+     "collapsed": false,
+     "input": [
+      "x,y,z = symbols('x y z')"
+     ],
+     "language": "python",
+     "metadata": {},
+     "outputs": [],
+     "prompt_number": 4
+    },
+    {
+     "cell_type": "markdown",
+     "metadata": {},
+     "source": [
+      "Here is a basic expression:"
+     ]
+    },
+    {
+     "cell_type": "code",
+     "collapsed": false,
+     "input": [
+      "e = x**2 + 2.0*y + sin(z); e"
+     ],
+     "language": "python",
+     "metadata": {},
+     "outputs": [
+      {
+       "latex": [
+        "$$x^{2} + 2.0 y + \\sin{\\left (z \\right )}$$"
+       ],
+       "metadata": {},
+       "output_type": "pyout",
+       "png": "iVBORw0KGgoAAAANSUhEUgAAAKMAAAAZBAMAAACvE4OgAAAAMFBMVEX///8AAAAAAAAAAAAAAAAA\nAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAv3aB7AAAAD3RSTlMAEHarIkSJZt3NVLsy\nme8Q6PJIAAACz0lEQVRIDa1UTWjUQBT+ZpvdzW7TGlrxItjYSg/C6vbiDwjmoCgUpHioPYhdqig9\nFJYiPYmW4klB14NgFGnw4EHpj7UgUtTFXhSEBgVBxIOFggWVrrUqiMY3mZkkLNIK7oN575vvvfky\n8yYJIGzgkSlRrULKrivVSkvq6LbxtcaSjV3aSo0lgWyl5pK69V+SRlEsPxNTGYhhDrV3M2Ue2etc\nEDmuMmM+IjolrCuHXNoLoQDNSAXdzbjsfFVKTY1vCgFXFIxenG4cFSSzRewAPnN0FugXjPDr45MQ\nJwoKtitgXL9zT+CsJeIHYG+Z4H1gwhRU4G/FcAQbbYU3KdDo+0sCK8lRU0guA72uKqMYk9RehHxP\niDIu0NS2v90KGShJYi7T7tgvkrQ2vIT2XtRISWNra6lzGc8/PW3ji4PL7Vmge095YIX0iB71NCaZ\n5N3XyM0VCuNIyFNIyY3AMG/KDUvjn90DGmwq9wpIl5AyU5WsTYy0aJf6JFGB5An3Der5jExKHjNR\n4JKPge/EXqDBoOXpkxkmkJHFfAFRVhDIveWA0S57N2Me6yw+DSX1n1uCq3sIfCF2IcjNkjeWyKli\nginHubboOB4vSNAjyaiXE26ygrkyTfod55Lj3CTE+n2P73ImJpnk6wJJKjYJSwt3OQbNJu4icM5s\nKGGbzMuD70N6JSbJD44x7pLDyJrbkfiLpOEhYVMJSVEj83x5YFLyNrAzJsmvJ+uhLrieXvcJDshy\nHtQuD54c2IWWEnSXfUTDZJJfAjcpOW5imp9aHvw4ZZ4NDV4FGjw0tzadKgbFwinJUd//AT0P1tdW\nBtuRU39oKdk9ONQ163fM+nvu/s4D/FX30otdQIZGlSnJKpq6KUxKVqV1WxGHFIhishjhEO1Gi3r4\nkZCMg+hH1henV8EjmFoly1PTMs/Uadaox+FceY2STpmvt9co/Pe0Jvt1GvgDK/Osw/4jQ4wAAAAA\nSUVORK5CYII=\n",
+       "prompt_number": 6,
+       "text": [
+        " 2                 \n",
+        "x  + 2.0\u22c5y + sin(z)"
+       ]
+      }
+     ],
+     "prompt_number": 6
+    },
+    {
+     "cell_type": "code",
+     "collapsed": false,
+     "input": [
+      "diff(e, x)"
+     ],
+     "language": "python",
+     "metadata": {},
+     "outputs": [
+      {
+       "latex": [
+        "$$2 x$$"
+       ],
+       "metadata": {},
+       "output_type": "pyout",
+       "png": "iVBORw0KGgoAAAANSUhEUgAAABQAAAAOBAMAAADd6iHDAAAAMFBMVEX///8AAAAAAAAAAAAAAAAA\nAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAv3aB7AAAAD3RSTlMAIpm7MhCriUTv3c12\nVGZoascqAAAAgElEQVQIHWNgVDJ2YICAMAb2H1BmKgPDTChzFgNDvgOEvT8AzgQKrA9gPZPYUwNk\ncXxnCGd4dWA1kMllwFDKUB9wEchUZmAIYNgMZDDwJIDIPyDiEgOjAAPLFwZWBhYFBh6BqzwfGI4y\nSJUXZXH8Zf7A+IBh////v1hzjh5/xwAAW80hUDE8HYkAAAAASUVORK5CYII=\n",
+       "prompt_number": 7,
+       "text": [
+        "2\u22c5x"
+       ]
+      }
+     ],
+     "prompt_number": 7
+    },
+    {
+     "cell_type": "code",
+     "collapsed": false,
+     "input": [
+      "integrate(e, z)"
+     ],
+     "language": "python",
+     "metadata": {},
+     "outputs": [
+      {
+       "latex": [
+        "$$x^{2} z + 2.0 y z - \\cos{\\left (z \\right )}$$"
+       ],
+       "metadata": {},
+       "output_type": "pyout",
+       "png": "iVBORw0KGgoAAAANSUhEUgAAALsAAAAZBAMAAACbakK8AAAAMFBMVEX///8AAAAAAAAAAAAAAAAA\nAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAv3aB7AAAAD3RSTlMAEHarIkSJZt3NVLsy\nme8Q6PJIAAADAklEQVRIDbVVS2gTURQ90/wmk0k6tCJCsR1SKShIsxE3CgNWBKUxq9qFmqFqShfF\nUKQrkaDiF0pcCKYgBBcuBLV+wIWKARe6kQ4UhNKKWdiF4KIptmA/xPvmzZuMxdYUzIPcd+655568\nvLlJAL6G32oOasQWNHz5Rvg6nrKh/mygfSzlX2ygPaBUGmov6//NXs1yq4sex2EPrsHemTd2snNg\ntkb+Cx1zBL6SqwxZLvQAKYHzKZaPY4fh4TeHd0S5Nox9OClItm/jiU9DrEwwVEawpiVis9VkimqX\nAOr4o2cCs/0BT2I5+FYJRhJbePQxgzcD7QLEqtV5gdnu2Icr3L45gcCyt74Z7neL4SLQ0nm4S+dM\nYCz1gSPHnhKZDWyHhcCCNKwjqaF/TkwGl0L6nClie/wc1D1xdoNsSLhT0IJkhi7Lzr22xb8keE/N\nPm0Sc9yEuhRUyuiG9HzvFNeImCyq39SriOhtQI7IV/TiTqE8glqwohjE0NJwiANxOZTdZoxtfzSa\nx2tI8DtHcKQoQFmV6f1XT2swibxFL+6k5EgenhBCqKLTPX3ULnaYdDlaTMcCSd8zuXTvBq2bJUJr\nlE4WgSV5ZRdBzLFgO6nzhJp1ltvrlB2HCoWxQuG+jTvt2GxBWUZaU2mMApZNuSHA3vJpCliRhqqs\nZtvbTrb9ZIk+i70Ut1OcnpgeKskTCFUwjaYy8Jhr3eiefq0HIfa7yC6HOwVyULRuNDn21JngbcL+\nE8A+MNnSxb+w59+Cj2tELJBbjEZr8SGwn0j2aLkTPdp08R2OcKV6fXB3ikPH3n8tM5WTfrETtZcw\ng3QWH0dH7nKNiMkszqo/EDafaHhJ5Bm6ee4UtdAabxnMcmUUl0SnYx+uVqs5XAGN9QGgdeCrASv0\n3TmCsJcOdhnozexD38goK9HXynEKr1OKDs9guhQD039kGySyIQpJAdbvJ9YTlPvyUl3/aLUf34G/\nuGxIyXpE37DoLbAHwJaU53t9MRCfrU8o/k4iRn36Lar8Wd5wAfgN4R6xelyy/ssAAAAASUVORK5C\nYII=\n",
+       "prompt_number": 8,
+       "text": [
+        " 2                     \n",
+        "x \u22c5z + 2.0\u22c5y\u22c5z - cos(z)"
+       ]
+      }
+     ],
+     "prompt_number": 8
+    },
+    {
+     "cell_type": "code",
+     "collapsed": false,
+     "input": [],
+     "language": "python",
+     "metadata": {},
+     "outputs": []
+    }
+   ],
+   "metadata": {}
+  }
+ ]
+}
  No newline at end of file

IPython/nbconvert/tests/files/notebook2.ipynb

@@ -0,0 +1,177 b''
+{
+ "metadata": {
+  "name": "notebook2"
+ },
+ "nbformat": 3,
+ "nbformat_minor": 0,
+ "worksheets": [
+  {
+   "cells": [
+    {
+     "cell_type": "heading",
+     "level": 1,
+     "metadata": {},
+     "source": [
+      "NumPy and Matplotlib examples"
+     ]
+    },
+    {
+     "cell_type": "markdown",
+     "metadata": {},
+     "source": [
+      "First import NumPy and Matplotlib:"
+     ]
+    },
+    {
+     "cell_type": "code",
+     "collapsed": false,
+     "input": [
+      "%pylab inline"
+     ],
+     "language": "python",
+     "metadata": {},
+     "outputs": [
+      {
+       "output_type": "stream",
+       "stream": "stdout",
+       "text": [
+        "\n",
+        "Welcome to pylab, a matplotlib-based Python environment [backend: module://IPython.kernel.zmq.pylab.backend_inline].\n",
+        "For more information, type 'help(pylab)'.\n"
+       ]
+      }
+     ],
+     "prompt_number": 1
+    },
+    {
+     "cell_type": "code",
+     "collapsed": false,
+     "input": [
+      "import numpy as np"
+     ],
+     "language": "python",
+     "metadata": {},
+     "outputs": [],
+     "prompt_number": 2
+    },
+    {
+     "cell_type": "markdown",
+     "metadata": {},
+     "source": [
+      "Now we show some very basic examples of how they can be used."
+     ]
+    },
+    {
+     "cell_type": "code",
+     "collapsed": false,
+     "input": [
+      "a = np.random.uniform(size=(100,100))"
+     ],
+     "language": "python",
+     "metadata": {},
+     "outputs": [],
+     "prompt_number": 6
+    },
+    {
+     "cell_type": "code",
+     "collapsed": false,
+     "input": [
+      "a.shape"
+     ],
+     "language": "python",
+     "metadata": {},
+     "outputs": [
+      {
+       "metadata": {},
+       "output_type": "pyout",
+       "prompt_number": 7,
+       "text": [
+        "(100, 100)"
+       ]
+      }
+     ],
+     "prompt_number": 7
+    },
+    {
+     "cell_type": "code",
+     "collapsed": false,
+     "input": [
+      "evs = np.linalg.eigvals(a)"
+     ],
+     "language": "python",
+     "metadata": {},
+     "outputs": [],
+     "prompt_number": 8
+    },
+    {
+     "cell_type": "code",
+     "collapsed": false,
+     "input": [
+      "evs.shape"
+     ],
+     "language": "python",
+     "metadata": {},
+     "outputs": [
+      {
+       "metadata": {},
+       "output_type": "pyout",
+       "prompt_number": 10,
+       "text": [
+        "(100,)"
+       ]
+      }
+     ],
+     "prompt_number": 10
+    },
+    {
+     "cell_type": "markdown",
+     "metadata": {},
+     "source": [
+      "Here is a cell that has both text and PNG output:"
+     ]
+    },
+    {
+     "cell_type": "code",
+     "collapsed": false,
+     "input": [
+      "hist(evs.real)"
+     ],
+     "language": "python",
+     "metadata": {},
+     "outputs": [
+      {
+       "metadata": {},
+       "output_type": "pyout",
+       "prompt_number": 14,
+       "text": [
+        "(array([95,  4,  0,  0,  0,  0,  0,  0,  0,  1]),\n",
+        " array([ -2.93566063,   2.35937011,   7.65440086,  12.9494316 ,\n",
+        "        18.24446235,  23.53949309,  28.83452384,  34.12955458,\n",
+        "        39.42458533,  44.71961607,  50.01464682]),\n",
+        " <a list of 10 Patch objects>)"
+       ]
+      },
+      {
+       "metadata": {},
+       "output_type": "display_data",
+       "png": "iVBORw0KGgoAAAANSUhEUgAAAXgAAAD9CAYAAAC2l2x5AAAABHNCSVQICAgIfAhkiAAAAAlwSFlz\nAAALEgAACxIB0t1+/AAAEhdJREFUeJzt3X1olfX/x/HXtVbT8CZDmsK6KmrubEu3U2xnZOpxLBnG\nOqsIE7RoE3QRZkT/yEAjcIh/LIs6i/BEGSU1CkxT0+pkFp1zMmsxZ5uUTIXoxm95lmdlef3+8Nep\ndbtz7exs16fnAw7sXNs5n/c14nmurl3naDmO4wgAYJy8sR4AADA6CDwAGIrAA4ChCDwAGIrAA4Ch\nCDwAGOofA9/U1KTCwkLNnj07vS2ZTCoUCsm2bTU2NmpgYCD9vccee0zFxcUqKyvTgQMHRm9qAMC/\n+sfA33PPPdq9e/eQbeFwWLZtq6+vT0VFRero6JAkffXVV3ryySf15ptvKhwOa/Xq1aM3NQDgX/1j\n4OfNm6dp06YN2RaPx9Xc3KyCggI1NTUpFotJkmKxmOrr62XbthYsWCDHcZRMJkdvcgDAP8r4HHwi\nkZDP55Mk+Xw+xeNxSecDX1pamv65kpKS9PcAALmXn+kDMvlkA8uyhrUNAPDvMv1kmYyP4KuqqtTT\n0yNJ6unpUVVVlSQpEAjo8OHD6Z87cuRI+nt/NaRXb+vWrRvzGZh/7Odgfu/dvDy747j7yLCMAx8I\nBBSJRJRKpRSJRFRTUyNJqq6u1p49e9Tf369oNKq8vDxNnjzZ1VAAgJH7x8AvXbpUN9xwg3p7e3X5\n5ZfrmWeeUUtLi/r7+1VSUqKTJ09q1apVkqTCwkK1tLSotrZW9957rzZv3pyTHQAA/DXLcXvs73ZB\ny3L9vxvjQTQaVTAYHOsxXGP+scX8Y8fLs0vu2kngAcAD3LSTjyoAAEMReAAwFIEHAEMReAAwFIEH\nAEP9ZwM/Zcqlsixr1G9Tplw61rsK4D/qP3uZ5PnPxMnFHONjfwF4G5dJAgDSCDwAGIrAA4ChCDwA\nGIrAA4ChCDwAGIrAA4ChCDwAGIrAA4ChCDwAGIrAA4ChCDwAGIrAA4ChCDwAGIrAA4ChCDwAGIrA\nA4ChCDwAGIrAA4ChCDwAGIrAA4ChCDwAGIrAA4ChCDwAGIrAA4ChCDwAGIrAA4ChXAf+6aef1g03\n3KDrr79ea9askSQlk0mFQiHZtq3GxkYNDAxkbVAAQGZcBf7UqVPasGGD9u7dq0Qiod7eXu3Zs0fh\ncFi2bauvr09FRUXq6OjI9rwAgGFyFfiJEyfKcRx9//33SqVSOnPmjC655BLF43E1NzeroKBATU1N\nisVi2Z4XADBMrgMfDod15ZVXasaMGZo7d64CgYASiYR8Pp8kyefzKR6PZ3VYAMDw5bt50Ndff62W\nlhYdPnxY06ZN0x133KEdO3bIcZxhPX79+vXpr4PBoILBoJsxAMBY0WhU0Wh0RM9hOcOt8u/s3LlT\nW7du1bZt2yRJ4XBYx44d09GjR9Xa2iq/36+DBw+qra1NnZ2dQxe0rGG/EIwmy7Ik5WKO8bG/ALzN\nTTtdnaKZN2+ePvzwQ506dUo//vijdu3apUWLFikQCCgSiSiVSikSiaimpsbN0wMAssBV4KdMmaLW\n1lbdeuutuvHGG1VRUaGFCxeqpaVF/f39Kikp0cmTJ7Vq1apszwsAGCZXp2hGtCCnaAAgYzk7RQMA\nGP8IPAAYisADgKEIPAAYisADgKEIPAAYisADgKEIPAAYisADgKEIPAAYisADgKEIPAAYisADgKEI\nPAAYisADgKEIPAAYisADgKEIPAAYisADgKEIPAAYisADgKEIPAAYisADgKEIPAAYisADgKEIPAAY\nisADgKEIPAAYisADgKEIPAAYisADgKEIPAAYisADgKEIPAAYisADgKEIPAAYynXgf/jhB919992a\nNWuWysrKFIvFlEwmFQqFZNu2GhsbNTAwkM1ZAQAZcB34devWybZtdXV1qaurSz6fT+FwWLZtq6+v\nT0VFRero6MjmrACADLgO/L59+7R27VpNmDBB+fn5mjp1quLxuJqbm1VQUKCmpibFYrFszgoAyICr\nwJ84cUKDg4NqaWlRIBDQxo0blUqllEgk5PP5JEk+n0/xeDyrwwIAhi/fzYMGBwfV29urTZs2qa6u\nTitXrtRLL70kx3GG9fj169envw4GgwoGg27GAABjRaNRRaPRET2H5Qy3yn9QWlqqnp4eSdKuXbv0\n3HPP6aefflJra6v8fr8OHjyotrY2dXZ2Dl3Qsob9QjCaLMuSlIs5xsf+AvA2N+10fQ6+uLhYsVhM\n586d086dO1VXV6dAIKBIJKJUKqVIJKKamhq3Tw8AGCHXR/C9vb266667NDg4qLq6Oj388MM6d+6c\nli1bpkOHDum6667T888/r0mTJg1dkCN4AMiYm3a6DrxbBB4AMpfTUzQAgPGNwAOAoQg8ABiKwAOA\n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\n",
+       "text": [
+        "<matplotlib.figure.Figure at 0x108c8f1d0>"
+       ]
+      }
+     ],
+     "prompt_number": 14
+    },
+    {
+     "cell_type": "code",
+     "collapsed": false,
+     "input": [],
+     "language": "python",
+     "metadata": {},
+     "outputs": []
+    }
+   ],
+   "metadata": {}
+  }
+ ]
+}
  No newline at end of file

IPython/nbconvert/tests/files/override.py

@@ -0,0 +1,6 b''
+c = get_config()
+
+#Export all the notebooks in the current directory to the sphinx_howto format.
+c.NbConvertApp.notebooks = ['notebook2.ipynb']
+c.NbConvertApp.export_format = 'python'
+

IPython/nbconvert/tests/test_nbconvertapp.py

@@ -0,0 +1,123 b''
+"""
+Contains tests for the nbconvertapp
+"""
+#-----------------------------------------------------------------------------
+#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
+#-----------------------------------------------------------------------------
+
+import os
+from .base import TestsBase
+
+from IPython.utils import py3compat
+
+    
+#-----------------------------------------------------------------------------
+# Constants
+#-----------------------------------------------------------------------------
+
+#Define ipython commandline name
+if py3compat.PY3:
+    IPYTHON = 'ipython3'
+else:
+    IPYTHON = 'ipython'
+
+
+#-----------------------------------------------------------------------------
+# Classes and functions
+#-----------------------------------------------------------------------------
+
+class TestNbConvertApp(TestsBase):
+    """Collection of NbConvertApp tests"""
+
+
+    def test_notebook_help(self):
+        """
+        Will help show if no notebooks are specified?
+        """
+        with self.create_temp_cwd():
+            assert "see '--help-all'" in self.call([IPYTHON, 'nbconvert'])
+
+
+    def test_glob(self):
+        """
+        Do search patterns work for notebook names?
+        """
+        with self.create_temp_cwd(['notebook*.ipynb']):
+            assert not 'error' in self.call([IPYTHON, 'nbconvert', 
+                '--format="python"', '--notebooks=["*.ipynb"]']).lower()
+            assert os.path.isfile(os.path.join('nbconvert_build', 'notebook1.py'))
+            assert os.path.isfile(os.path.join('nbconvert_build', 'notebook2.py'))
+
+
+    def test_glob_subdir(self):
+        """
+        Do search patterns work for subdirectory notebook names?
+        """
+        with self.create_temp_cwd() as cwd:
+            self.copy_files_to(['notebook*.ipynb'], 'subdir/')
+            assert not 'error' in self.call([IPYTHON, 'nbconvert', '--format="python"', 
+                '--notebooks=["%s"]' % os.path.join('subdir', '*.ipynb')]).lower()
+            assert os.path.isfile(os.path.join('nbconvert_build', 'notebook1.py'))
+            assert os.path.isfile(os.path.join('nbconvert_build', 'notebook2.py'))
+
+
+    def test_explicit(self):
+        """
+        Do explicit notebook names work?
+        """
+        with self.create_temp_cwd(['notebook*.ipynb']):
+            assert not 'error' in self.call([IPYTHON, 'nbconvert', '--format="python"', 
+                '--notebooks=["notebook2.ipynb"]']).lower()
+            assert not os.path.isfile(os.path.join('nbconvert_build', 'notebook1.py'))
+            assert os.path.isfile(os.path.join('nbconvert_build', 'notebook2.py'))
+
+
+    def test_glob_explicit(self):
+        """
+        Can a search pattern be used along with matching explicit notebook names?
+        """
+        with self.create_temp_cwd(['notebook*.ipynb']):
+            assert not 'error' in self.call([IPYTHON, 'nbconvert', '--format="python"', 
+                '--notebooks=["*.ipynb", "notebook1.ipynb", "notebook2.ipynb"]']).lower()
+            assert os.path.isfile(os.path.join('nbconvert_build', 'notebook1.py'))
+            assert os.path.isfile(os.path.join('nbconvert_build', 'notebook2.py'))
+
+
+    def test_explicit_glob(self):
+        """
+        Can explicit notebook names be used and then a matching search pattern?
+        """
+        with self.create_temp_cwd(['notebook*.ipynb']):
+            assert not 'error' in self.call([IPYTHON, 'nbconvert', '--format="python"', 
+                '--notebooks=["notebook1.ipynb", "notebook2.ipynb", "*.ipynb"]']).lower()
+            assert os.path.isfile(os.path.join('nbconvert_build', 'notebook1.py'))
+            assert os.path.isfile(os.path.join('nbconvert_build', 'notebook2.py'))
+
+
+    def test_default_config(self):
+        """
+        Does the default config work?
+        """
+        with self.create_temp_cwd(['notebook*.ipynb', 'ipython_nbconvert_config.py']):
+            assert not 'error' in self.call([IPYTHON, 'nbconvert']).lower()
+            assert os.path.isfile(os.path.join('nbconvert_build', 'notebook1.py'))
+            assert not os.path.isfile(os.path.join('nbconvert_build', 'notebook2.py'))
+
+
+    def test_override_config(self):
+        """
+        Can the default config be overriden?
+        """
+        with self.create_temp_cwd(['notebook*.ipynb', 'ipython_nbconvert_config.py', 
+                                   'override.py']):
+            assert not 'error' in self.call([IPYTHON, 'nbconvert', '--config="override.py"']).lower()
+            assert not os.path.isfile(os.path.join('nbconvert_build', 'notebook1.py'))
+            assert os.path.isfile(os.path.join('nbconvert_build', 'notebook2.py'))

.travis.yml

@@ -6,7 +6,12 b' python:'
     - 3.2
     - 3.3
 before_install:
+    - "if [[ $TRAVIS_PYTHON_VERSION == '3.2'* ]]; then pip install -Iv https://pypi.python.org/packages/source/J/Jinja2/Jinja2-2.6.tar.gz; fi"
+    - "if [[ ! $TRAVIS_PYTHON_VERSION == '3.2'* ]]; then pip install jinja2; fi"
     - easy_install -q pyzmq
+    - sudo apt-get install pandoc
+    - pip install pygments
+    - pip install sphinx
 install:
     - python setup.py install -q 
 script:

IPython/html/static/base/js/dialog.js

@@ -64,6 +64,14 b' IPython.dialog = (function (IPython) {'
                 dialog.remove();
             });
         }
+        if (options.reselect_cell !== false) {
+            dialog.on("hidden", function () {
+                if (IPython.notebook) {
+                    cell = IPython.notebook.get_selected_cell();
+                    if (cell) cell.select();
+                }
+            });
+        }
         
         return dialog.modal(options);
     }

IPython/html/static/notebook/js/pager.js

@@ -142,7 +142,7 b' var IPython = (function (IPython) {'
     };
 
     Pager.prototype.detach = function(){
-        var w = window.open("","_blank")
+        var w = window.open("","_blank");
         $(w.document.head)
         .append(
                 $('<link>')
@@ -153,10 +153,10 b' var IPython = (function (IPython) {'
         .append(
                 $('<title>').text("IPython Pager")
         );
-        var pager_body = $(w.document.body)
-            pager_body.attr('style','overflow:scroll');
+        var pager_body = $(w.document.body);
+        pager_body.css('overflow','scroll');
 
-        pager_body.append(this.pager_element.children())
+        pager_body.append(this.pager_element.clone().children());
         w.document.close();
         this.collapse();
 

IPython/html/static/notebook/js/savewidget.js

@@ -87,6 +87,7 b' var IPython = (function (IPython) {'
                             "have 1 or more characters and can contain any characters " +
                             "except :/\\. Please enter a new notebook name:"
                         );
+                        return false;
                     } else {
                         IPython.notebook.set_notebook_name(new_name);
                         IPython.notebook.save_notebook();

IPython/nbconvert/exporters/exporter.py

@@ -20,7 +20,6 b' from __future__ import print_function, absolute_import'
 import io
 import os
 import inspect
-import types
 import copy
 import collections
 import datetime
@@ -35,6 +34,7 b' from IPython.nbformat import current as nbformat'
 from IPython.utils.traitlets import MetaHasTraits, DottedObjectName, Unicode, List, Dict
 from IPython.utils.importstring import import_item
 from IPython.utils.text import indent
+from IPython.utils import py3compat
 
 from IPython.nbconvert import transformers as nbtransformers
 from IPython.nbconvert import filters
@@ -247,11 +247,11 b' class Exporter(Configurable):'
         """
         if transformer is None:
             raise TypeError('transformer')
-        isclass = inspect.isclass(transformer)
+        isclass = isinstance(transformer, type)
         constructed = not isclass
 
         #Handle transformer's registration based on it's type
-        if constructed and isinstance(transformer, types.StringTypes):
+        if constructed and isinstance(transformer, py3compat.string_types):
             #Transformer is a string, import the namespace and recursively call
             #this register_transformer method
             transformer_cls = import_item(transformer)
@@ -280,7 +280,7 b' class Exporter(Configurable):'
             raise TypeError('transformer')
 
 
-    def register_filter(self, name, filter):
+    def register_filter(self, name, jinja_filter):
         """
         Register a filter.
         A filter is a function that accepts and acts on one string.  
@@ -292,31 +292,33 b' class Exporter(Configurable):'
             name to give the filter in the Jinja engine
         filter : filter
         """
-        if filter is None:
+        if jinja_filter is None:
             raise TypeError('filter')
-        isclass = inspect.isclass(filter)
+        isclass = isinstance(jinja_filter, type)
         constructed = not isclass
 
         #Handle filter's registration based on it's type
-        if constructed and isinstance(filter, types.StringTypes):
+        if constructed and isinstance(jinja_filter, py3compat.string_types):
             #filter is a string, import the namespace and recursively call
             #this register_filter method
-            filter_cls = import_item(filter)
+            filter_cls = import_item(jinja_filter)
             return self.register_filter(name, filter_cls)
         
-        if constructed and hasattr(filter, '__call__'):
+        if constructed and hasattr(jinja_filter, '__call__'):
             #filter is a function, no need to construct it.
-            self.environment.filters[name] = filter
-            return filter
+            self.environment.filters[name] = jinja_filter
+            return jinja_filter
 
-        elif isclass and isinstance(filter, MetaHasTraits):
+        elif isclass and isinstance(jinja_filter, MetaHasTraits):
             #filter is configurable.  Make sure to pass in new default for 
             #the enabled flag if one was specified.
-            self.register_filter(name, filter(parent=self))
+            filter_instance = jinja_filter(parent=self)
+            self.register_filter(name, filter_instance )
 
         elif isclass:
             #filter is not configurable, construct it
-            self.register_filter(name, filter())
+            filter_instance = jinja_filter()
+            self.register_filter(name, filter_instance)
 
         else:
             #filter is an instance of something without a __call__ 
@@ -382,12 +384,12 b' class Exporter(Configurable):'
         """
         
         #Add default filters to the Jinja2 environment
-        for key, value in default_filters.iteritems():
+        for key, value in default_filters.items():
             self.register_filter(key, value)
 
         #Load user filters.  Overwrite existing filters if need be.
         if self.filters:
-            for key, user_filter in self.filters.iteritems():
+            for key, user_filter in self.filters.items():
                 self.register_filter(key, user_filter)
 
 

IPython/nbconvert/exporters/latex.py

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

IPython/nbconvert/filters/ansi.py

@@ -111,12 +111,22 b' def single_ansi2latex(code):'
     Return latex code and number of open brackets.
     """
     for color in coloransi.color_templates:
-        colcode = getattr(coloransi.TermColors,color[0])
+
+        #Make sure to get the color code (which is a part of the overall style)
+        # i.e.  0;31 is valid
+        #       31 is also valid, and means the same thing
+        #coloransi.color_templates stores the longer of the two formats %d;%d
+        #Get the short format so we can parse that too.  Short format only exist
+        #if no other formating is applied (the other number must be a 0)!
+        style_code = getattr(coloransi.TermColors, color[0])
+        color_code = style_code.split(';')[1]
+        is_normal = style_code.split(';')[0] == '0'
+
         # regular fonts
-        if code == colcode:
+        if (code == style_code) or (is_normal and code == color_code):
             return '\\'+color[0].lower()+'{', 1
         # bold fonts
-        if code == colcode[:3]+str(1)+colcode[3:]:
+        if code == style_code[:3]+str(1)+style_code[3:]:
             return '\\textbf{\\textcolor{'+color[0].lower()+'}{', 2
     return '', 0
 
@@ -135,11 +145,13 b' def ansi2latex(text):'
         if openbrack:
             outstring += '}'*openbrack
             openbrack = 0
-        if match.group() <> coloransi.TermColors.Normal and not openbrack:
+        if not (match.group() == coloransi.TermColors.Normal or openbrack):
             texform, openbrack = single_ansi2latex(match.group())
             outstring += texform
         last_end = match.end()
+
+    #Add the remainer of the string and THEN close any remaining color brackets.
+    outstring += text[last_end:]
     if openbrack: 
         outstring += '}'*openbrack
-    outstring += text[last_end:]
     return outstring.strip()

IPython/nbconvert/filters/datatypefilter.py

@@ -23,7 +23,7 b" __all__ = ['DataTypeFilter']"
 
 class DataTypeFilter(NbConvertBase):
     """ Returns the preferred display format """
-
+        
     def __call__(self, output):
         """ Return the first available format in the priority """
 

IPython/nbconvert/filters/strings.py

@@ -19,7 +19,6 b' templates.'
 import re
 import textwrap
 from xml.etree import ElementTree
-
 from IPython.utils import py3compat
 
 #-----------------------------------------------------------------------------
@@ -61,7 +60,7 b' def html_text(element):'
     
     Analog of jQuery's $(element).text()
     """
-    if not isinstance(element, (ElementTree.ElementTree, ElementTree.Element)):
+    if isinstance(element, py3compat.string_types):
         element = ElementTree.fromstring(element)
     
     text = element.text or ""

IPython/nbconvert/templates/fullhtml.tpl

@@ -22,6 +22,7 b' body {'
 }
 
 pre {
+    padding: 0.2em;
     border: none;
     margin: 0px;
     font-size: 13px;

IPython/nbconvert/templates/latex/base.tplx

@@ -60,6 +60,13 b' it introduces a new line'
 \end{center}
 ((*- endblock -*))
 
+((*- block data_pdf -*))
+\begin{center}
+\includegraphics[width=0.7\textwidth]{(((output.pdf_filename[:-4])))}
+\par
+\end{center}
+((*- endblock -*))
+
 ((* block pyout *))
 ((* block data_priority scoped *))((( super() )))((* endblock *))
 ((* endblock pyout *))

IPython/nbconvert/templates/latex/sphinx_base.tplx

@@ -358,6 +358,10 b' Note: For best display, use latex syntax highlighting. =))'
     ((( conditionally_center_output(insert_graphics(output.svg_filename)) )))
 ((*- endblock -*))
 
+((*- block data_pdf -*))
+    ((( conditionally_center_output(insert_graphics(output.pdf_filename[:-4])) )))
+((*- endblock -*))
+
 ((*- block data_latex *))
     ((* if resources.sphinx.centeroutput *))\begin{center}((* endif -*))((( output.latex | rm_math_space )))((*- if resources.sphinx.centeroutput *))\end{center} ((* endif -*))
 ((*- endblock -*))

IPython/nbconvert/templates/reveal.tpl

@@ -79,7 +79,7 b' font-size: 80%;'
 }
 div.output_prompt {
     /* 5px right shift to account for margin in parent container */
-    margin: 5px 5px 0 -5px;
+    margin: 5px 5px 0 0;
 }
 .rendered_html p {
 text-align: inherit;

IPython/nbconvert/transformers/convertfigures.py

@@ -49,31 +49,16 b' class ConvertFiguresTransformer(Transformer):'
         #Loop through all of the datatypes of the outputs in the cell.
         for index, cell_out in enumerate(cell.get('outputs', [])):
             for data_type, data in cell_out.items():
-
-                #Get the name of the file exported by the extract figure 
-                #transformer.  Do not try to convert the figure if the extract
-                #fig transformer hasn't touched it
-                filename = cell_out.get(data_type + '_filename', None)
-                if filename:
-                    figure_name = filename[:filename.rfind('.')]
-                    self._convert_figure(cell_out, figure_name, resources, data_type, data)
+                # this must run *before* extract figures,
+                # so figure_name and filename do not exist
+                self._convert_figure(cell_out, resources, data_type, data)
         return cell, resources
 
 
-    def _convert_figure(self, cell_out, resources, figure_name, data_type, data):
+    def _convert_figure(self, cell_out, resources, data_type, data):
         """
         Convert a figure and output the results to the cell output
         """
-
-        if not self.to_format in cell_out:
-            if data_type == self.from_format:
-                filename = figure_name + '.' + self.to_format
-                if filename not in resources['figures']:
-
-                    #On the cell, make the figure available via 
-                    #   cell.outputs[i].pdf_filename  ... etc (PDF in example)
-                    cell_out[self.to_format + '_filename'] = filename
-
-                    #In the resources, make the figure available via
-                    #   resources['figures']['filename'] = data
-                    resources['figures'][filename] = self.convert_figure(data_type, data)
+        if not self.to_format in cell_out and data_type == self.from_format:
+            data = self.convert_figure(data_type, data)
+            cell_out[self.to_format] = data

IPython/nbconvert/transformers/extractfigure.py

@@ -13,9 +13,12 b" notebook file. The extracted figures are returned in the 'resources' dictionary"
 # Imports
 #-----------------------------------------------------------------------------
 
+import base64
 import sys
+
 from IPython.utils.traitlets import Unicode
 from .base import Transformer
+from IPython.utils import py3compat
 
 #-----------------------------------------------------------------------------
 # Classes
@@ -64,7 +67,10 b' class ExtractFigureTransformer(Transformer):'
 
                     #Binary files are base64-encoded, SVG is already XML
                     if out_type in ('png', 'jpg', 'jpeg', 'pdf'):
-                        data = data.decode('base64')
+                        # data is b64-encoded as text (str, unicode)
+                        # decodestring only accepts bytes
+                        data = py3compat.cast_bytes(data)
+                        data = base64.decodestring(data)
                     elif sys.platform == 'win32':
                         data = data.replace('\n', '\r\n').encode("UTF-8")
                     else:

IPython/nbconvert/transformers/svg2pdf.py

@@ -13,6 +13,8 b' one format to another.'
 # Imports
 #-----------------------------------------------------------------------------
 
+import base64
+import io
 import os
 import sys
 import subprocess
@@ -27,9 +29,7 b' from .convertfigures import ConvertFiguresTransformer'
 # Constants
 #-----------------------------------------------------------------------------
 
-INKSCAPE_COMMAND = 'inkscape --without-gui --export-pdf="{to_filename}" "{from_filename}"'
-#INKSCAPE_OSX_COMMAND = '/Applications/Inkscape.app/Contents/Resources/bin/inkscape --without-gui --export-pdf="{to_filename}" "{from_filename}"'
-
+INKSCAPE_APP = '/Applications/Inkscape.app/Contents/Resources/bin/inkscape'
 
 #-----------------------------------------------------------------------------
 # Classes
@@ -37,16 +37,37 b' INKSCAPE_COMMAND = \'inkscape --without-gui --export-pdf="{to_filename}" "{from_f'
 
 class SVG2PDFTransformer(ConvertFiguresTransformer):
     """
-    Converts all of the outputs in a notebook from one format to another.
+    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')
+    
+    command = Unicode(config=True,
+        help="""The command to use for converting SVG to PDF
+        
+        This string is a template, which will be formatted with the keys
+        to_filename and from_filename.
+        
+        The conversion call must read the SVG from {from_flename},
+        and write a PDF to {to_filename}.
+        """)
+    
+    def _command_default(self):
+        return self.inkscape + \
+               ' --without-gui --export-pdf="{to_filename}" "{from_filename}"'
+    
+    inkscape = Unicode(config=True, help="The path to Inkscape, if necessary")
+    def _inkscape_default(self):
+        if sys.platform == "darwin":
+            if os.path.isfile(INKSCAPE_APP):
+                return INKSCAPE_APP
+        return "inkscape"
 
 
     def convert_figure(self, data_format, data):
         """
-        Convert a single Svg figure.  Returns converted data.
+        Convert a single SVG figure to PDF.  Returns converted data.
         """
 
         #Work in a temporary directory
@@ -54,24 +75,21 b' class SVG2PDFTransformer(ConvertFiguresTransformer):'
             
             #Write fig to temp file
             input_filename = os.path.join(tmpdir, 'figure.' + data_format)
-            with open(input_filename, 'w') as f:
+            # SVG data is unicode text
+            with io.open(input_filename, 'w', encoding='utf8') as f:
                 f.write(data)
 
-            #Determine command (different on Mac OSX)
-            command = INKSCAPE_COMMAND 
-            if sys.platform == 'darwin':
-                command = INKSCAPE_OSX_COMMAND
-
             #Call conversion application
             output_filename = os.path.join(tmpdir, 'figure.pdf')
-            shell = command.format(from_filename=input_filename, 
+            shell = self.command.format(from_filename=input_filename, 
                                    to_filename=output_filename)
             subprocess.call(shell, shell=True) #Shell=True okay since input is trusted.
 
             #Read output from drive
+            # return value expects a filename
             if os.path.isfile(output_filename):
                 with open(output_filename, 'rb') as f:
-                    return f.read().encode("base64") #PDF is a nb supported binary
-                                                     #data type, so base64 encode.
+                    # PDF is a nb supported binary, data type, so base64 encode.
+                    return base64.encodestring(f.read())
             else:
-                return TypeError("Inkscape svg to png conversion failed")
+                raise TypeError("Inkscape svg to png conversion failed")

IPython/nbconvert/writers/debug.py

@@ -27,7 +27,7 b' class DebugWriter(WriterBase):'
     resources that were extracted from the notebook(s) during export."""
 
 
-    def write(self, output, resources, **kw):
+    def write(self, output, resources, notebook_name='notebook', **kw):
         """
         Consume and write Jinja output.
 

IPython/qt/console/console_widget.py

@@ -9,6 +9,7 b' import os.path'
 import re
 import sys
 from textwrap import dedent
+import time
 from unicodedata import category
 import webbrowser
 
@@ -291,6 +292,21 b' class ConsoleWidget(LoggingConfigurable, QtGui.QWidget):'
         self._reading_callback = None
         self._tab_width = 8
 
+        # List of strings pending to be appended as plain text in the widget.
+        # The text is not immediately inserted when available to not
+        # choke the Qt event loop with paint events for the widget in
+        # case of lots of output from kernel.
+        self._pending_insert_text = []
+
+        # Timer to flush the pending stream messages. The interval is adjusted
+        # later based on actual time taken for flushing a screen (buffer_size)
+        # of output text.
+        self._pending_text_flush_interval = QtCore.QTimer(self._control)
+        self._pending_text_flush_interval.setInterval(100)
+        self._pending_text_flush_interval.setSingleShot(True)
+        self._pending_text_flush_interval.timeout.connect(
+                                            self._flush_pending_stream)
+
         # Set a monospaced font.
         self.reset_font()
 
@@ -877,8 +893,11 b' class ConsoleWidget(LoggingConfigurable, QtGui.QWidget):'
         # Determine where to insert the content.
         cursor = self._control.textCursor()
         if before_prompt and (self._reading or not self._executing):
+            self._flush_pending_stream()
             cursor.setPosition(self._append_before_prompt_pos)
         else:
+            if insert != self._insert_plain_text:
+                self._flush_pending_stream()
             cursor.movePosition(QtGui.QTextCursor.End)
         start_pos = cursor.position()
 
@@ -1459,6 +1478,20 b' class ConsoleWidget(LoggingConfigurable, QtGui.QWidget):'
 
         return False
 
+    def _flush_pending_stream(self):
+        """ Flush out pending text into the widget. """
+        text = self._pending_insert_text
+        self._pending_insert_text = []
+        buffer_size = self._control.document().maximumBlockCount()
+        if buffer_size > 0:
+            text = self._get_last_lines_from_list(text, buffer_size)
+        text = ''.join(text)
+        t = time.time()
+        self._insert_plain_text(self._get_end_cursor(), text, flush=True)
+        # Set the flush interval to equal the maximum time to update text.
+        self._pending_text_flush_interval.setInterval(max(100,
+                                                 (time.time()-t)*1000))
+
     def _format_as_columns(self, items, separator='  '):
         """ Transform a list of strings into a single string with columns.
 
@@ -1540,6 +1573,43 b' class ConsoleWidget(LoggingConfigurable, QtGui.QWidget):'
         else:
             return None
 
+    def _get_last_lines(self, text, num_lines, return_count=False):
+        """ Return last specified number of lines of text (like `tail -n`).
+        If return_count is True, returns a tuple of clipped text and the
+        number of lines in the clipped text.
+        """
+        pos = len(text)
+        if pos < num_lines:
+            if return_count:
+                return text, text.count('\n') if return_count else text
+            else:
+                return text
+        i = 0
+        while i < num_lines:
+            pos = text.rfind('\n', None, pos)
+            if pos == -1:
+                pos = None
+                break
+            i += 1
+        if return_count:
+            return text[pos:], i
+        else:
+            return text[pos:]
+
+    def _get_last_lines_from_list(self, text_list, num_lines):
+        """ Return the list of text clipped to last specified lines.
+        """
+        ret = []
+        lines_pending = num_lines
+        for text in reversed(text_list):
+            text, lines_added = self._get_last_lines(text, lines_pending,
+                                                     return_count=True)
+            ret.append(text)
+            lines_pending -= lines_added
+            if lines_pending <= 0:
+                break
+        return ret[::-1]
+
     def _get_prompt_cursor(self):
         """ Convenience method that returns a cursor for the prompt position.
         """
@@ -1644,10 +1714,29 b' class ConsoleWidget(LoggingConfigurable, QtGui.QWidget):'
         cursor.endEditBlock()
         return text
 
-    def _insert_plain_text(self, cursor, text):
+    def _insert_plain_text(self, cursor, text, flush=False):
         """ Inserts plain text using the specified cursor, processing ANSI codes
             if enabled.
         """
+        # maximumBlockCount() can be different from self.buffer_size in
+        # case input prompt is active.
+        buffer_size = self._control.document().maximumBlockCount()
+
+        if self._executing and not flush and \
+                self._pending_text_flush_interval.isActive():
+            self._pending_insert_text.append(text)
+            if buffer_size > 0:
+                self._pending_insert_text = self._get_last_lines_from_list(
+                                        self._pending_insert_text, buffer_size)
+            return
+
+        if self._executing and not self._pending_text_flush_interval.isActive():
+            self._pending_text_flush_interval.start()
+
+        # Clip the text to last `buffer_size` lines.
+        if buffer_size > 0:
+            text = self._get_last_lines(text, buffer_size)
+
         cursor.beginEditBlock()
         if self.ansi_codes:
             for substring in self._ansi_processor.split_string(text):

IPython/testing/iptest.py

@@ -167,7 +167,6 b" have['wx'] = test_for('wx')"
 have['wx.aui'] = test_for('wx.aui')
 have['azure'] = test_for('azure')
 have['sphinx'] = test_for('sphinx')
-have['markdown'] = test_for('markdown')
 
 min_zmq = (2,1,11)
 
@@ -254,6 +253,12 b' def make_exclude():'
     exclusions.append(ipjoin('lib', 'inputhookgtk'))
     exclusions.append(ipjoin('kernel', 'zmq', 'gui', 'gtkembed'))
 
+    #Also done unconditionally, exclude nbconvert directories containing
+    #config files used to test.  Executing the config files with iptest would
+    #cause an exception.
+    exclusions.append(ipjoin('nbconvert', 'tests', 'files'))
+    exclusions.append(ipjoin('nbconvert', 'exporters', 'tests', 'files'))
+
     # These have to be skipped on win32 because the use echo, rm, cd, etc.
     # See ticket https://github.com/ipython/ipython/issues/87
     if sys.platform == 'win32':
@@ -307,7 +312,7 b' def make_exclude():'
     if not have['azure']:
         exclusions.append(ipjoin('html', 'services', 'notebooks', 'azurenbmanager'))
 
-    if not all((have['pygments'], have['jinja2'], have['markdown'], have['sphinx'])):
+    if not all((have['pygments'], have['jinja2'], have['sphinx'])):
         exclusions.append(ipjoin('nbconvert'))
 
     # This is needed for the reg-exp to match on win32 in the ipdoctest plugin.
@@ -459,7 +464,7 b' def make_runners(inc_slow=False):'
         if inc_slow:
             nose_pkg_names.append('parallel')
 
-    if all((have['pygments'], have['jinja2'], have['markdown'], have['sphinx'])):
+    if all((have['pygments'], have['jinja2'], have['sphinx'])):
         nose_pkg_names.append('nbconvert')
 
     # For debugging this code, only load quick stuff

docs/source/install/install.txt

@@ -41,14 +41,15 b' optional dependencies:'
 
 .. code-block:: bash
 
-    $ easy_install ipython[zmq,qtconsole,notebook,test]
+    $ easy_install ipython[all]
 
 This will get:
 
 - jinja2, needed for the notebook
+- sphinx, needed for nbconvert
 - pyzmq, needed for IPython's parallel computing features, qt console and
   notebook.
-- pygments, used by the Qt console for syntax highlighting.
+- pygments, used by nbconvert and the Qt console for syntax highlighting.
 - tornado, needed by the web-based notebook
 - nose, used by the test suite.
 
@@ -275,7 +276,7 b' and OSX clients will use the shell ssh command, but on Windows, we also'
 support tunneling with paramiko_.
 
 Dependencies for IPython.kernel.zmq
-============================
+===================================
 
 pyzmq
 -----
@@ -396,11 +397,29 b' There are some early reports that the Notebook works on Internet Explorer 10, bu'
 expect there will be some CSS issues related to the flexible box model.
 
 
+Dependencies for nbconvert (converting notebooks to various formats)
+====================================================================
+
+pandoc
+------
+
+The most important dependency of nbconvert is Pandoc_, a document format translation program.
+This is not a Python package, so it cannot be expressed as a regular IPython dependency with setuptools.
+
+To install pandoc on Linux, you can generally use your package manager::
+
+    sudo apt-get install pandoc
+
+On other platforms, you can get pandoc from `their website <http://johnmacfarlane.net/pandoc/installing.html>`_.
+
+
 .. _ZeroMQ: http://www.zeromq.org
 .. _PyZMQ: https://github.com/zeromq/pyzmq
 .. _paramiko: https://github.com/robey/paramiko
 .. _pygments: http://pygments.org
 .. _pexpect: http://www.noah.org/wiki/Pexpect
 .. _Jinja: http://jinja.pocoo.org
+.. _Sphinx: http://sphinx-doc.org
+.. _pandoc: http://johnmacfarlane.net/pandoc
 .. _Tornado: http://www.tornadoweb.org
 .. _MathJax: http://www.mathjax.org

setup.py

@@ -280,6 +280,14 b" if 'setuptools' in sys.modules:"
         notebook = ['tornado>=2.0', 'pyzmq>=2.1.11', 'jinja2'],
         nbconvert = ['pygments', 'jinja2', 'Sphinx>=0.3']
     )
+    everything = set()
+    for deps in setup_args['extras_require'].values():
+        if not isinstance(deps, list):
+            deps = [deps]
+        for dep in deps:
+            everything.add(dep)
+    setup_args['extras_require']['all'] = everything
+    
     requires = setup_args.setdefault('install_requires', [])
     setupext.display_status = False
     if not setupext.check_for_readline():

setupbase.py

@@ -152,7 +152,8 b' def find_package_data():'
         'IPython.html' : ['templates/*'] + static_data,
         'IPython.qt.console' : ['resources/icon/*.svg'],
         'IPython.nbconvert' : ['templates/*.tpl', 'templates/latex/*.tplx',
-            'templates/latex/skeleton/*.tplx', 'templates/skeleton/*']
+            'templates/latex/skeleton/*.tplx', 'templates/skeleton/*', 
+            'tests/files/*.*', 'exporters/tests/files/*.*']
     }
     return package_data