Skip to content

Style: use 10-pt, no ticks on right, top #6500

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

Merged
merged 1 commit into from
May 30, 2016
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 21 additions & 21 deletions lib/matplotlib/rcsetup.py
Original file line number Diff line number Diff line change
Expand Up @@ -960,7 +960,7 @@ def validate_hist_bins(s):
'font.variant': ['normal', six.text_type],
'font.stretch': ['normal', six.text_type],
'font.weight': ['normal', six.text_type],
'font.size': [12, validate_float], # Base font size in points
'font.size': [10, validate_float], # Base font size in points
'font.serif': [['DejaVu Serif', 'Bitstream Vera Serif',
'New Century Schoolbook', 'Century Schoolbook L',
'Utopia', 'ITC Bookman', 'Bookman',
Expand Down Expand Up @@ -1026,7 +1026,7 @@ def validate_hist_bins(s):
'axes.hold': [True, validate_bool],
'axes.facecolor': ['w', validate_color], # background color; white
'axes.edgecolor': ['k', validate_color], # edge color; black
'axes.linewidth': [1.0, validate_float], # edge linewidth
'axes.linewidth': [0.8, validate_float], # edge linewidth

'axes.spines.left': [True, validate_bool], # Set visibility of axes
'axes.spines.right': [True, validate_bool], # 'spines', the lines
Expand All @@ -1036,7 +1036,7 @@ def validate_hist_bins(s):
'axes.titlesize': ['large', validate_fontsize], # fontsize of the
# axes title
'axes.titleweight': ['normal', six.text_type], # font weight of axes title
'axes.titlepad': [9.0, validate_float], # pad from axes top to title in points
'axes.titlepad': [4.0, validate_float], # pad from axes top to title in points
'axes.grid': [False, validate_bool], # display grid or not
'axes.grid.which': ['major', validate_axis_locator], # set wether the gid are by
# default draw on 'major'
Expand All @@ -1046,7 +1046,7 @@ def validate_hist_bins(s):
# Can be 'x', 'y', 'both'
'axes.labelsize': ['medium', validate_fontsize], # fontsize of the
# x any y labels
'axes.labelpad': [5.0, validate_float], # space between label and axis
'axes.labelpad': [4.0, validate_float], # space between label and axis
'axes.labelweight': ['normal', six.text_type], # fontsize of the x any y labels
'axes.labelcolor': ['k', validate_color], # color of axis label
'axes.formatter.limits': [[-7, 7], validate_nseq_int(2)],
Expand Down Expand Up @@ -1138,14 +1138,14 @@ def validate_hist_bins(s):
'legend.edgecolor': ['none', validate_color_or_inherit],

# tick properties
'xtick.top': [True, validate_bool], # draw ticks on the top side
'xtick.top': [False, validate_bool], # draw ticks on the top side
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The comments in this block are no longer aligned.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Plus anywhere else a second digit was added, so I won't comment everywhere.

'xtick.bottom': [True, validate_bool], # draw ticks on the bottom side
'xtick.major.size': [4, validate_float], # major xtick size in points
'xtick.major.size': [3.5, validate_float], # major xtick size in points
'xtick.minor.size': [2, validate_float], # minor xtick size in points
'xtick.major.width': [1.0, validate_float], # major xtick width in points
'xtick.minor.width': [1.0, validate_float], # minor xtick width in points
'xtick.major.pad': [4, validate_float], # distance to label in points
'xtick.minor.pad': [4, validate_float], # distance to label in points
'xtick.major.width': [0.8, validate_float], # major xtick width in points
'xtick.minor.width': [0.6, validate_float], # minor xtick width in points
'xtick.major.pad': [3.5, validate_float], # distance to label in points
'xtick.minor.pad': [3.4, validate_float], # distance to label in points
'xtick.color': ['k', validate_color], # color of the xtick labels
'xtick.minor.visible': [False, validate_bool], # visiablility of the x axis minor ticks

Expand All @@ -1154,13 +1154,13 @@ def validate_hist_bins(s):
'xtick.direction': ['out', six.text_type], # direction of xticks

'ytick.left': [True, validate_bool], # draw ticks on the left side
'ytick.right': [True, validate_bool], # draw ticks on the right side
'ytick.major.size': [4, validate_float], # major ytick size in points
'ytick.right': [False, validate_bool], # draw ticks on the right side
'ytick.major.size': [3.5, validate_float], # major ytick size in points
'ytick.minor.size': [2, validate_float], # minor ytick size in points
'ytick.major.width': [1.0, validate_float], # major ytick width in points
'ytick.minor.width': [1.0, validate_float], # minor ytick width in points
'ytick.major.pad': [4, validate_float], # distance to label in points
'ytick.minor.pad': [4, validate_float], # distance to label in points
'ytick.major.width': [0.8, validate_float], # major ytick width in points
'ytick.minor.width': [0.6, validate_float], # minor ytick width in points
'ytick.major.pad': [3.5, validate_float], # distance to label in points
'ytick.minor.pad': [3.4, validate_float], # distance to label in points
'ytick.color': ['k', validate_color], # color of the ytick labels
'ytick.minor.visible': [False, validate_bool], # visiablility of the y axis minor ticks

Expand All @@ -1170,7 +1170,7 @@ def validate_hist_bins(s):

'grid.color': ['#b0b0b0', validate_color], # grid color
'grid.linestyle': ['-', six.text_type], # solid
'grid.linewidth': [1.0, validate_float], # in points
'grid.linewidth': [0.8, validate_float], # in points
'grid.alpha': [1.0, validate_float],


Expand All @@ -1188,13 +1188,13 @@ def validate_hist_bins(s):
'figure.autolayout': [False, validate_bool],
'figure.max_open_warning': [20, validate_int],

'figure.subplot.left': [0.155, ValidateInterval(0, 1, closedmin=True,
'figure.subplot.left': [0.125, ValidateInterval(0, 1, closedmin=True,
closedmax=True)],
'figure.subplot.right': [0.87, ValidateInterval(0, 1, closedmin=True,
'figure.subplot.right': [0.9, ValidateInterval(0, 1, closedmin=True,
closedmax=True)],
'figure.subplot.bottom': [0.13, ValidateInterval(0, 1, closedmin=True,
'figure.subplot.bottom': [0.11, ValidateInterval(0, 1, closedmin=True,
closedmax=True)],
'figure.subplot.top': [0.87, ValidateInterval(0, 1, closedmin=True,
'figure.subplot.top': [0.88, ValidateInterval(0, 1, closedmin=True,
closedmax=True)],
'figure.subplot.wspace': [0.2, ValidateInterval(0, 1, closedmin=True,
closedmax=False)],
Expand Down
46 changes: 23 additions & 23 deletions matplotlibrc.template
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ backend : $TEMPLATE_BACKEND
# property is not currently implemented.
#
# The font.size property is the default font size for text, given in pts.
# 12pt is the standard value.
# 10 pt is the standard value.
#
#font.family : sans-serif
#font.style : normal
Expand All @@ -202,7 +202,7 @@ backend : $TEMPLATE_BACKEND
# settings for axes and ticks. Special text sizes can be defined
# relative to font.size, using the following values: xx-small, x-small,
# small, medium, large, x-large, xx-large, larger, or smaller
#font.size : 12.0
#font.size : 10.0
#font.serif : DejaVu Serif, Bitstream Vera Serif, New Century Schoolbook, Century Schoolbook L, Utopia, ITC Bookman, Bookman, Nimbus Roman No9 L, Times New Roman, Times, Palatino, Charter, serif
#font.sans-serif : DejaVu Sans, Bitstream Vera Sans, Lucida Grande, Verdana, Geneva, Lucid, Arial, Helvetica, Avant Garde, sans-serif
#font.cursive : Apple Chancery, Textile, Zapf Chancery, Sand, Script MT, Felipa, cursive
Expand Down Expand Up @@ -294,12 +294,12 @@ backend : $TEMPLATE_BACKEND
#axes.hold : True # whether to clear the axes by default on
#axes.facecolor : white # axes background color
#axes.edgecolor : black # axes edge color
#axes.linewidth : 1.0 # edge linewidth
#axes.linewidth : 0.8 # edge linewidth
#axes.grid : False # display grid or not
#axes.titlesize : large # fontsize of the axes title
#axes.titlepad : 9.0 # pad between axes and title in points
#axes.titlepad : 4.0 # pad between axes and title in points
#axes.labelsize : medium # fontsize of the x any y labels
#axes.labelpad : 5.0 # space between label and axis
#axes.labelpad : 4.0 # space between label and axis
#axes.labelweight : normal # weight of the x and y labels
#axes.labelcolor : black
#axes.axisbelow : 'line' # draw axis gridlines and ticks below
Expand Down Expand Up @@ -361,27 +361,27 @@ backend : $TEMPLATE_BACKEND

### TICKS
# see http://matplotlib.org/api/axis_api.html#matplotlib.axis.Tick
#xtick.top : True # draw ticks on the top side
#xtick.top : False # draw ticks on the top side
#xtick.bottom : True # draw ticks on the bottom side
#xtick.major.size : 4 # major tick size in points
#xtick.major.size : 3.5 # major tick size in points
#xtick.minor.size : 2 # minor tick size in points
#xtick.major.width : 1.0 # major tick width in points
#xtick.minor.width : 1.0 # minor tick width in points
#xtick.major.pad : 4 # distance to major tick label in points
#xtick.minor.pad : 4 # distance to the minor tick label in points
#xtick.major.width : 0.8 # major tick width in points
#xtick.minor.width : 0.6 # minor tick width in points
#xtick.major.pad : 3.5 # distance to major tick label in points
#xtick.minor.pad : 3.4 # distance to the minor tick label in points
#xtick.color : k # color of the tick labels
#xtick.labelsize : medium # fontsize of the tick labels
#xtick.direction : out # direction: in, out, or inout
#xtick.minor.visible : False # visibility of minor ticks on x-axis

#ytick.left : True # draw ticks on the left side
#ytick.right : True # draw ticks on the right side
#ytick.major.size : 4 # major tick size in points
#ytick.right : False # draw ticks on the right side
#ytick.major.size : 3.5 # major tick size in points
#ytick.minor.size : 2 # minor tick size in points
#ytick.major.width : 1.0 # major tick width in points
#ytick.minor.width : 1.0 # minor tick width in points
#ytick.major.pad : 4 # distance to major tick label in points
#ytick.minor.pad : 4 # distance to the minor tick label in points
#ytick.major.width : 0.8 # major tick width in points
#ytick.minor.width : 0.6 # minor tick width in points
#ytick.major.pad : 3.5 # distance to major tick label in points
#ytick.minor.pad : 3.4 # distance to the minor tick label in points
#ytick.color : k # color of the tick labels
#ytick.labelsize : medium # fontsize of the tick labels
#ytick.direction : out # direction: in, out, or inout
Expand All @@ -391,7 +391,7 @@ backend : $TEMPLATE_BACKEND
### GRIDS
#grid.color : b0b0b0 # grid color
#grid.linestyle : - # solid
#grid.linewidth : 1.0 # in points
#grid.linewidth : 0.8 # in points
#grid.alpha : 1.0 # transparency, between 0.0 and 1.0

### Legend
Expand Down Expand Up @@ -431,14 +431,14 @@ backend : $TEMPLATE_BACKEND
# If less than one this feature is disabled.

# The figure subplot parameters. All dimensions are a fraction of the
# figure width or height
#figure.subplot.left : 0.155 # the left side of the subplots of the figure
#figure.subplot.right : 0.87 # the right side of the subplots of the figure
#figure.subplot.bottom : 0.13 # the bottom of the subplots of the figure
#figure.subplot.top : 0.87 # the top of the subplots of the figure
#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.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.hspace : 0.2 # the amount of height reserved for white space between subplots


### IMAGES
#image.aspect : equal # equal | auto | a number
#image.interpolation : nearest # see help(imshow) for options
Expand Down