Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit abdf9a6

Browse files
pelsonpelson
committed
Further enhancements and simplifications.
1 parent 94f9032 commit abdf9a6

7 files changed

Lines changed: 105 additions & 62 deletions

File tree

‎doc/_static/mpl.css‎

Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -508,7 +508,7 @@ ul.keywordmatches li.goodmatch a {
508508

509509
table.docutils {
510510
border-spacing: 2px;
511-
border: collapse;
511+
border-collapse: collapse;
512512
border-top-width: 1px;
513513
border-right-width: 0px;
514514
border-bottom-width: 1px;
@@ -535,3 +535,34 @@ table.docutils th {
535535
table.docutils td {
536536
border-width: 1px 0 1px 0;
537537
}
538+
539+
#matplotlib-examples ul li{
540+
font-size: large;
541+
}
542+
543+
#matplotlib-examples ul li ul{
544+
margin-bottom:20px;
545+
overflow:hidden;
546+
border-top:1px solid #ccc;
547+
}
548+
549+
#matplotlib-examples ul li ul li {
550+
font-size: small;
551+
line-height:1.75em;
552+
display:inline;
553+
float: left;
554+
width: 22em;
555+
}
556+
557+
#overview ul li ul{
558+
margin-bottom:20px;
559+
overflow:hidden;
560+
border-top:1px solid #ccc;
561+
}
562+
563+
#overview ul li ul li {
564+
display:inline;
565+
float: left;
566+
width: 30em;
567+
}
568+

‎doc/_templates/index.html‎

Lines changed: 41 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,42 @@
11
{% extends "layout.html" %}
22
{% set title = 'matplotlib: python plotting' %}
33

4+
{% block extrahead %}
5+
<script>
6+
function getSnippet(id, url) {
7+
var req = false;
8+
// For Safari, Firefox, and other non-MS browsers
9+
if (window.XMLHttpRequest) {
10+
try {
11+
req = new XMLHttpRequest();
12+
} catch (e) {
13+
req = false;
14+
}
15+
} else if (window.ActiveXObject) {
16+
// For Internet Explorer on Windows
17+
try {
18+
req = new ActiveXObject("Msxml2.XMLHTTP");
19+
} catch (e) {
20+
try {
21+
req = new ActiveXObject("Microsoft.XMLHTTP");
22+
} catch (e) {
23+
req = false;
24+
}
25+
}
26+
}
27+
var element = document.getElementById(id);
28+
if (req) {
29+
// Synchronous request, wait till we have it all
30+
req.open('GET', url, false);
31+
req.send(null);
32+
element.innerHTML = req.responseText;
33+
}
34+
}
35+
</script>
36+
37+
{{ super() }}
38+
{% endblock %}
39+
440
{% block body %}
541

642
<h1>Introduction</h1>
@@ -132,12 +168,11 @@ <h4>Need help?</h4>
132168

133169
<h1>Toolkits</h1>
134170

135-
<p>There are several matplotlib add-on <a href="{{
136-
pathto('mpl_toolkits/index') }}">toolkits</a>, including the projection
137-
and mapping toolkit
138-
<a href="http://matplotlib.github.com/basemap">basemap</a>, 3d plotting with <a href="{{
139-
pathto('mpl_toolkits/mplot3d/index') }}">mplot3d</a>, axes and axis helpers in <a href="{{
140-
pathto('mpl_toolkits/axes_grid/index') }}">axes_grid</a> and more.
171+
<p>There are several matplotlib add-on <a href="{{ pathto('mpl_toolkits/index') }}">toolkits</a>,
172+
including a choice of two projection and mapping toolkits <a href="http://matplotlib.org/basemap">basemap</a> and
173+
<a href="http://scitools.org.uk/cartopy/docs/latest">cartopy</a>,
174+
3d plotting with <a href="{{ pathto('mpl_toolkits/mplot3d/index') }}">mplot3d</a>,
175+
axes and axis helpers in <a href="{{ pathto('mpl_toolkits/axes_grid/index') }}">axes_grid</a> and more.
141176
</p>
142177

143178
<h1>Citing matplotlib</h1>

‎doc/_templates/layout.html‎

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,10 @@
11
{% extends "!layout.html" %}
22

3-
<script>
4-
function getSnippet(id, url) {
5-
var req = false;
6-
// For Safari, Firefox, and other non-MS browsers
7-
if (window.XMLHttpRequest) {
8-
try {
9-
req = new XMLHttpRequest();
10-
} catch (e) {
11-
req = false;
12-
}
13-
} else if (window.ActiveXObject) {
14-
// For Internet Explorer on Windows
15-
try {
16-
req = new ActiveXObject("Msxml2.XMLHTTP");
17-
} catch (e) {
18-
try {
19-
req = new ActiveXObject("Microsoft.XMLHTTP");
20-
} catch (e) {
21-
req = false;
22-
}
23-
}
24-
}
25-
var element = document.getElementById(id);
26-
if (req) {
27-
// Synchronous request, wait till we have it all
28-
req.open('GET', url, false);
29-
req.send(null);
30-
element.innerHTML = req.responseText;
31-
}
32-
}
33-
</script>
34-
353
{% block rootrellink %}
364
<li><a href="{{ pathto('index') }}">home</a>|&nbsp;</li>
37-
<li><a href="http://www.matplotlib.org/downloads.html">downloads</a>|&nbsp;</li>
38-
<li><a href="{{ pathto('search') }}">search</a>|&nbsp;</li>
395
<li><a href="{{ pathto('examples/index') }}">examples</a>|&nbsp;</li>
406
<li><a href="{{ pathto('gallery') }}">gallery</a>|&nbsp;</li>
417
<li><a href="{{ pathto('api/pyplot_summary') }}">pyplot</a>|&nbsp;</li>
42-
<li><a href="{{ pathto('citing') }}">citation</a>|&nbsp;</li>
438
<li><a href="{{ pathto('contents') }}">docs</a> &raquo;</li>
449
{% endblock %}
4510

