Merge pull request #19862 from calixteman/bug1961423

Fix 'print to pdf' on Mac with a cid font (bug 1961423)

src/core/cff_parser.js

@@ -1769,12 +1769,16 @@ class CFFCompiler {
     if (isCIDFont) {
       // In a CID font, the charset is a mapping of CIDs not SIDs so just
       // create an identity mapping.
+      // nLeft: Glyphs left in range (excluding first) (see the CFF specs).
+      // Having a wrong value for nLeft induces a print issue on MacOS (see
+      // https://bugzilla.mozilla.org/1961423).
+      const nLeft = numGlyphsLessNotDef - 1;
       out = new Uint8Array([
         2, // format
         0, // first CID upper byte
         0, // first CID lower byte
-        (numGlyphsLessNotDef >> 8) & 0xff,
+        (nLeft >> 8) & 0xff,
-        numGlyphsLessNotDef & 0xff,
+        nLeft & 0xff,
       ]);
     } else {
       const length = 1 + numGlyphsLessNotDef * 2;

src/core/document.js

@@ -427,7 +427,7 @@ class Page {
     // available (see issue18894.pdf).
     const localResources = streamDict?.get("Resources");
 
-    if (!(localResources instanceof Dict)) {
+    if (!(localResources instanceof Dict && localResources.size)) {
       return this.resources;
     }
     const objectLoader = new ObjectLoader(localResources, keys, this.xref);

test/unit/cff_parser_spec.js

@@ -481,7 +481,7 @@ describe("CFFCompiler", function () {
       0, // cid (high)
       0, // cid (low)
       0, // nLeft (high)
-      numGlyphs - 1, // nLeft (low)
+      numGlyphs - 2, // nLeft (low)
     ]);
   });
 

web/debugger.css

@@ -22,7 +22,10 @@
   font: message-box;
 }
 #PDFBug {
-  background-color: rgb(255 255 255);
+  color-scheme: only light;
+
+  background-color: white;
+  color: black;
   border: 1px solid rgb(102 102 102);
   position: fixed;
   top: 32px;