Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DOC: Make abbreviation of versus consistent. #14921

Merged
merged 1 commit into from Jul 30, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions doc/devel/MEP/MEP10.rst
Expand Up @@ -133,8 +133,8 @@ that docstring in the parsed content on the example page. These
docstrings could easily include references to any other part of the
documentation.

Documentation using help() vs a browser
---------------------------------------
Documentation using help() vs. a browser
----------------------------------------

Using Sphinx markup in the source allows for good-looking docs in your
browser, but the markup also makes the raw text returned using help()
Expand Down
4 changes: 2 additions & 2 deletions doc/users/event_handling.rst
Expand Up @@ -519,7 +519,7 @@ Picking exercise
Create a data set of 100 arrays of 1000 Gaussian random numbers and
compute the sample mean and standard deviation of each of them (hint:
numpy arrays have a mean and std method) and make a xy marker plot of
the 100 means vs the 100 standard deviations. Connect the line
the 100 means vs. the 100 standard deviations. Connect the line
created by the plot command to the pick event, and plot the original
time series of the data that generated the clicked on points. If more
than one point is within the tolerance of the clicked on point, you
Expand All @@ -528,7 +528,7 @@ can use multiple subplots to plot the multiple time series.
Exercise solution::

"""
compute the mean and stddev of 100 data sets and plot mean vs stddev.
compute the mean and stddev of 100 data sets and plot mean vs. stddev.
When you click on one of the mu, sigma points, plot the raw data from
the dataset that generated the mean and stddev
"""
Expand Down
2 changes: 1 addition & 1 deletion doc/users/prev_whats_new/changelog.rst
Expand Up @@ -2827,7 +2827,7 @@ the `API changes <../../api/api_changes.html>`_.
now looks correct - SC

2007-01-11 Added Axes.xcorr and Axes.acorr to plot the cross
correlation of x vs y or the autocorrelation of x. pylab
correlation of x vs. y or the autocorrelation of x. pylab
wrappers also provided. See examples/xcorr_demo.py - JDH

2007-01-10 Added "Subplot.label_outer" method. It will set the
Expand Down
2 changes: 1 addition & 1 deletion doc/users/prev_whats_new/whats_new_1.5.rst
Expand Up @@ -504,7 +504,7 @@ Artist-level {get,set}_usetex for text
``````````````````````````````````````

Add ``{get,set}_usetex`` methods to :class:`~matplotlib.text.Text` objects
which allow artist-level control of LaTeX rendering vs the internal mathtex
which allow artist-level control of LaTeX rendering vs. the internal mathtex
rendering.


Expand Down
4 changes: 2 additions & 2 deletions examples/shapes_and_collections/line_collection.py
Expand Up @@ -19,7 +19,7 @@
# simple example showing how it is done.

x = np.arange(100)
# Here are many sets of y to plot vs x
# Here are many sets of y to plot vs. x
ys = x[:50, np.newaxis] + x[np.newaxis, :]

segs = np.zeros((50, 100, 2))
Expand Down Expand Up @@ -56,7 +56,7 @@

N = 50
x = np.arange(N)
# Here are many sets of y to plot vs x
# Here are many sets of y to plot vs. x
ys = [x + i for i in x]

