Rename font.small/font.large to text.labelsize/text.titlesize

lukelbd · lukelbd · commit dcdd5a5a945f · 2020-05-16T20:12:46.000-06:00
diff --git a/proplot/axes/plot.py b/proplot/axes/plot.py
@@ -2812,7 +2812,7 @@ def cmap_changer(
                     text_kw[key] = labels_kw.pop(key)
             labels_kw.setdefault('colors', colors)
             labels_kw.setdefault('inline_spacing', 3)
-            labels_kw.setdefault('fontsize', rc['small'])
+            labels_kw.setdefault('fontsize', rc['text.labelsize'])
             labs = cobj.clabel(fmt=fmt, **labels_kw)
             for lab in labs:
                 lab.update(text_kw)
@@ -2825,7 +2825,7 @@ def cmap_changer(
             obj.update_scalarmappable()
 
             # Get text positions and colors
-            labels_kw_ = {'size': rc['small'], 'ha': 'center', 'va': 'center'}
+            labels_kw_ = {'size': rc['text.labelsize'], 'ha': 'center', 'va': 'center'}
             labels_kw_.update(labels_kw)
             array = obj.get_array()
             paths = obj.get_paths()
diff --git a/proplot/internals/rcsetup.py b/proplot/internals/rcsetup.py
@@ -60,8 +60,8 @@
     'geogrid.lonstep': ('grid.lonstep', '0.6'),
     'geogrid.rotatelabels': ('grid.rotatelabels', '0.6'),
     'share': ('subplots.share', '0.6'),
-    'small': ('font.small', '0.6'),
-    'large': ('font.large', '0.6'),
+    'small': ('text.labelsize', '0.6'),
+    'large': ('text.titlesize', '0.6'),
     'span': ('subplots.span', '0.6'),
     'tight': ('subplots.tight', '0.6'),
     'tick.labelpad': ('tick.pad', '0.6'),
@@ -402,26 +402,11 @@
         'The color of the background axes patch.'
     ),
 
-    # Font setting
+    # Font settings
     'font.name': (
         'sans-serif',
         "Alias for :rcraw:`font.family`. The default is ``'sans-serif'``."
     ),
-    'font.small': (
-        'medium',
-        'Meta setting that changes '
-        ':rcraw:`tick.labelsize`, :rcraw:`axes.labelsize`, :rcraw:`legend.fontsize`,'
-        "and :rcraw:`grid.labelsize` simultaneously. Default is ``'medium'``, i.e. "
-        'the value of :rcraw:`font.size`.' + _addendum_fonts
-    ),
-    'font.large': (
-        'med-large',
-        'Meta setting that changes '
-        ':rcraw:`abc.size`, :rcraw:`title.size`, :rcraw:`suptitle.size`, '
-        'and subplot label settings like :rcraw:`leftlabel.size` simultaneously. '
-        "Default is ``'med-large'``, i.e. 1.1. times :rcraw:`font.size`."
-        + _addendum_fonts
-    ),
 
     # Gridlines
     'grid': (
@@ -713,6 +698,23 @@
         'Figure title font weight.'
     ),
 
+    # Text settings
+    'text.labelsize': (
+        'medium',
+        'Meta setting that changes the label-like sizes '
+        ':rcraw:`tick.labelsize`, :rcraw:`axes.labelsize`, :rcraw:`legend.fontsize`,'
+        "and :rcraw:`grid.labelsize`. Default is ``'medium'``, i.e. "
+        'the value of :rcraw:`font.size`.' + _addendum_fonts
+    ),
+    'text.titlesize': (
+        'med-large',
+        'Meta setting that changes the title-like sizes '
+        ':rcraw:`abc.size`, :rcraw:`title.size`, :rcraw:`suptitle.size`, '
+        'and subplot label settings like :rcraw:`leftlabel.size`. '
+        "Default is ``'med-large'``, i.e. 1.1. times :rcraw:`font.size`."
+        + _addendum_fonts
+    ),
+
     # Tick settings
     'tick.color': (
         COLOR,
@@ -816,11 +818,11 @@
         'axes.edgecolor', 'axes.labelcolor',
         'tick.labelcolor', 'hatch.color', 'xtick.color', 'ytick.color'
     ),
-    'font.small': (  # the 'small' fonts
+    'text.labelsize': (  # the 'small' fonts
         'tick.labelsize', 'xtick.labelsize', 'ytick.labelsize',
         'axes.labelsize', 'legend.fontsize', 'grid.labelsize'
     ),
-    'font.large': (  # the 'large' fonts
+    'text.titlesize': (  # the 'large' fonts
         'abc.size', 'figure.titlesize',
         'axes.titlesize', 'suptitle.size', 'title.size',
         'leftlabel.size', 'toplabel.size',
diff --git a/proplot/utils.py b/proplot/utils.py
@@ -528,21 +528,21 @@ def units(value, dest='in', axes=None, figure=None, width=True):
     # NOTE: Delay font_manager import, because want to avoid rebuilding font
     # cache, which means import must come after TTFPATH added to environ
     # by register_fonts()!
-    small = rcParams['font.size']  # must be absolute
-    large = rcParams['axes.titlesize']
-    if isinstance(large, str):
+    fontsize_small = rcParams['font.size']  # must be absolute
+    fontsize_large = rcParams['axes.titlesize']
+    if isinstance(fontsize_large, str):
         import matplotlib.font_manager as mfonts
         # error will be raised somewhere else if string name is invalid!
-        scale = mfonts.font_scalings.get(large, 1)
-        large = small * scale
+        scale = mfonts.font_scalings.get(fontsize_large, 1)
+        fontsize_large = fontsize_small * scale
 
     # Scales for converting physical units to inches
     unit_dict = UNIT_DICT.copy()
     unit_dict.update({
-        'em': small / 72.0,
-        'en': 0.5 * small / 72.0,
-        'Em': large / 72.0,
-        'En': 0.5 * large / 72.0,
+        'em': fontsize_small / 72.0,
+        'en': 0.5 * fontsize_small / 72.0,
+        'Em': fontsize_large / 72.0,
+        'En': 0.5 * fontsize_large / 72.0,
     })
 
     # Scales for converting display units to inches
