diff --git a/tests/ipynbref/reveal.orig_slides.html b/tests/ipynbref/reveal.orig_slides.html index 8262e65..39c023a 100644 --- a/tests/ipynbref/reveal.orig_slides.html +++ b/tests/ipynbref/reveal.orig_slides.html @@ -1,7 +1,3 @@ -<<<<<<< HEAD -======= - ->>>>>>> damianavila/reveal_css_fix @@ -108,8 +104,6 @@ b,strong { font-weight: bold; } -======= -======= ->>>>>>> damianavila/reveal_css_fix - -/* Flexible box model classes */ -/* Taken from Alex Russell http://infrequently.org/2009/08/css-3-progress/ */ - -.hbox { - display: -webkit-box; - -webkit-box-orient: horizontal; - -webkit-box-align: stretch; - - display: -moz-box; - -moz-box-orient: horizontal; - -moz-box-align: stretch; - - display: box; - box-orient: horizontal; - box-align: stretch; -} - -.hbox > * { - -webkit-box-flex: 0; - -moz-box-flex: 0; - box-flex: 0; -} - -.vbox { - display: -webkit-box; - -webkit-box-orient: vertical; - -webkit-box-align: stretch; - - display: -moz-box; - -moz-box-orient: vertical; - -moz-box-align: stretch; - - display: box; - box-orient: vertical; - box-align: stretch; -} - -.vbox > * { - -webkit-box-flex: 0; - -moz-box-flex: 0; - box-flex: 0; -} - -.reverse { - -webkit-box-direction: reverse; - -moz-box-direction: reverse; - box-direction: reverse; -} - -.box-flex0 { - -webkit-box-flex: 0; - -moz-box-flex: 0; - box-flex: 0; -} - -.box-flex1, .box-flex { - -webkit-box-flex: 1; - -moz-box-flex: 1; - box-flex: 1; -} - -.box-flex2 { - -webkit-box-flex: 2; - -moz-box-flex: 2; - box-flex: 2; -} - -.box-group1 { - -webkit-box-flex-group: 1; - -moz-box-flex-group: 1; - box-flex-group: 1; -} - -.box-group2 { - -webkit-box-flex-group: 2; - -moz-box-flex-group: 2; - box-flex-group: 2; -} - -.start { - -webkit-box-pack: start; - -moz-box-pack: start; - box-pack: start; -} - -.end { - -webkit-box-pack: end; - -moz-box-pack: end; - box-pack: end; -} - -.center { - -webkit-box-pack: center; - -moz-box-pack: center; - box-pack: center; -} - - - - - -<<<<<<< HEAD ->>>>>>> A new implementation of reveal converter with jinja templates. -======= ->>>>>>> damianavila/reveal_css_fix - -<<<<<<< HEAD -======= - ->>>>>>> damianavila/reveal_css_fix - -
-
-

A brief tour of the IPython notebook

This document will give you a brief tour of the capabilities of the IPython notebook.
@@ -1831,8 +1202,8 @@ system.

The rest of the notebooks in this directory illustrate various other aspects and capabilities of the IPython notebook; some of them may require additional libraries to be executed.

-
+ -
-
+ +
+
In [1]:
@@ -1852,15 +1223,11 @@ so things like shell aliases and magic commands still work:

-
+
-
-
Out[1]:
-
-
-
- +
Out[1]:
+
u'/Users/minrk/dev/ip/mine/docs/examples/notebooks'
@@ -1876,14 +1243,11 @@ so things like shell aliases and magic commands still work:

-
+
-
-
-
-
-
+
+
00_notebook_tour.ipynb          callbacks.ipynb                 python-logo.svg
 01_notebook_introduction.ipynb  cython_extension.ipynb          rmagic_extension.ipynb
 Animations_and_Progress.ipynb   display_protocol.ipynb          sympy.ipynb
@@ -1907,29 +1271,26 @@ animation.m4v                   progbar.ipynb
 
 
-
+
-
-
-
-
-
+
+
The IPython notebook is great!
 