# We need to set the plot limits, they will not autoscale
Expand Down
2 changes: 1 addition & 1 deletion examples/statistics/barchart_demo.py
Expand Up @@ -49,7 +49,7 @@ def format_score(scr, test):
"""
Build up the score labels for the right Y-axis by first
appending a carriage return to each string and then tacking on
the appropriate meta information (i.e., 'laps' vs 'seconds'). We
the appropriate meta information (i.e., 'laps' vs. 'seconds'). We
want the labels centered on the ticks, so if there is no meta
info (like for pushups) then don't add the carriage return to
the string
Expand Down
2 changes: 1 addition & 1 deletion examples/subplots_axes_and_figures/shared_axis_demo.py
Expand Up @@ -9,7 +9,7 @@
Changing the axis limits on one axes will be reflected automatically
in the other, and vice-versa, so when you navigate with the toolbar
the axes will follow each other on their shared axes. Ditto for
changes in the axis scaling (e.g., log vs linear). However, it is
changes in the axis scaling (e.g., log vs. linear). However, it is
possible to have differences in tick labeling, e.g., you can selectively
turn off the tick labels on one axes.

Expand Down
38 changes: 19 additions & 19 deletions extern/agg24-svn/include/agg_span_gradient_contour.h
Expand Up @@ -2,7 +2,7 @@
// AGG Contribution Pack - Gradients 1 (AGG CP - Gradients 1)
// http://milan.marusinec.sk/aggcp
//
// For Anti-Grain Geometry - Version 2.4
// For Anti-Grain Geometry - Version 2.4
// http://www.antigrain.org
//
// Contribution Created By:
Expand Down Expand Up @@ -49,7 +49,7 @@ namespace agg
int m_frame;

double m_d1;
double m_d2;
double m_d2;

public:
gradient_contour() :
Expand Down Expand Up @@ -90,7 +90,7 @@ namespace agg

void frame(int f ) { m_frame = f; }
int frame() { return m_frame; }

int calculate(int x, int y, int d) const
{
if (m_buffer)
Expand Down Expand Up @@ -193,7 +193,7 @@ namespace agg
// Setup VG Engine & Render
agg::rendering_buffer rb;
rb.attach(buffer ,width ,height ,width );

agg::pixfmt_gray8 pf(rb);
agg::renderer_base<agg::pixfmt_gray8> renb(pf );

Expand All @@ -209,14 +209,14 @@ namespace agg
ras.add_path(trans );

// II. Distance Transform
// Create Float Buffer + 0 vs infinity (1e20) assignment
// Create Float Buffer + 0 vs. infinity (1e20) assignment
float* image = new float[width * height];

if (image)
{
for (int y = 0, l = 0; y < height; y++ )
for (int y = 0, l = 0; y < height; y++ )
{
for (int x = 0; x < width; x++, l++ )
for (int x = 0; x < width; x++, l++ )
{
if (buffer[l ] == 0)
{
Expand All @@ -227,7 +227,7 @@ namespace agg
image[l ] = float(infinity );
}
}

}

// DT of 2d
Expand All @@ -247,34 +247,34 @@ namespace agg
if ((spanf) && (spang) && (spanr) && (spann))
{
// Transform along columns
for (int x = 0; x < width; x++ )
for (int x = 0; x < width; x++ )
{
for (int y = 0; y < height; y++ )
for (int y = 0; y < height; y++ )
{
spanf[y] = image[y * width + x];
}

// DT of 1d
dt(spanf ,spang ,spanr ,spann ,height );

for (int y = 0; y < height; y++ )
for (int y = 0; y < height; y++ )
{
image[y * width + x] = spanr[y];
}
}

// Transform along rows
for (int y = 0; y < height; y++ )
for (int y = 0; y < height; y++ )
{
for (int x = 0; x < width; x++ )
for (int x = 0; x < width; x++ )
{
spanf[x] = image[y * width + x];
}

// DT of 1d
dt(spanf ,spang ,spanr ,spann ,width );

for (int x = 0; x < width; x++ )
for (int x = 0; x < width; x++ )
{
image[y * width + x] = spanr[x];
}
Expand All @@ -284,9 +284,9 @@ namespace agg
float min = sqrt(image[0] );
float max = min;

for (int y = 0, l = 0; y < height; y++ )
for (int y = 0, l = 0; y < height; y++ )
{
for (int x = 0; x < width; x++, l++ )
for (int x = 0; x < width; x++, l++ )
{
image[l] = sqrt(image[l]);

Expand All @@ -312,9 +312,9 @@ namespace agg
{
float scale = 255 / (max - min );

for (int y = 0, l = 0; y < height; y++ )
for (int y = 0, l = 0; y < height; y++ )
{
for (int x = 0; x < width; x++ ,l++ )
for (int x = 0; x < width; x++ ,l++ )
{
buffer[l] = int8u(int((image[l] - min ) * scale ));
}
Expand All @@ -335,7 +335,7 @@ namespace agg
result = m_buffer;

}

if (spanf) { delete [] spanf; }
if (spang) { delete [] spang; }
if (spanr) { delete [] spanr; }
Expand Down
4 changes: 2 additions & 2 deletions lib/matplotlib/__init__.py
Expand Up @@ -1145,8 +1145,8 @@ class rc_context:
plt.plot(x, b)
plt.plot(x, c)

The 'a' vs 'x' and 'c' vs 'x' plots would have settings from
'screen.rc', while the 'b' vs 'x' plot would have settings from
The 'a' vs. 'x' and 'c' vs. 'x' plots would have settings from
'screen.rc', while the 'b' vs. 'x' plot would have settings from
'print.rc'.

A dictionary can also be passed to the context manager::
Expand Down
2 changes: 1 addition & 1 deletion lib/matplotlib/axes/_axes.py
Expand Up @@ -4284,7 +4284,7 @@ def scatter(self, x, y, s=None, c=None, marker=None, cmap=None, norm=None,
verts=None, edgecolors=None, *, plotnonfinite=False,
**kwargs):
"""
A scatter plot of *y* vs *x* with varying marker size and/or color.
A scatter plot of *y* vs. *x* with varying marker size and/or color.

