Merge pull request #12861 from Snuffleupagus/bug-1671312-ArialNarrow

Always re-measure non-embedded ArialNarrow fonts (bug 1671312, PR 12725 follow-up)
mozilla · Jan 14, 2021 · db70efa · db70efa
2 parents dcd1589 + 2600e59
commit db70efa
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 1 deletion.
diff --git a/src/core/fonts.js b/src/core/fonts.js
@@ -1335,8 +1335,13 @@ var Font = (function FontClosure() {
       // name ArialBlack for example will be replaced by Helvetica.
       this.black = name.search(/Black/g) !== -1;
 
+      // Use 'name' instead of 'fontName' here because the original
+      // name ArialNarrow for example will be replaced by Helvetica.
+      const isNarrow = name.search(/Narrow/g) !== -1;
+
       // if at least one width is present, remeasure all chars when exists
-      this.remeasure = !isStandardFont && Object.keys(this.widths).length > 0;
+      this.remeasure =
+        (!isStandardFont || isNarrow) && Object.keys(this.widths).length > 0;
       if (
         (isStandardFont || isMappedToStandardFont) &&
         type === "CIDFontType2" &&

diff --git a/test/pdfs/.gitignore b/test/pdfs/.gitignore
@@ -366,6 +366,7 @@
 !issue6889.pdf
 !bug1001080.pdf
 !bug1671312_reduced.pdf
+!bug1671312_ArialNarrow.pdf
 !issue6108.pdf
 !issue6113.pdf
 !openoffice.pdf

diff --git a/test/pdfs/bug1671312_ArialNarrow.pdf b/test/pdfs/bug1671312_ArialNarrow.pdf
diff --git a/test/test_manifest.json b/test/test_manifest.json
@@ -2301,6 +2301,12 @@
        "rounds": 1,
        "type": "eq"
     },
+    {  "id": "bug1671312_ArialNarrow",
+       "file": "pdfs/bug1671312_ArialNarrow.pdf",
+       "md5": "f4f0a0d1dc9276bd6e3402165ecdc3d7",
+       "rounds": 1,
+       "type": "eq"
+    },
     {  "id": "issue7020",
        "file": "pdfs/issue7020.pdf",
        "md5": "93b464e21c649e64ae92eeafe99fc31b",