Recognize abbreviations of PostScript code

jkseppan · jkseppan · commit 9418b3589014 · 2021-07-22T18:57:24.000+03:00
Type-1 fonts are required to have subroutines with specific contents
but their names may vary. They are usually ND, NP and RD but names
like | and |- appear too.
diff --git a/lib/matplotlib/tests/test_type1font.py b/lib/matplotlib/tests/test_type1font.py
@@ -41,6 +41,7 @@ def test_Type1Font():
     assert slanted.prop['ItalicAngle'] == -45
     assert font.prop['Encoding'][5] == 'Pi'
     assert isinstance(font.prop['CharStrings']['Pi'], bytes)
+    assert font._abbr['ND'] == b'ND'
 
     differ = difflib.Differ()
     diff = list(differ.compare(
@@ -84,6 +85,7 @@ def test_Type1Font_2():
     assert font.prop['Encoding'][65] == 'A'  # the font uses StandardEncoding
     (pos0, pos1), = font._pos['Encoding']
     assert font.parts[0][pos0:pos1] == b'/Encoding StandardEncoding'
+    assert font._abbr['ND'] == b'|-'
 
 
 def test_overprecision():
diff --git a/lib/matplotlib/type1font.py b/lib/matplotlib/type1font.py
@@ -264,11 +264,14 @@ class Type1Font:
           Subrs - array of byte code subroutines
           OtherSubrs - bytes object encoding some PostScript code
     """
-    __slots__ = ('parts', 'decrypted', 'prop', '_pos')
+    __slots__ = ('parts', 'decrypted', 'prop', '_pos', '_abbr')
     # the _pos dict contains (begin, end) indices to parts[0] + decrypted
     # so that they can be replaced when transforming the font;
     # but since sometimes a definition appears in both parts[0] and decrypted,
     # _pos[name] is an array of such pairs
+    #
+    # _abbr maps three standard abbreviations to their particular names in
+    # this font (e.g. 'RD' is named '-|' in some fonts)
 
     def __init__(self, input):
         """
@@ -288,6 +291,7 @@ def __init__(self, input):
             self.parts = self._split(data)
 
         self.decrypted = self._decrypt(self.parts[1], 'eexec')
+        self._abbr = {'RD': b'RD', 'ND': b'ND', 'NP': b'NP'}
         self._parse()
 
     def _read(self, file):
@@ -482,10 +486,18 @@ def convert(x): return x.decode('ascii', 'replace')
                 break
 
             # sometimes noaccess def and readonly def are abbreviated
-            if kw.is_name(b'def', b'ND', b'RD', b'|-'):
+            if kw.is_name(b'def', self._abbr['ND'], self._abbr['NP']):
                 prop[key] = value
                 pos.setdefault(key, []).append((keypos, kw.endpos()))
 
+            # detect the standard abbreviations
+            if value == b'{noaccess def}':
+                self._abbr['ND'] = key.encode('ascii')
+            elif value == b'{noaccess put}':
+                self._abbr['NP'] = key.encode('ascii')
+            elif value == b'{string currentfile exch readstring pop}':
+                self._abbr['RD'] = key.encode('ascii')
+
         # Fill in the various *Name properties
         if 'FontName' not in prop:
             prop['FontName'] = (prop.get('FullName') or
@@ -511,8 +523,7 @@ def convert(x): return x.decode('ascii', 'replace')
         self.prop = prop
         self._pos = pos
 
-    @staticmethod
-    def _parse_subrs(tokens, _data):
+    def _parse_subrs(self, tokens, _data):
         count_token = next(tokens)
         if not count_token.is_number():
             raise RuntimeError(
@@ -539,7 +550,12 @@ def _parse_subrs(tokens, _data):
                     "Second token following dup in Subrs definition must "
                     f"be a number, was {nbytes_token}"
                 )
-            token = next(tokens)  # usually RD or |- but the font can define this to be anything
+            token = next(tokens)
+            if not token.is_name(self._abbr['RD']):
+                raise RuntimeError(
+                    "Token preceding subr must be RD or equivalent, "
+                    f"was {token}"
+                )
             binary_token = tokens.send(1+nbytes_token.numeric_value())
             array[index_token.numeric_value()] = binary_token.value[1:]
 