-
-
-
+
+ +
+

Plots with matplotlib

-

IPython adds an 'inline' matplotlib backend, which embeds any matplotlib figures into the notebook.

@@ -1943,14 +1304,11 @@ which embeds any matplotlib figures into the notebook.

-
+
-
-
-
-
-
+
+
 Welcome to pylab, a matplotlib-based Python environment [backend: module://IPython.zmq.pylab.backend_inline].
 For more information, type 'help(pylab)'.
@@ -1971,15 +1329,11 @@ For more information, type 'help(pylab)'.
 
 
-
+
-
-
-
-
-
- +
+

You can paste blocks of input with prompt markers, such as those from the official Python tutorial

@@ -2355,21 +1710,19 @@ kL6BgYHBGML/B3suibfww4xPAAAAAElFTkSuQmCC
-
+
-
-
-
-
-
+
+
Be careful not to fall off!
 
-
+ +

Errors are shown in informative ways:

@@ -2382,14 +1735,11 @@ kL6BgYHBGML/B3suibfww4xPAAAAAElFTkSuQmCC -
+
-
-
-
-
-
+
+
ERROR: File `u'non_existent_file.py'` not found.
@@ -2407,16 +1757,12 @@ kL6BgYHBGML/B3suibfww4xPAAAAAElFTkSuQmCC
-
+
-
-
-
-
-
-
----------------------------------------------------------------------------
+
+
+
---------------------------------------------------------------------------
 ZeroDivisionError                         Traceback (most recent call last)
 <ipython-input-8-dc39888fd1d2> in <module>()
       1 x = 1
@@ -2428,13 +1774,13 @@ kL6BgYHBGML/B3suibfww4xPAAAAAElFTkSuQmCC
 
-
+ +

When IPython needs to display additional information (such as providing details on an object via x? it will automatically invoke a pager at the bottom of the screen:

-
- -
+
+
In [18]:
@@ -2444,9 +1790,9 @@ it will automatically invoke a pager at the bottom of the screen:

-
-
-
+
+
+

Non-blocking output of kernel

If you execute the next cell, you will see the output arriving as it is generated, not all at the end.

@@ -2463,23 +1809,20 @@ it will automatically invoke a pager at the bottom of the screen:

-
+
-
-
-
-
-
+
+
0 1 2 3 4 5 6 7
 
-
-
-
+ +
+

Clean crash and restart

We call the low-level system libc.time routine with the wrong argument via @@ -2499,9 +1842,10 @@ ctypes to segfault the Python interpreter:

-
-
-
+ +
+
+

Markdown cells can contain formatted text and code

You can italicize, boldface

@@ -2520,14 +1864,17 @@ ctypes to segfault the Python interpreter:

x += 4; } -
+ +

Courtesy of MathJax, you can include mathematical expressions both inline: $e^{i\pi} + 1 = 0$ and displayed:

$$e^x=\sum_{i=0}^\infty \frac{1}{i!}x^i$$

-
-
-
+ +
+
+
+

Rich displays: include anyting a browser can show

Note that we have an actual protocol for this, see the display_protocol notebook for further details.

@@ -2543,15 +1890,11 @@ $e^{i\pi} + 1 = 0$ and displayed:

-
+
-
-
Out[1]:
-
-
-
- +
Out[1]:
+

An image can also be displayed from raw data or a url

@@ -2732,29 +2076,21 @@ HMRRca/E5hVINNIVwI2B56z6/3ExLRI31pXNAAAAAElFTkSuQmCC
-
+
-
-
Out[2]:
-
-
-
-
+
Out[2]:
+
-
- -
+ -
- -
+
-
-
+
+
+
+

Embedded vs Non-embedded Images

@@ -2864,7 +2198,8 @@ HMRRca/E5hVINNIVwI2B56z6/3ExLRI31pXNAAAAAElFTkSuQmCC -
+ +

Today's image from a webcam at Berkeley, (at the time I created this notebook). This should also work in the Qtconsole. Drawback is that the saved notebook will be larger, but the image will still be present offline.

@@ -2878,15 +2213,11 @@ Drawback is that the saved notebook will be larger, but the image will still be
-
+
-
-
Out[5]:
-
-
-
- +
Out[5]:
+

Today's image from same webcam at Berkeley, (refreshed every minutes, if you reload the notebook), visible only with an active internet connexion, that should be different from the previous one. This will not work on Qtconsole. Notebook saved with this kind of image will be lighter and always reflect the current version of the source, but the image won't display offline.

@@ -4099,29 +3431,23 @@ Notebook saved with this kind of image will be lighter and always reflect the cu
-
+
-
-
Out[6]:
-
-
-
-
+
Out[6]:
+
-
- -
+ -
-
-
+
+
+

Video

@@ -4143,15 +3469,11 @@ hosted content is trivial):

