Merge pull request #15250 from anntzer/font_manager

QuLogic · web-flow · commit f9e37f76c838 · 2019-09-18T01:24:43.000-04:00
Cleanup font_manager.
diff --git a/lib/matplotlib/font_manager.py b/lib/matplotlib/font_manager.py
@@ -941,12 +941,11 @@ def _normalize_font_family(family):
 
 class FontManager:
     """
-    On import, the :class:`FontManager` singleton instance creates a
-    list of TrueType fonts based on the font properties: name, style,
-    variant, weight, stretch, and size.  The :meth:`findfont` method
-    does a nearest neighbor search to find the font that most closely
-    matches the specification.  If no good enough match is found, a
-    default font is returned.
+    On import, the `FontManager` singleton instance creates a list of ttf and
+    afm fonts and caches their `FontProperties`.  The `FontManager.findfont`
+    method does a nearest neighbor search to find the font that most closely
+    matches the specification.  If no good enough match is found, the default
+    font is returned.
     """
     # Increment this version number whenever the font cache data
     # format or behavior has changed and requires a existing font
@@ -1196,12 +1195,15 @@ def findfont(self, prop, fontext='ttf', directory=None,
 
         directory : str, optional
             If given, only search this directory and its subdirectories.
+
         fallback_to_default : bool
             If True, will fallback to the default font family (usually
             "DejaVu Sans" or "Helvetica") if the first lookup hard-fails.
+
         rebuild_if_missing : bool
-            Whether to rebuild the font cache and search again if no match
-            is found.
+            Whether to rebuild the font cache and search again if the first
+            match appears to point to a nonexisting font (i.e., the font cache
+            contains outdated entries).
 
         Returns
         -------
@@ -1225,7 +1227,6 @@ def findfont(self, prop, fontext='ttf', directory=None,
 
         .. _fontconfig patterns:
            https://www.freedesktop.org/software/fontconfig/fontconfig-user.html
-
         """
         # Pass the relevant rcParams (and the font manager, as `self`) to
         # _findfont_cached so to prevent using a stale cache entry after an
@@ -1282,7 +1283,8 @@ def _findfont_cached(self, prop, fontext, directory, fallback_to_default,
                     prop.get_family(), self.defaultFamily[fontext])
                 default_prop = prop.copy()
                 default_prop.set_family(self.defaultFamily[fontext])
-                return self.findfont(default_prop, fontext, directory, False)
+                return self.findfont(default_prop, fontext, directory,
+                                     fallback_to_default=False)
             else:
                 raise ValueError(f"Failed to find font {prop}, and fallback "
                                  f"to the default font was disabled")
@@ -1297,7 +1299,7 @@ def _findfont_cached(self, prop, fontext, directory, fallback_to_default,
                     'findfont: Found a missing font file.  Rebuilding cache.')
                 _rebuild()
                 return fontManager.findfont(
-                    prop, fontext, directory, True, False)
+                    prop, fontext, directory, rebuild_if_missing=False)
             else:
                 raise ValueError("No valid font could be found")
 
