From a6b053c458adfc2b6a5371d415ad651f5b25596a Mon Sep 17 00:00:00 2001 From: Antony Lee Date: Wed, 10 Jan 2018 23:37:38 -0800 Subject: [PATCH] Unify "blank space" and "white space" to "space". Note that there are many usages of "whitespace" elsewhere that are left unchanged, as I believe they generally make sentences clearer. --- doc/faq/howto_faq.rst | 4 ++-- lib/matplotlib/figure.py | 4 ++-- lib/matplotlib/mpl-data/stylelib/_classic_test.mplstyle | 4 ++-- lib/matplotlib/mpl-data/stylelib/classic.mplstyle | 4 ++-- lib/matplotlib/pyplot.py | 4 ++-- matplotlibrc.template | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/doc/faq/howto_faq.rst b/doc/faq/howto_faq.rst index 33794510e4fa..25e29f6a61d2 100644 --- a/doc/faq/howto_faq.rst +++ b/doc/faq/howto_faq.rst @@ -171,10 +171,10 @@ The other parameters you can configure are, with their defaults *top* = 0.9 the top of the subplots of the figure *wspace* = 0.2 - the amount of width reserved for blank space between subplots, + the amount of width reserved for space between subplots, expressed as a fraction of the average axis width *hspace* = 0.2 - the amount of height reserved for white space between subplots, + the amount of height reserved for space between subplots, expressed as a fraction of the average axis height If you want additional control, you can create an diff --git a/lib/matplotlib/figure.py b/lib/matplotlib/figure.py index 1f4a251f861b..b56c67b3c054 100644 --- a/lib/matplotlib/figure.py +++ b/lib/matplotlib/figure.py @@ -193,11 +193,11 @@ def __init__(self, left=None, bottom=None, right=None, top=None, The top of the subplots of the figure wspace : 0.2 - The amount of width reserved for blank space between subplots, + The amount of width reserved for space between subplots, expressed as a fraction of the average axis width hspace : 0.2 - The amount of height reserved for white space between subplots, + The amount of height reserved for space between subplots, expressed as a fraction of the average axis height """ diff --git a/lib/matplotlib/mpl-data/stylelib/_classic_test.mplstyle b/lib/matplotlib/mpl-data/stylelib/_classic_test.mplstyle index 0bbad2de7011..70071b47b41e 100644 --- a/lib/matplotlib/mpl-data/stylelib/_classic_test.mplstyle +++ b/lib/matplotlib/mpl-data/stylelib/_classic_test.mplstyle @@ -313,9 +313,9 @@ figure.subplot.left : 0.125 # the left side of the subplots of the figure figure.subplot.right : 0.9 # the right side of the subplots of the figure figure.subplot.bottom : 0.1 # the bottom of the subplots of the figure figure.subplot.top : 0.9 # the top of the subplots of the figure -figure.subplot.wspace : 0.2 # the amount of width reserved for blank space between subplots, +figure.subplot.wspace : 0.2 # the amount of width reserved for space between subplots, # expressed as a fraction of the average axis width -figure.subplot.hspace : 0.2 # the amount of height reserved for white space between subplots, +figure.subplot.hspace : 0.2 # the amount of height reserved for space between subplots, # expressed as a fraction of the average axis height ### IMAGES diff --git a/lib/matplotlib/mpl-data/stylelib/classic.mplstyle b/lib/matplotlib/mpl-data/stylelib/classic.mplstyle index 4e56072dfa40..493cc15d7f28 100644 --- a/lib/matplotlib/mpl-data/stylelib/classic.mplstyle +++ b/lib/matplotlib/mpl-data/stylelib/classic.mplstyle @@ -315,9 +315,9 @@ figure.subplot.left : 0.125 # the left side of the subplots of the figure figure.subplot.right : 0.9 # the right side of the subplots of the figure figure.subplot.bottom : 0.1 # the bottom of the subplots of the figure figure.subplot.top : 0.9 # the top of the subplots of the figure -figure.subplot.wspace : 0.2 # the amount of width reserved for blank space between subplots, +figure.subplot.wspace : 0.2 # the amount of width reserved for space between subplots, # expressed as a fraction of the average axis width -figure.subplot.hspace : 0.2 # the amount of height reserved for white space between subplots, +figure.subplot.hspace : 0.2 # the amount of height reserved for space between subplots, # expressed as a fraction of the average axis height ### IMAGES diff --git a/lib/matplotlib/pyplot.py b/lib/matplotlib/pyplot.py index 0a67b24f4a54..22ed435b059e 100644 --- a/lib/matplotlib/pyplot.py +++ b/lib/matplotlib/pyplot.py @@ -1309,9 +1309,9 @@ def subplots_adjust(*args, **kwargs): right = 0.9 # the right side of the subplots of the figure bottom = 0.1 # the bottom of the subplots of the figure top = 0.9 # the top of the subplots of the figure - wspace = 0.2 # the amount of width reserved for blank space between subplots, + wspace = 0.2 # the amount of width reserved for space between subplots, # expressed as a fraction of the average axis width - hspace = 0.2 # the amount of height reserved for white space between subplots, + hspace = 0.2 # the amount of height reserved for space between subplots, # expressed as a fraction of the average axis height The actual defaults are controlled by the rc file diff --git a/matplotlibrc.template b/matplotlibrc.template index 514bee3e3755..7ac32f71cf8d 100644 --- a/matplotlibrc.template +++ b/matplotlibrc.template @@ -442,9 +442,9 @@ backend : $TEMPLATE_BACKEND #figure.subplot.right : 0.9 # the right side of the subplots of the figure #figure.subplot.bottom : 0.11 # the bottom of the subplots of the figure #figure.subplot.top : 0.88 # the top of the subplots of the figure -#figure.subplot.wspace : 0.2 # the amount of width reserved for blank space between subplots, +#figure.subplot.wspace : 0.2 # the amount of width reserved for space between subplots, # expressed as a fraction of the average axis width -#figure.subplot.hspace : 0.2 # the amount of height reserved for white space between subplots, +#figure.subplot.hspace : 0.2 # the amount of height reserved for space between subplots, # expressed as a fraction of the average axis height