Merge remote-tracking branch 'tonysyu/screenshots-update' into doc-fixes-1-3

Conflicts:
	doc/users/screenshots.rst

Author: mdboom

doc/pyplots/tex_demo.py

@@ -1,5 +1,6 @@
-#!/usr/bin/env python
 """
+Demo of TeX rendering.
+
 You can use TeX to render all of your matplotlib text if the rc
 parameter text.usetex is set.  This works currently on the agg and ps
 backends, and requires that you have tex and the other dependencies
@@ -10,26 +11,25 @@
 ~/.tex.cache
 
 """
-from matplotlib import rc
-from numpy import arange, cos, pi
-from matplotlib.pyplot import figure, axes, plot, xlabel, ylabel, title, \
-     grid, savefig, show
+import numpy as np
+import matplotlib.pyplot as plt
 
 
-rc('text', usetex=True)
-rc('font', family='serif')
-figure(1, figsize=(6,4))
-ax = axes([0.1, 0.1, 0.8, 0.7])
-t = arange(0.0, 1.0+0.01, 0.01)
-s = cos(2*2*pi*t)+2
-plot(t, s)
+# Example data
+t = np.arange(0.0, 1.0 + 0.01, 0.01)
+s = np.cos(4 * np.pi * t) + 2
 
-xlabel(r'\textbf{time (s)}')
-ylabel(r'\textit{voltage (mV)}',fontsize=16)
-title(r"\TeX\ is Number $\displaystyle\sum_{n=1}^\infty\frac{-e^{i\pi}}{2^n}$!",
-      fontsize=16, color='r')
-grid(True)
-savefig('tex_demo')
+plt.rc('text', usetex=True)
+plt.rc('font', family='serif')
+plt.plot(t, s)
 
+plt.xlabel(r'\textbf{time} (s)')
+plt.ylabel(r'\textit{voltage} (mV)',fontsize=16)
+plt.title(r"\TeX\ is Number "
+          r"$\displaystyle\sum_{n=1}^\infty\frac{-e^{i\pi}}{2^n}$!",
+          fontsize=16, color='gray')
+# Make room for the ridiculously large title.
+plt.subplots_adjust(top=0.8)
 
-show()
+plt.savefig('tex_demo')
+plt.show()