Parse data from all fonts within a collection

This should allow listing the metadata from the whole collection, which
will also pick the right one if specified, though it will not load the
specific index yet.

Author: QuLogic

lib/matplotlib/font_manager.py

@@ -319,6 +319,7 @@ class FontEntry:
     """
 
     fname: str = ''
+    index: int = 0
     name: str = ''
     style: str = 'normal'
     variant: str = 'normal'
@@ -465,7 +466,8 @@ def get_weight():  # From fontconfig's FcFreeTypeQueryFaceInternal.
         raise NotImplementedError("Non-scalable fonts are not supported")
     size = 'scalable'
 
-    return FontEntry(font.fname, name, style, variant, weight, stretch, size)
+    return FontEntry(font.fname, font.face_index, name,
+                     style, variant, weight, stretch, size)
 
 
 def afmFontProperty(fontpath, font):
@@ -535,7 +537,7 @@ def afmFontProperty(fontpath, font):
 
     size = 'scalable'
 
-    return FontEntry(fontpath, name, style, variant, weight, stretch, size)
+    return FontEntry(fontpath, 0, name, style, variant, weight, stretch, size)
 
 
 def _cleanup_fontproperties_init(init_method):
@@ -1069,7 +1071,7 @@ class FontManager:
     # Increment this version number whenever the font cache data
     # format or behavior has changed and requires an existing font
     # cache files to be rebuilt.
-    __version__ = '3.11.0a1'
+    __version__ = '3.11.0a2'
 
     def __init__(self, size=None, weight='normal'):
         self._version = self.__version__
@@ -1134,6 +1136,10 @@ def addfont(self, path):
             font = ft2font.FT2Font(path)
             prop = ttfFontProperty(font)
             self.ttflist.append(prop)
+            for face_index in range(1, font.num_faces):
+                subfont = ft2font.FT2Font(path, face_index=face_index)
+                prop = ttfFontProperty(subfont)
+                self.ttflist.append(prop)
         self._findfont_cached.cache_clear()
 
     @property

lib/matplotlib/tests/test_font_manager.py

@@ -117,8 +117,13 @@ def test_utf16m_sfnt():
 
 def test_find_ttc():
     fp = FontProperties(family=["WenQuanYi Zen Hei"])
-    if Path(findfont(fp)).name != "wqy-zenhei.ttc":
+    fontpath = findfont(fp)
+    if Path(fontpath).name != "wqy-zenhei.ttc":
         pytest.skip("Font wqy-zenhei.ttc may be missing")
+    # All fonts from this collection should have loaded as well.
+    for name in ["WenQuanYi Zen Hei Mono", "WenQuanYi Zen Hei Sharp"]:
+        assert findfont(FontProperties(family=[name]),
+                        fallback_to_default=False) == fontpath
     fig, ax = plt.subplots()
     ax.text(.5, .5, "\N{KANGXI RADICAL DRAGON}", fontproperties=fp)
     for fmt in ["raw", "svg", "pdf", "ps"]:
@@ -342,6 +347,10 @@ def test_get_font_names():
             font = ft2font.FT2Font(path)
             prop = ttfFontProperty(font)
             ttf_fonts.append(prop.name)
+            for face_index in range(1, font.num_faces):
+                font = ft2font.FT2Font(path, face_index=face_index)
+                prop = ttfFontProperty(font)
+                ttf_fonts.append(prop.name)
         except Exception:
             pass
     available_fonts = sorted(list(set(ttf_fonts)))