Merge pull request #30520 from QuLogic/pdf-simplify-type3

QuLogic · web-flow · commit bb37cf9d742c · 2025-09-08T16:26:14.000-04:00
pdf: Simplify Type 3 font character encoding
diff --git a/lib/matplotlib/backends/backend_pdf.py b/lib/matplotlib/backends/backend_pdf.py
@@ -1180,13 +1180,11 @@ def embedTTFType3(font, characters, descriptor):
                 'Widths': widthsObject
                 }
 
-            from encodings import cp1252
-
             # Make the "Widths" array
             def get_char_width(charcode):
-                s = ord(cp1252.decoding_table[charcode])
                 width = font.load_char(
-                    s, flags=LoadFlags.NO_SCALE | LoadFlags.NO_HINTING).horiAdvance
+                    charcode,
+                    flags=LoadFlags.NO_SCALE | LoadFlags.NO_HINTING).horiAdvance
                 return cvt(width)
             with warnings.catch_warnings():
                 # Ignore 'Required glyph missing from current font' warning
@@ -2331,9 +2329,13 @@ def draw_tex(self, gc, x, y, s, prop, angle, *, mtext=None):
             self.draw_path(boxgc, path, mytrans, gc._rgb)
 
     def encode_string(self, s, fonttype):
-        if fonttype in (1, 3):
-            return s.encode('cp1252', 'replace')
-        return s.encode('utf-16be', 'replace')
+        match fonttype:
+            case 1:
+                return s.encode('cp1252', 'replace')
+            case 3:
+                return s.encode('latin-1', 'replace')
+            case _:
+                return s.encode('utf-16be', 'replace')
 
     def draw_text(self, gc, x, y, s, prop, angle, ismath=False, mtext=None):
         # docstring inherited