‎doc/api/matplotlib_configuration_api.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ The top level :mod:`matplotlib` module
22
======================================
33

44
.. automodule:: matplotlib
5-
:members:
5+
:members: rc, rcdefaults, use
66
:undoc-members:
77
:show-inheritance:

‎doc/conf.py‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,6 @@
105105
plot_formats = [('png', 80), ('hires.png', 200), ('pdf', 50)]
106106

107107
# Subdirectories in 'examples/' directory of package and titles for gallery
108-
# TODO: Change to OrderedDict when Matplotlib drops support for Python < 2.7
109108
mpl_example_sections = (
110109
('lines_bars_and_markers', 'Lines, bars, and markers'),
111110
('shapes_and_collections', 'Shapes and collections'),
@@ -251,3 +250,9 @@
251250
'Matplotlib', "Python plotting package", 'Programming',
252251
1),
253252
]
253+
254+
255+
################# numpydoc config ####################
256+
numpydoc_show_class_members = False
257+
258+

‎lib/matplotlib/axes.py‎

Lines changed: 24 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4726,9 +4726,10 @@ def legend(self, *args, **kwargs):
47264726
columnspacing the spacing between columns
47274727
================ ====================================================
47284728
4729-
.. Note:: Not all kinds of artist are supported by the legend command.
4730-
See LINK (FIXME) for details.
4729+
.. note::
47314730
4731+
Not all kinds of artist are supported by the legend command.
4732+
See :ref:`plotting-guide-legend` for details.
47324733
47334734
**Example:**
47344735
@@ -7346,9 +7347,11 @@ def pcolor(self, *args, **kwargs):
73467347
"""
73477348
Create a pseudocolor plot of a 2-D array.
73487349
7349-
Note: pcolor can be very slow for large arrays; consider
7350-
using the similar but much faster
7351-
:func:`~matplotlib.pyplot.pcolormesh` instead.
7350+
.. note::
7351+
7352+
pcolor can be very slow for large arrays; consider
7353+
using the similar but much faster
7354+
:func:`~matplotlib.pyplot.pcolormesh` instead.
73527355
73537356
Call signatures::
73547357
@@ -7471,14 +7474,16 @@ def pcolor(self, *args, **kwargs):
74717474
74727475
%(PolyCollection)s
74737476
7474-
Note: the default *antialiaseds* is False if the default
7475-
*edgecolors*="none" is used. This eliminates artificial lines
7476-
at patch boundaries, and works regardless of the value of
7477-
alpha. If *edgecolors* is not "none", then the default
7478-
*antialiaseds* is taken from
7479-
rcParams['patch.antialiased'], which defaults to *True*.
7480-
Stroking the edges may be preferred if *alpha* is 1, but
7481-
will cause artifacts otherwise.
7477+
.. note::
7478+
7479+
The default *antialiaseds* is False if the default
7480+
*edgecolors*="none" is used. This eliminates artificial lines
7481+
at patch boundaries, and works regardless of the value of
7482+
alpha. If *edgecolors* is not "none", then the default
7483+
*antialiaseds* is taken from
7484+
rcParams['patch.antialiased'], which defaults to *True*.
7485+
Stroking the edges may be preferred if *alpha* is 1, but
7486+
will cause artifacts otherwise.
74827487
74837488
.. seealso::
74847489
@@ -8865,10 +8870,12 @@ def specgram(self, x, NFFT=256, Fs=2, Fc=0, detrend=mlab.detrend_none,
88658870
- *Pxx* is an array of shape `(len(times), len(freqs))` of power
88668871
- *im* is a :class:`~matplotlib.image.AxesImage` instance
88678872
8868-
Note: If *x* is real (i.e. non-complex), only the positive
8869-
spectrum is shown. If *x* is complex, both positive and
8870-
negative parts of the spectrum are shown. This can be
8871-
overridden using the *sides* keyword argument.
8873+
.. note::
8874+
8875+
If *x* is real (i.e. non-complex), only the positive
8876+
spectrum is shown. If *x* is complex, both positive and
8877+
negative parts of the spectrum are shown. This can be
8878+
overridden using the *sides* keyword argument.
88728879
88738880
Also note that while the plot is in dB, the *Pxx* array returned is
88748881
linear in power.

‎lib/matplotlib/sankey.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ def _add_output(self, path, angle, flow, length):
297297
"""
298298
Append an output to a path and return its tip and label locations.
299299
300-
Note: *flow* is negative for an output.
300+
.. note:: *flow* is negative for an output.
301301
"""
302302
if angle is None:
303303
return [0, 0], [0, 0]

0 commit comments

Comments
 (0)