@@ -27,14 +27,25 @@ class CharacterTracker:
     def __init__(self):
         self.used = {}
 
-    def track(self, font, s):
-        """Record that string *s* is being typeset using font *font*."""
+    @staticmethod
+    def _get_name(font):
         if isinstance(font, str):
             # Unused, can be removed after removal of track_characters.
             fname = font
-        else:
+        elif hasattr(font, 'fname'):
             fname = font.fname
-        self.used.setdefault(fname, set()).update(map(ord, s))
+        elif hasattr(font, 'name'):
+            fname = font.name
+        if isinstance(fname, bytes):
+            fname = fname.decode('ascii', 'error')
+        return fname
+
+    def get_used(self, font, default=None):
+        return self.used.get(self._get_name(font), default)
+
+    def track(self, font, s):
+        """Record that string *s* is being typeset using font *font*."""
+        self.used.setdefault(self._get_name(font), set()).update(map(ord, s))
 
     # Not public, can be removed when pdf/ps merge_used_characters is removed.
     def merge(self, other):
 
@@ -963,6 +963,8 @@ def _embedTeXFont(self, fontinfo):
         t1font = type1font.Type1Font(fontinfo.fontfile)
         if fontinfo.effects:
             t1font = t1font.transform(fontinfo.effects)
+        chars = self._character_tracker.get_used(fontinfo.pdfname)
+        t1font = t1font.subset(chars)
         fontdict['BaseFont'] = Name(t1font.prop['FontName'])
 
         # Font descriptors may be shared between differently encoded
@@ -2227,6 +2229,7 @@ def draw_tex(self, gc, x, y, s, prop, angle, *, mtext=None):
                 seq += [['font', pdfname, dvifont.size]]
                 oldfont = dvifont
             seq += [['text', x1, y1, [bytes([glyph])], x1+width]]
+            self.file._character_tracker.track(pdfname, chr(glyph))
 
         # Find consecutive text strings with constant y coordinate and
         # combine into a sequence of strings and kerns, or just one