Support (first font of) TTC files.

anntzer · anntzer · commit 224bdb19509b · 2017-11-14T18:18:12.000-08:00
TTC is a TrueType Collection file (a collection of TTFs).  Currently,
ft2font only supports getting the first font from the collection, and
neither the pdf nor ps backends are able to use them (due to limitations
of ttconv).  Still, it seems better than nothing to support them for Agg
and SVG.
diff --git a/.travis.yml b/.travis.yml
@@ -35,6 +35,7 @@ addons:
       - graphviz
       - libgeos-dev
       - otf-freefont
+      - ttf-wqy-zenhei
 
 env:
   global:
diff --git a/lib/matplotlib/backends/backend_pdf.py b/lib/matplotlib/backends/backend_pdf.py
@@ -984,8 +984,13 @@ def get_char_width(charcode):
 
             # Make the charprocs array (using ttconv to generate the
             # actual outlines)
-            rawcharprocs = ttconv.get_pdf_charprocs(
-                filename.encode(sys.getfilesystemencoding()), glyph_ids)
+            try:
+                rawcharprocs = ttconv.get_pdf_charprocs(
+                    filename.encode(sys.getfilesystemencoding()), glyph_ids)
+            except RuntimeError:
+                _log.warning("The PDF backend does not currently support the "
+                             "selected font.")
+                raise
             charprocs = {}
             for charname in sorted(rawcharprocs):
                 stream = rawcharprocs[charname]
diff --git a/lib/matplotlib/backends/backend_ps.py b/lib/matplotlib/backends/backend_ps.py
@@ -1111,10 +1111,16 @@ def print_figure_impl(fh):
                             raise RuntimeError(msg)
                         else:
                             fh.flush()
-                            convert_ttf_to_ps(
-                                font_filename.encode(
-                                    sys.getfilesystemencoding()),
-                                fh, fonttype, glyph_ids)
+                            try:
+                                convert_ttf_to_ps(
+                                    font_filename.encode(
+                                        sys.getfilesystemencoding()),
+                                    fh, fonttype, glyph_ids)
+                            except RuntimeError:
+                                _log.warning("The PostScript backend does not "
+                                             "currently support the selected "
+                                             "font.")
+                                raise
             print("end", file=fh)
             print("%%EndProlog", file=fh)
 
diff --git a/lib/matplotlib/font_manager.py b/lib/matplotlib/font_manager.py
@@ -164,9 +164,9 @@ def get_fontext_synonyms(fontext):
     Return a list of file extensions extensions that are synonyms for
     the given file extension *fileext*.
     """
-    return {'ttf': ('ttf', 'otf'),
-            'otf': ('ttf', 'otf'),
-            'afm': ('afm',)}[fontext]
+    return {'ttf': ['ttf', 'ttc', 'otf'],
+            'otf': ['ttf', 'otf'],
+            'afm': ['afm']}[fontext]
 
 
 def list_fonts(directory, extensions):
diff --git a/lib/matplotlib/tests/test_font_manager.py b/lib/matplotlib/tests/test_font_manager.py
@@ -13,7 +13,7 @@
 from matplotlib.font_manager import (
     findfont, FontProperties, fontManager, json_dump, json_load, get_font,
     get_fontconfig_fonts, is_opentype_cff_font, fontManager as fm)
-from matplotlib import rc_context
+from matplotlib import pyplot as plt, rc_context
 
 if six.PY2:
     from distutils.spawn import find_executable
@@ -106,3 +106,19 @@ def test_hinting_factor(factor):
     # Check that hinting only changes text layout by a small (10%) amount.
     np.testing.assert_allclose(hinted_font.get_width_height(), expected,
                                rtol=0.1)
+
+
+@pytest.mark.xfail(not os.environ.get("TRAVIS"), reason="Font may be missing.")
+def test_find_ttc():
+    fp = FontProperties(family=["WenQuanYi Zen Hei"])
+    font = findfont(fp)
+    assert os.path.basename(font) == "wqy-zenhei.ttc"
+
+    fig, ax = plt.subplots()
+    ax.text(.5, .5, "\N{KANGXI RADICAL DRAGON}", fontproperties=fp)
+    fig.savefig(six.BytesIO(), format="raw")
+    fig.savefig(six.BytesIO(), format="svg")
+    with pytest.raises(RuntimeError):
+        fig.savefig(six.BytesIO(), format="pdf")
+    with pytest.raises(RuntimeError):
+        fig.savefig(six.BytesIO(), format="ps")
