Merge pull request #2181 from minrk/displaymagics

add %%javascript, %%svg, and %%latex display magics

IPython/core/magics/display.py

@@ -0,0 +1,47 b''
+"""Simple magics for display formats"""
+#-----------------------------------------------------------------------------
+#  Copyright (c) 2012 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
+#-----------------------------------------------------------------------------
+
+# Our own packages
+from IPython.core.display import display, Javascript, Latex, SVG
+from IPython.core.magic import  (
+    Magics, magics_class, line_magic, cell_magic
+)
+
+#-----------------------------------------------------------------------------
+# Magic implementation classes
+#-----------------------------------------------------------------------------
+
+
+@magics_class
+class DisplayMagics(Magics):
+    """Magics for displaying various output types with literals
+    
+    Defines javascript/latex cell magics for writing blocks in those languages,
+    to be rendered in the frontend.
+    """
+    
+    @cell_magic
+    def javascript(self, line, cell):
+        """Run the cell block of Javascript code"""
+        display(Javascript(cell))
+        
+    
+    @cell_magic
+    def latex(self, line, cell):
+        """Render the cell as a block of latex"""
+        display(Latex(cell))
+
+    @cell_magic
+    def svg(self, line, cell):
+        """Render the cell as an SVG literal"""
+        display(SVG(cell))

IPython/core/interactiveshell.py

@@ -2040,7 +2040,7 b' class InteractiveShell(SingletonConfigurable):'
         self.define_magic = self.magics_manager.define_magic
 
         self.register_magics(m.AutoMagics, m.BasicMagics, m.CodeMagics,
-            m.ConfigMagics, m.DeprecatedMagics, m.ExecutionMagics,
+            m.ConfigMagics, m.DeprecatedMagics, m.DisplayMagics, m.ExecutionMagics,
             m.ExtensionMagics, m.HistoryMagics, m.LoggingMagics,
             m.NamespaceMagics, m.OSMagics, m.PylabMagics, m.ScriptMagics,
         )

IPython/core/magics/__init__.py

@@ -18,6 +18,7 b' from .basic import BasicMagics'
 from .code import CodeMagics, MacroToEdit
 from .config import ConfigMagics
 from .deprecated import DeprecatedMagics
+from .display import DisplayMagics
 from .execution import ExecutionMagics
 from .extension import ExtensionMagics
 from .history import HistoryMagics

docs/examples/notebooks/00_notebook_tour.ipynb

@@ -1091,6 +1091,53 b''
      "cell_type": "markdown",
      "metadata": {},
      "source": [
+      "Or you can enter latex directly with the `%%latex` cell magic:"
+     ]
+    },
+    {
+     "cell_type": "code",
+     "collapsed": false,
+     "input": [
+      "%%latex\n",
+      "\\begin{aligned}\n",
+      "\\nabla \\times \\vec{\\mathbf{B}} -\\, \\frac1c\\, \\frac{\\partial\\vec{\\mathbf{E}}}{\\partial t} & = \\frac{4\\pi}{c}\\vec{\\mathbf{j}} \\\\\n",
+      "\\nabla \\cdot \\vec{\\mathbf{E}} & = 4 \\pi \\rho \\\\\n",
+      "\\nabla \\times \\vec{\\mathbf{E}}\\, +\\, \\frac1c\\, \\frac{\\partial\\vec{\\mathbf{B}}}{\\partial t} & = \\vec{\\mathbf{0}} \\\\\n",
+      "\\nabla \\cdot \\vec{\\mathbf{B}} & = 0\n",
+      "\\end{aligned}"
+     ],
+     "language": "python",
+     "metadata": {},
+     "outputs": [
+      {
+       "latex": [
+        "\\begin{aligned}\n",
+        "\\nabla \\times \\vec{\\mathbf{B}} -\\, \\frac1c\\, \\frac{\\partial\\vec{\\mathbf{E}}}{\\partial t} & = \\frac{4\\pi}{c}\\vec{\\mathbf{j}} \\\\\n",
+        "\\nabla \\cdot \\vec{\\mathbf{E}} & = 4 \\pi \\rho \\\\\n",
+        "\\nabla \\times \\vec{\\mathbf{E}}\\, +\\, \\frac1c\\, \\frac{\\partial\\vec{\\mathbf{B}}}{\\partial t} & = \\vec{\\mathbf{0}} \\\\\n",
+        "\\nabla \\cdot \\vec{\\mathbf{B}} & = 0\n",
+        "\\end{aligned}"
+       ],
+       "output_type": "display_data",
+       "text": [
+        "<IPython.core.display.Latex at 0x10a617c90>"
+       ]
+      }
+     ],
+     "prompt_number": 12
+    },
+    {
+     "cell_type": "markdown",
+     "metadata": {},
+     "source": [
+      "There is also a `%%javascript` cell magic for running javascript directly,\n",
+      "and `%%svg` for manually entering SVG content."
+     ]
+    },
+    {
+     "cell_type": "markdown",
+     "metadata": {},
+     "source": [
       "# Loading external codes\n",
       "* Drag and drop a ``.py`` in the dashboard\n",
       "* Use ``%load`` with any local or remote url: [the Matplotlib Gallery!](http://matplotlib.sourceforge.net/gallery.html)\n",