Merge pull request #22846 from meeseeksmachine/auto-backport-of-pr-22284-on-v3.5.x

QuLogic · web-flow · commit 08cb870e13dc · 2022-04-14T03:55:06.000-04:00
Backport PR #22284 on branch v3.5.x (Specify font number for TTC font subsetting)
diff --git a/lib/matplotlib/backends/_backend_pdf_ps.py b/lib/matplotlib/backends/_backend_pdf_ps.py
@@ -37,7 +37,11 @@ def get_glyphs_subset(fontfile, characters):
     options = subset.Options(glyph_names=True, recommended_glyphs=True)
 
     # prevent subsetting FontForge Timestamp and other tables
-    options.drop_tables += ['FFTM', 'PfEd']
+    options.drop_tables += ['FFTM', 'PfEd', 'BDF']
+
+    # if fontfile is a ttc, specify font number
+    if fontfile.endswith(".ttc"):
+        options.font_number = 0
 
     with subset.load_font(fontfile, options) as font:
         subsetter = subset.Subsetter(options=options)
diff --git a/lib/matplotlib/tests/test_backend_pdf.py b/lib/matplotlib/tests/test_backend_pdf.py
@@ -12,6 +12,7 @@
 from matplotlib import dviread, pyplot as plt, checkdep_usetex, rcParams
 from matplotlib.cbook import _get_data_path
 from matplotlib.ft2font import FT2Font
+from matplotlib.font_manager import findfont, FontProperties
 from matplotlib.backends._backend_pdf_ps import get_glyphs_subset
 from matplotlib.backends.backend_pdf import PdfPages
 
@@ -43,12 +44,20 @@ def test_use14corefonts():
     ax.axhline(0.5, linewidth=0.5)
 
 
-def test_type42():
-    rcParams['pdf.fonttype'] = 42
+@pytest.mark.parametrize('fontname, fontfile', [
+    ('DejaVu Sans', 'DejaVuSans.ttf'),
+    ('WenQuanYi Zen Hei', 'wqy-zenhei.ttc'),
+])
+@pytest.mark.parametrize('fonttype', [3, 42])
+def test_embed_fonts(fontname, fontfile, fonttype):
+    if Path(findfont(FontProperties(family=[fontname]))).name != fontfile:
+        pytest.skip(f'Font {fontname!r} may be missing')
 
+    rcParams['pdf.fonttype'] = fonttype
     fig, ax = plt.subplots()
     ax.plot([1, 2, 3])
-    fig.savefig(io.BytesIO())
+    ax.set_title('Axes Title', font=fontname)
+    fig.savefig(io.BytesIO(), format='pdf')
 
 
 def test_multipage_pagecount():
