Default x/ytick.labelcolor to text.color

trananso · trananso · commit bc227254ce5e · 2024-05-13T16:35:42.000-04:00
diff --git a/lib/matplotlib/axis.py b/lib/matplotlib/axis.py
@@ -129,9 +129,9 @@ def __init__(
         if labelcolor is None:
             labelcolor = mpl.rcParams[f"{name}.labelcolor"]
 
-        if cbook._str_equal(labelcolor, 'inherit'):
-            # inherit from tick color
-            labelcolor = mpl.rcParams[f"{name}.color"]
+        if (cbook._str_equal(labelcolor, 'inherit') or
+                cbook._str_equal(labelcolor, 'auto')):
+            labelcolor = mpl.rcParams["text.color"]
 
         if labelsize is None:
             labelsize = mpl.rcParams[f"{name}.labelsize"]
@@ -2591,10 +2591,11 @@ def _init(self):
         )
         self.label_position = 'left'
 
-        if mpl.rcParams['ytick.labelcolor'] == 'inherit':
-            tick_color = mpl.rcParams['ytick.color']
-        else:
-            tick_color = mpl.rcParams['ytick.labelcolor']
+        tick_color = mpl.rcParams['ytick.labelcolor']
+
+        if (cbook._str_equal(tick_color, 'inherit') or
+                cbook._str_equal(tick_color, 'auto')):
+            tick_color = mpl.rcParams["text.color"]
 
         # x in axes coords, y in display coords(!).
         self.offsetText.set(
diff --git a/lib/matplotlib/mpl-data/matplotlibrc b/lib/matplotlib/mpl-data/matplotlibrc
@@ -482,7 +482,7 @@
 #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:         black   # color of the ticks
-#xtick.labelcolor:    inherit # color of the tick labels or inherit from xtick.color
+#xtick.labelcolor:    auto    # color of the tick labels or default to text.color
 #xtick.labelsize:     medium  # font size of the tick labels
 #xtick.direction:     out     # direction: {in, out, inout}
 #xtick.minor.visible: False   # visibility of minor ticks on x-axis
@@ -504,7 +504,7 @@
 #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:         black   # color of the ticks
-#ytick.labelcolor:    inherit # color of the tick labels or inherit from ytick.color
+#ytick.labelcolor:    auto    # color of the tick labels or default to text.color
 #ytick.labelsize:     medium  # font size of the tick labels
 #ytick.direction:     out     # direction: {in, out, inout}
 #ytick.minor.visible: False   # visibility of minor ticks on y-axis
diff --git a/lib/matplotlib/rcsetup.py b/lib/matplotlib/rcsetup.py
@@ -301,6 +301,12 @@ def validate_color_or_auto(s):
     return validate_color(s)
 
 
+def validate_color_inherit_or_auto(s):
+    if cbook._str_equal(s, 'inherit') or cbook._str_equal(s, 'auto'):
+        return s
+    return validate_color(s)
+
+
 def validate_color_for_prop_cycle(s):
     # N-th color cycle syntax can't go into the color cycle.
     if isinstance(s, str) and re.match("^C[0-9]$", s):
@@ -1199,7 +1205,7 @@ def _convert_validator_spec(key, conv):
     "xtick.major.pad":     validate_float,     # distance to label in points
     "xtick.minor.pad":     validate_float,     # distance to label in points
     "xtick.color":         validate_color,     # color of xticks
-    "xtick.labelcolor":    validate_color_or_inherit,  # color of xtick labels
+    "xtick.labelcolor":    validate_color_inherit_or_auto,  # color of xtick labels
     "xtick.minor.visible": validate_bool,      # visibility of minor xticks
     "xtick.minor.top":     validate_bool,      # draw top minor xticks
     "xtick.minor.bottom":  validate_bool,      # draw bottom minor xticks
@@ -1222,7 +1228,7 @@ def _convert_validator_spec(key, conv):
     "ytick.major.pad":     validate_float,     # distance to label in points
     "ytick.minor.pad":     validate_float,     # distance to label in points
     "ytick.color":         validate_color,     # color of yticks
-    "ytick.labelcolor":    validate_color_or_inherit,  # color of ytick labels
+    "ytick.labelcolor":    validate_color_inherit_or_auto,  # color of ytick labels
     "ytick.minor.visible": validate_bool,      # visibility of minor yticks
     "ytick.minor.left":    validate_bool,      # draw left minor yticks
     "ytick.minor.right":   validate_bool,      # draw right minor yticks
