Skip to content

Commit db5fbff

Browse files
committed
Merge v1.4.x into master
2 parents b97abc9 + cca0811 commit db5fbff

20 files changed

+40
-24
lines changed

INSTALL

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,13 @@ in addition to
7070

7171
In case Python is not installed for all users (not the default), the
7272
Microsoft Visual C++ 2008 (
73-
`64 bit <http://www.microsoft.com/download/en/details.aspx?id=15336>`_
73+
`64 bit <http://www.microsoft.com/download/en/details.aspx?id=15336>`__
7474
or
75-
`32 bit <http://www.microsoft.com/download/en/details.aspx?id=29>`_
75+
`32 bit <http://www.microsoft.com/download/en/details.aspx?id=29>`__
7676
for Python 2.6 to 3.2) or Microsoft Visual C++ 2010 (
77-
`64 bit <http://www.microsoft.com/en-us/download/details.aspx?id=14632>`_
77+
`64 bit <http://www.microsoft.com/en-us/download/details.aspx?id=14632>`__
7878
or
79-
`32 bit <http://www.microsoft.com/en-us/download/details.aspx?id=5555>`_
79+
`32 bit <http://www.microsoft.com/en-us/download/details.aspx?id=5555>`__
8080
for Python 3.3 and 3.4) redistributable packages need to be installed.
8181

8282
Matplotlib depends on `Pillow <https://pypi.python.org/pypi/Pillow>`_
@@ -236,7 +236,7 @@ ImageMagick
236236
Optional dependencies
237237
^^^^^^^^^^^^^^^^^^^^^
238238

239-
`Pillow <http://python-imaging.github.io/>`_
239+
`Pillow <http://python-imaging.github.io/>`__
240240
If Pillow is installed, matplotlib can read and write a larger
241241
selection of image file formats.
242242

doc/_static/basemap_contour1.png

232 KB
Loading
82.8 KB
Loading

doc/api/dviread.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
****************
2+
dviread
3+
****************
14

25
:mod:`matplotlib.dviread`
36
=========================

doc/api/index.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
colorbar_api.rst
2828
colors_api.rst
2929
dates_api.rst
30+
dviread.rst
3031
figure_api.rst
3132
finance_api.rst
3233
font_manager_api.rst
@@ -48,5 +49,6 @@
4849
ticker_api.rst
4950
tight_layout_api.rst
5051
tri_api.rst
52+
type1font.rst
5153
units_api.rst
5254
widgets_api.rst

doc/api/type1font.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
****************
2+
type1font
3+
****************
14

25
:mod:`matplotlib.type1font`
36
===========================

doc/conf.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
'sphinxext.github',
3535
'numpydoc']
3636

37+
exclude_patterns = ['api/api_changes/README.rst']
3738

3839
# Use IPython's console highlighting by default
3940
try:

doc/devel/gitwash/git_development.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,4 @@ Contents:
1313
set_up_fork
1414
configure_git
1515
development_workflow
16+
dot2_dot3

doc/mpl_toolkits/index.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Plots data on map projections, with continental and political
3030
boundaries, see `basemap <http://matplotlib.org/basemap>`_
3131
docs.
3232

33-
.. image:: http://matplotlib.org/basemap/_images/contour1.png
33+
.. image:: /_static/basemap_contour1.png
3434
:height: 400px
3535

3636

@@ -46,7 +46,7 @@ integration with Shapely for powerful yet easy-to-use vector data processing
4646
tools. An example plot from the
4747
`Cartopy gallery <http://scitools.org.uk/cartopy/docs/latest/gallery.html>`_:
4848

49-
.. image:: http://scitools.org.uk/cartopy/docs/latest/_images/hurricane_katrina_01_00.png
49+
.. image:: /_static/cartopy_hurricane_katrina_01_00.png
5050
:height: 400px
5151

5252

@@ -116,7 +116,7 @@ MplDataCursor
116116
toolkit written by Joe Kington to provide interactive "data cursors"
117117
(clickable annotation boxes) for matplotlib.
118118

119-
.. _prettyplotlib:
119+
.. _toolkit_prettyplotlib:
120120

121121
prettyplotlib
122122
=============
@@ -133,7 +133,7 @@ High-Level Plotting
133133
Several projects have started to provide a higher-level interface to
134134
matplotlib. These are independent projects.
135135

136-
.. _seaborn:
136+
.. _toolkit_seaborn:
137137

138138
seaborn
139139
=======
@@ -144,7 +144,7 @@ level interface for drawing statistical graphics with matplotlib. It
144144
aims to make visualization a central part of exploring and
145145
understanding complex datasets.
146146

147-
.. _ggplot:
147+
.. _toolkit_ggplot:
148148

149149
ggplot
150150
======

doc/users/beginner.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.. _users-guide-index:
1+
.. _beginners-guide-index:
22

33
################
44
Beginner's Guide

