Merge remote-tracking branch 'upstream/v1.2.x'

mdboom · mdboom · commit b009b63f3f91 · 2013-05-06T14:29:39.000-04:00
diff --git a/lib/matplotlib/backends/backend_pdf.py b/lib/matplotlib/backends/backend_pdf.py
@@ -970,7 +970,7 @@ def embedTTFType42(font, characters, descriptor):
                      " ".join(["<%04x>" % x for x in range(start, end+1)])))
             unicode_cmap = (self._identityToUnicodeCMap %
                             (len(unicode_groups),
-                             "\n".join(unicode_bfrange)))
+                             "\n".join(unicode_bfrange))).encode('ascii')
 
             # CIDToGIDMap stream
             cid_to_gid_map = "".join(cid_to_gid_map).encode("utf-16be")
diff --git a/lib/matplotlib/tests/test_backend_pdf.py b/lib/matplotlib/tests/test_backend_pdf.py
@@ -22,3 +22,15 @@ def test_use14corefonts():
     plt.title(title)
     plt.text(0.5, 0.5, text, horizontalalignment='center', fontsize=24)
     plt.axhline(0.5, linewidth=0.5)
+
+
+def test_type42():
+    import io
+
+    rcParams['backend'] = 'pdf'
+    rcParams['pdf.fonttype'] = 42
+
+    fig = plt.figure()
+    ax = fig.add_subplot(111)
+    ax.plot([1,2,3])
+    fig.savefig(io.BytesIO())
