src/core/evaluator.js

@@ -4664,22 +4664,9 @@ class PartialEvaluator {
       throw new FormatError("invalid font name");
     }
 
-    let fontFile, fontFileN, subtype, length1, length2, length3;
+    let fontFile, subtype, length1, length2, length3;
     try {
-      fontFile = descriptor.get("FontFile");
+      fontFile = descriptor.get("FontFile", "FontFile2", "FontFile3");
-      if (fontFile) {
-        fontFileN = 1;
-      } else {
-        fontFile = descriptor.get("FontFile2");
-        if (fontFile) {
-          fontFileN = 2;
-        } else {
-          fontFile = descriptor.get("FontFile3");
-          if (fontFile) {
-            fontFileN = 3;
-          }
-        }
-      }
 
       if (fontFile) {
         if (!(fontFile instanceof BaseStream)) {
@@ -4789,7 +4776,6 @@ class PartialEvaluator {
       name: fontName.name,
       subtype,
       file: fontFile,
-      fontFileN,
       length1,
       length2,
       length3,

src/core/fonts.js

@@ -2682,23 +2682,10 @@ class Font {
     }
 
     const isTrueType = !tables["CFF "];
-    let parsedCff = null;
     if (!isTrueType) {
-      try {
-        parsedCff = new CFFParser(
-          new Stream(tables["CFF "].data),
-          properties,
-          SEAC_ANALYSIS_ENABLED
-        ).parse();
-      } catch {
-        warn("Failed to parse font " + properties.loadedName);
-      }
-
       // OpenType font (skip composite fonts with non-default glyph mapping).
       if (
-        (header.version === "OTTO" &&
+        (header.version === "OTTO" && !properties.composite) ||
-          (!properties.composite ||
-            (properties.fontFileN === 3 && parsedCff?.isCIDFont))) ||
         !tables.head ||
         !tables.hhea ||
         !tables.maxp ||
@@ -2738,11 +2725,19 @@ class Font {
     }
 
     let numGlyphsFromCFF;
-    if (parsedCff) {
+    if (!isTrueType) {
       try {
-        parsedCff.duplicateFirstGlyph();
+        // Trying to repair CFF file
-        tables["CFF "].data = new CFFCompiler(parsedCff).compile();
+        const parser = new CFFParser(
-        numGlyphsFromCFF = parsedCff.charStringCount;
+          new Stream(tables["CFF "].data),
+          properties,
+          SEAC_ANALYSIS_ENABLED
+        );
+        const cff = parser.parse();
+        cff.duplicateFirstGlyph();
+        const compiler = new CFFCompiler(cff);
+        tables["CFF "].data = compiler.compile();
+        numGlyphsFromCFF = cff.charStringCount;
       } catch {
         warn("Failed to compile font " + properties.loadedName);
       }

test/pdfs/.gitignore

@@ -921,4 +921,3 @@
 !operator_list_cycle.pdf
 !knockout_groups_test.pdf
 !issue18032.pdf
-!Embedded_font.pdf

test/test_manifest.json

@@ -14260,12 +14260,5 @@
     "rounds": 1,
     "type": "eq",
     "about": "Non-isolated knockout group with a nested non-isolated subgroup over existing text."
-  },
-  {
-    "id": "Embedded_font.pdf",
-    "file": "pdfs/Embedded_font.pdf",
-    "md5": "b68dd5a3e6833d1af94e295fe1d60285",
-    "rounds": 1,
-    "type": "eq"
   }
 ]