Resolve linked fonts in fontManager.findfont()

sauerburger · sauerburger · commit 5e030c8b7959 · 2019-11-16T14:25:19.000+01:00
The commit ensures that the realpath of linked fonts is used across the library.
This prevents embedding a linked fonts twice and makes sure that
linked fonts are referenced consistently in PDFs files. The link resolution
cannot happend in addfont() since this would break the *directory* argument of
findfont().
diff --git a/lib/matplotlib/font_manager.py b/lib/matplotlib/font_manager.py
@@ -1238,9 +1238,10 @@ def findfont(self, prop, fontext='ttf', directory=None,
         rc_params = tuple(tuple(rcParams[key]) for key in [
             "font.serif", "font.sans-serif", "font.cursive", "font.fantasy",
             "font.monospace"])
-        return self._findfont_cached(
+        filename =  self._findfont_cached(
             prop, fontext, directory, fallback_to_default, rebuild_if_missing,
             rc_params)
+        return os.path.realpath(filename)
 
     @lru_cache()
     def _findfont_cached(self, prop, fontext, directory, fallback_to_default,
@@ -1339,9 +1340,6 @@ def is_opentype_cff_font(filename):
 
 
 def get_font(filename, hinting_factor=None):
-    # Resolving the path avoids embedding the font twice in pdf/ps output if a
-    # single font is selected using two different relative paths.
-    filename = os.path.realpath(filename)
     if hinting_factor is None:
         hinting_factor = rcParams['text.hinting_factor']
     return _get_font(os.fspath(filename), hinting_factor,
