matplotlib
diff --git a/‎lib/matplotlib/backends/backend_agg.py
Copy file name to clipboardExpand all lines: lib/matplotlib/backends/backend_agg.py
+1Lines changed: 1 addition & 0 deletions b/‎lib/matplotlib/backends/backend_agg.py
Copy file name to clipboardExpand all lines: lib/matplotlib/backends/backend_agg.py
+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
+18-11Lines changed: 18 additions & 11 deletions b/‎lib/matplotlib/backends/backend_pdf.py
Copy file name to clipboardExpand all lines: lib/matplotlib/backends/backend_pdf.py
+18-11Lines changed: 18 additions & 11 deletions
diff --git a/‎src/ft2font.cpp
Copy file name to clipboardExpand all lines: src/ft2font.cpp
+5Lines changed: 5 additions & 0 deletions b/‎src/ft2font.cpp
Copy file name to clipboardExpand all lines: src/ft2font.cpp
+5Lines changed: 5 additions & 0 deletions
@@ -185,6 +185,7 @@ def draw_text(self, gc, x, y, s, prop, angle, ismath=False, mtext=None):
             return None
         # We pass '0' for angle here, since it will be rotated (in raster
         # space) in the following call to draw_text_image).
+        print("BEFORE")
         font.set_text(s, 0, flags=flags)
         font.draw_glyphs_to_bitmap(
             antialiased=mpl.rcParams['text.antialiased'])
 
@@ -33,7 +33,7 @@
     GraphicsContextBase, RendererBase)
 from matplotlib.backends.backend_mixed import MixedModeRenderer
 from matplotlib.figure import Figure
-from matplotlib.font_manager import findfont, get_font
+from matplotlib.font_manager import findfont, find_fontsprop, get_font
 from matplotlib.afm import AFM
 import matplotlib.type1font as type1font
 import matplotlib.dviread as dviread
@@ -861,20 +861,24 @@ def fontName(self, fontprop):
         """
 
         if isinstance(fontprop, str):
-            filename = fontprop
+            filename = [fontprop]
         elif mpl.rcParams['pdf.use14corefonts']:
-            filename = findfont(
-                fontprop, fontext='afm', directory=RendererPdf._afm_font_dir)
+            filename = find_fontsprop(
+                fontprop, fontext='afm', directory=RendererPdf._afm_font_dir
+            ).values()
         else:
-            filename = findfont(fontprop)
+            filename = find_fontsprop(fontprop).values()
 
-        Fx = self.fontNames.get(filename)
-        if Fx is None:
-            Fx = next(self._internal_font_seq)
-            self.fontNames[filename] = Fx
-            _log.debug('Assigning font %s = %r', Fx, filename)
+        Fxs = []
+        for fname in filename:
+            Fx = self.fontNames.get(fname)
+            if Fx is None:
+                Fx = next(self._internal_font_seq)
+                self.fontNames[fname] = Fx
+                _log.debug('Assigning font %s = %r', Fx, fname)
+            Fxs.append(Fx)
 
-        return Fx
+        return Fxs[0]
 
     def dviFontName(self, dvifont):
         """
@@ -1066,6 +1070,9 @@ def createType1Descriptor(self, t1font, fontfile):
 
     def _get_xobject_symbol_name(self, filename, symbol_name):
         Fx = self.fontName(filename)
+        # TODO: XObject symbol name should be multiple names?
+        # list(map(lambda x: x.name.decode(), Fxs))
+        # Fx = Fxs[0]
         return "-".join([
             Fx.name.decode(),
             os.path.splitext(os.path.basename(filename))[0],
 
@@ -555,6 +555,11 @@ void FT2Font::set_text(
     if (bbox.xMin > bbox.xMax) {
         bbox.xMin = bbox.yMin = bbox.xMax = bbox.yMax = 0;
     }
+    printf("\nMap: \n");
+    // print out num_glyphs for the final FT2Font so its easy to track
+    for (std::pair<const FT_UInt, FT2Font *> &x: glyph_to_font) {
+        printf("%u: %lu \n", x.first, x.second->get_face()->num_glyphs);
+    }
 }
 
 void FT2Font::fill_glyphs(
Original file line number	Diff line number	Diff line change
`@@ -555,6 +555,11 @@ void FT2Font::set_text(`
`555`	`555`	`if (bbox.xMin > bbox.xMax) {`
`556`	`556`	`bbox.xMin = bbox.yMin = bbox.xMax = bbox.yMax = 0;`
`557`	`557`	`}`
	`558`	`+ printf("\nMap: \n");`
	`559`	`+ // print out num_glyphs for the final FT2Font so its easy to track`
	`560`	`+ for (std::pair<const FT_UInt, FT2Font *> &x: glyph_to_font) {`
	`561`	`+ printf("%u: %lu \n", x.first, x.second->get_face()->num_glyphs);`
	`562`	`+ }`
`558`	`563`	`}`
`559`	`564`
`560`	`565`	`void FT2Font::fill_glyphs(`