Merge pull request #18862 from anntzer/eagermath

QuLogic · web-flow · commit f712a997a0dc · 2020-11-06T05:12:12.000-05:00
Resolve mathtext.fontset at FontProperties creation time.
diff --git a/lib/matplotlib/font_manager.py b/lib/matplotlib/font_manager.py
@@ -891,8 +891,6 @@ def get_math_fontfamily(self):
 
         The default font is :rc:`mathtext.fontset`.
         """
-        if self._math_fontfamily is None:
-            return rcParams['mathtext.fontset']
         return self._math_fontfamily
 
     def set_math_fontfamily(self, fontfamily):
@@ -915,13 +913,12 @@ def set_math_fontfamily(self, fontfamily):
         .text.Text.get_math_fontfamily
         """
         if fontfamily is None:
-            self._math_fontfamily = None
-            return
-
-        valid_fonts = _validators['mathtext.fontset'].valid.values()
-        # _check_in_list() Validates the parameter math_fontfamily as
-        # if it were passed to rcParams['mathtext.fontset']
-        _api.check_in_list(valid_fonts, math_fontfamily=fontfamily)
+            fontfamily = rcParams['mathtext.fontset']
+        else:
+            valid_fonts = _validators['mathtext.fontset'].valid.values()
+            # _check_in_list() Validates the parameter math_fontfamily as
+            # if it were passed to rcParams['mathtext.fontset']
+            _api.check_in_list(valid_fonts, math_fontfamily=fontfamily)
         self._math_fontfamily = fontfamily
 
     def copy(self):