-
+
-
-
Out[7]:
-
-
-
-
+
Out[7]:
+
-
-
-
+
+
+

Mathematics

And we also support the display of mathematical expressions typeset in LaTeX, which is rendered @@ -4619,21 +3916,18 @@ renders it. The Math object will add the needed LaTeX delimiters (

-
+
-
-
Out[10]:
-
-
-
- +
Out[10]:
+
$$F(k) = \int_{-\infty}^{\infty} f(x) e^{2\pi i k} dx$$
-
+ +

With the Latex class, you have to include the delimiters yourself. This allows you to use other LaTeX modes such as eqnarray:

@@ -4652,15 +3946,11 @@ $$F(k) = \int_{-\infty}^{\infty} f(x) e^{2\pi i k} dx$$ -
+
-
-
Out[11]:
-
-
-
- +
Out[11]:
+
\begin{eqnarray} \nabla \times \vec{\mathbf{B}} -\, \frac1c\, \frac{\partial\vec{\mathbf{E}}}{\partial t} & = \frac{4\pi}{c}\vec{\mathbf{j}} \\ \nabla \cdot \vec{\mathbf{E}} & = 4 \pi \rho \\ @@ -4671,7 +3961,8 @@ $$F(k) = \int_{-\infty}^{\infty} f(x) e^{2\pi i k} dx$$
-
+ +

Or you can enter latex directly with the %%latex cell magic:

@@ -4690,15 +3981,11 @@ $$F(k) = \int_{-\infty}^{\infty} f(x) e^{2\pi i k} dx$$ -
+
-
-
-
-
-
- +
+
\begin{aligned} \nabla \times \vec{\mathbf{B}} -\, \frac1c\, \frac{\partial\vec{\mathbf{E}}}{\partial t} & = \frac{4\pi}{c}\vec{\mathbf{j}} \\ \nabla \cdot \vec{\mathbf{E}} & = 4 \pi \rho \\ @@ -4709,15 +3996,15 @@ $$F(k) = \int_{-\infty}^{\infty} f(x) e^{2\pi i k} dx$$
-
- -
+
+ -
-
-
+
+
+
+

Loading external codes

    @@ -4726,12 +4013,12 @@ and %%svg for manually entering SVG content.

In this notebook we've kept the output saved so you can see the result, but you should run the next cell yourself (with an active internet connection).

-
+ +

Let's make sure we have pylab again, in case we have restarted the kernel due to the crash demo above

-
- -
+
+
In [12]:
@@ -4740,14 +4027,11 @@ cell yourself (with an active internet connection).

-
+
-
-
-
-
-
+
+
 Welcome to pylab, a matplotlib-based Python environment [backend: module://IPython.zmq.pylab.backend_inline].
 For more information, type 'help(pylab)'.
@@ -4757,9 +4041,7 @@ For more information, type 'help(pylab)'.
 
-
- -
+
In [15]:
@@ -4769,9 +4051,7 @@ For more information, type 'help(pylab)'.
-
- -
+