matplotlib
diff --git a/‎.travis.yml
Copy file name to clipboardExpand all lines: .travis.yml
+1Lines changed: 1 addition & 0 deletions b/‎.travis.yml
Copy file name to clipboardExpand all lines: .travis.yml
+1Lines changed: 1 addition & 0 deletions
diff --git a/‎lib/matplotlib/backends/backend_pdf.py
Copy file name to clipboardExpand all lines: lib/matplotlib/backends/backend_pdf.py
+7-2Lines changed: 7 additions & 2 deletions b/‎lib/matplotlib/backends/backend_pdf.py
Copy file name to clipboardExpand all lines: lib/matplotlib/backends/backend_pdf.py
+7-2Lines changed: 7 additions & 2 deletions
diff --git a/‎lib/matplotlib/backends/backend_ps.py
Copy file name to clipboardExpand all lines: lib/matplotlib/backends/backend_ps.py
+10-4Lines changed: 10 additions & 4 deletions b/‎lib/matplotlib/backends/backend_ps.py
Copy file name to clipboardExpand all lines: lib/matplotlib/backends/backend_ps.py
+10-4Lines changed: 10 additions & 4 deletions
diff --git a/‎lib/matplotlib/font_manager.py
Copy file name to clipboardExpand all lines: lib/matplotlib/font_manager.py
+3-3Lines changed: 3 additions & 3 deletions b/‎lib/matplotlib/font_manager.py
Copy file name to clipboardExpand all lines: lib/matplotlib/font_manager.py
+3-3Lines changed: 3 additions & 3 deletions
diff --git a/‎lib/matplotlib/tests/test_font_manager.py
Copy file name to clipboardExpand all lines: lib/matplotlib/tests/test_font_manager.py
+17-1Lines changed: 17 additions & 1 deletion b/‎lib/matplotlib/tests/test_font_manager.py
Copy file name to clipboardExpand all lines: lib/matplotlib/tests/test_font_manager.py
+17-1Lines changed: 17 additions & 1 deletion
@@ -35,6 +35,7 @@ addons:
       - graphviz
       - libgeos-dev
       - otf-freefont
+      - ttf-wqy-zenhei
 
 env:
   global:
 
@@ -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]
 
@@ -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)
 
 
@@ -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):
 
@@ -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")