doc/users/colormaps.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Colormaps are often split into several categories based on their function (see,
3535
Lightness of matplotlib colormaps
3636
=================================
3737

38-
Here we examine the lightness values of the matplotlib colormaps. Note that some documentation on the colormaps is available ([colormaps]_).
38+
Here we examine the lightness values of the matplotlib colormaps. Note that some documentation on the colormaps is available ([list-colormaps]_).
3939

4040
Sequential
4141
----------
@@ -100,7 +100,7 @@ References
100100

101101
.. [Ware] http://ccom.unh.edu/sites/default/files/publications/Ware_1988_CGA_Color_sequences_univariate_maps.pdf
102102
.. [Moreland] http://www.sandia.gov/~kmorel/documents/ColorMaps/ColorMapsExpanded.pdf
103-
.. [colormaps] https://gist.github.com/endolith/2719900#id7
103+
.. [list-colormaps] https://gist.github.com/endolith/2719900#id7
104104
.. [mycarta-banding] http://mycarta.wordpress.com/2012/10/14/the-rainbow-is-deadlong-live-the-rainbow-part-4-cie-lab-heated-body/
105105
.. [mycarta-jet] http://mycarta.wordpress.com/2012/10/06/the-rainbow-is-deadlong-live-the-rainbow-part-3/
106106
.. [mycarta-lablinear] http://mycarta.wordpress.com/2012/12/06/the-rainbow-is-deadlong-live-the-rainbow-part-5-cie-lab-linear-l-rainbow/

doc/users/configuration.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.. _users-guide-index:
1+
.. _configuration-guide-index:
22

33
###################
44
Configuration Guide

doc/users/developer.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.. _users-guide-index:
1+
.. _advanced-guide-index:
22

33
###############
44
Advanced Guide
@@ -18,5 +18,6 @@ Advanced Guide
1818
event_handling.rst
1919
transforms_tutorial.rst
2020
path_tutorial.rst
21+
patheffects_guide.rst
2122
recipes.rst
2223

doc/users/screenshots.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ For examples of how to embed matplotlib in different toolkits, see:
294294
* :ref:`user_interfaces-embedding_in_gtk2`
295295
* :ref:`user_interfaces-embedding_in_wx2`
296296
* :ref:`user_interfaces-mpl_with_glade`
297-
* :ref:`user_interfaces-embedding_in_qt`
297+
* :ref:`user_interfaces-embedding_in_qt4`
298298
* :ref:`user_interfaces-embedding_in_tk`
299299

300300
XKCD-style sketch plots

doc/users/whats_new.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1099,7 +1099,7 @@ legends for complex plots such as :meth:`~matplotlib.pyplot.stem` plots
10991099
will now display correctly. Second, the 'best' placement of a legend has
11001100
been improved in the presence of NANs.
11011101

1102-
See :ref:`legend-complex-plots` for more detailed explanation and
1102+
See the :ref:`plotting-guide-legend` for more detailed explanation and
11031103
examples.
11041104

11051105
.. plot:: mpl_examples/pylab_examples/legend_demo4.py

lib/matplotlib/cbook.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1905,7 +1905,9 @@ def boxplot_stats(X, whis=1.5, bootstrap=None, labels=None):
19051905
Non-bootstrapping approach to confidence interval uses Gaussian-based
19061906
asymptotic approximation:
19071907
1908-
.. math:: \mathrm{med} \pm 1.57 \times \frac{\mathrm{iqr}}{\sqrt{N}}
1908+
.. math::
1909+
1910+
\mathrm{med} \pm 1.57 \\times \\frac{\mathrm{iqr}}{\sqrt{N}}
19091911
19101912
General approach from:
19111913
McGill, R., Tukey, J.W., and Larsen, W.A. (1978) "Variations of

lib/matplotlib/mlab.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,11 @@
7676
Return the phase (unwrapped angle) of the frequency spectrum of a signal
7777
7878
:func:`detrend_mean`
79+
Remove the mean from a line.
80+
7981
:func:`demean`
80-
Remove the mean from a line. These functions differ in their defaults.
82+
Remove the mean from a line. This function is the same as as
83+
:func:`detrend_mean` except for the default *axis*.
8184
8285
:func:`detrend_linear`
8386
Remove the best fit line from a line.

lib/matplotlib/patheffects.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ def __init__(self, offset=(2,-2),
227227
----------
228228
offset : pair of floats
229229
The offset of the shadow in points.
230-
shadow_rgbFace : :ref:`color <mpl-color-spec>`
230+
shadow_rgbFace : color
231231
The shadow color.
232232
alpha : float
233233
The alpha transparency of the created shadow patch.
@@ -320,7 +320,7 @@ def __init__(self, offset=(2,-2),
320320
----------
321321
offset : pair of floats
322322
The offset to apply to the path, in points.
323-
shadow_color : :ref:`color <mpl-color-spec>`
323+
shadow_color : color
324324
The shadow color. Default is black.
325325
A value of ``None`` takes the original artist's color
326326
with a scale factor of `rho`.

lib/matplotlib/tri/triangulation.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ class Triangulation(object):
2727
2828
Attributes
2929
----------
30-
edges
31-
neighbors
30+
`edges`
31+
`neighbors`
3232
is_delaunay : bool
3333
Whether the Triangulation is a calculated Delaunay
3434
triangulation (where `triangles` was not specified) or not.

lib/matplotlib/tri/tritools.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class TriAnalyzer(object):
2424
2525
Attributes
2626
----------
27-
scale_factors
27+
`scale_factors`
2828
2929
"""
3030
def __init__(self, triangulation):

0 commit comments

Comments
 (0)