Parameters
----------
Expand Down
12 changes: 6 additions & 6 deletions lib/matplotlib/colors.py
Expand Up @@ -1646,8 +1646,8 @@ def hillshade(self, elevation, vert_exag=1, dx=1, dy=1, fraction=1.):
The amount to exaggerate the elevation values by when calculating
illumination. This can be used either to correct for differences in
units between the x-y coordinate system and the elevation
coordinate system (e.g. decimal degrees vs meters) or to exaggerate
or de-emphasize topographic effects.
coordinate system (e.g. decimal degrees vs. meters) or to
exaggerate or de-emphasize topographic effects.
dx : number, optional
The x-spacing (columns) of the input *elevation* grid.
dy : number, optional
Expand Down Expand Up @@ -1770,8 +1770,8 @@ def shade(self, data, cmap, norm=None, blend_mode='overlay', vmin=None,
The amount to exaggerate the elevation values by when calculating
illumination. This can be used either to correct for differences in
units between the x-y coordinate system and the elevation
coordinate system (e.g. decimal degrees vs meters) or to exaggerate
or de-emphasize topography.
coordinate system (e.g. decimal degrees vs. meters) or to
exaggerate or de-emphasize topography.
dx : number, optional
The x-spacing (columns) of the input *elevation* grid.
dy : number, optional
Expand Down Expand Up @@ -1836,8 +1836,8 @@ def shade_rgb(self, rgb, elevation, fraction=1., blend_mode='hsv',
The amount to exaggerate the elevation values by when calculating
illumination. This can be used either to correct for differences in
units between the x-y coordinate system and the elevation
coordinate system (e.g. decimal degrees vs meters) or to exaggerate
or de-emphasize topography.
coordinate system (e.g. decimal degrees vs. meters) or to
exaggerate or de-emphasize topography.
dx : number, optional
The x-spacing (columns) of the input *elevation* grid.
dy : number, optional
Expand Down
2 changes: 1 addition & 1 deletion lib/matplotlib/transforms.py
Expand Up @@ -1678,7 +1678,7 @@ def __init__(self, *args, **kwargs):
self._inverted = None

def __array__(self, *args, **kwargs):
# optimises the access of the transform matrix vs the superclass
# optimises the access of the transform matrix vs. the superclass
return self.get_matrix()

def __eq__(self, other):
Expand Down
4 changes: 2 additions & 2 deletions tutorials/introductory/lifecycle.py
Expand Up @@ -16,8 +16,8 @@
`this excellent blog post <http://pbpython.com/effective-matplotlib.html>`_
by Chris Moffitt. It was transformed into this tutorial by Chris Holdgraf.

A note on the Object-Oriented API vs Pyplot
===========================================
A note on the Object-Oriented API vs. Pyplot
============================================

Matplotlib has two interfaces. The first is an object-oriented (OO)
interface. In this case, we utilize an instance of :class:`axes.Axes`
Expand Down