Merge pull request #8071 from Snuffleupagus/bug-1337429

Always choose a (3, 1) cmap table for TrueType fonts that have an encoding specified, regardless of the Symbolic font flag (bug 1337429)
mozilla · Feb 16, 2017 · 425ad30 · 425ad30
2 parents 63c472c + ce07202
commit 425ad30
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 1 deletion.
diff --git a/src/core/fonts.js b/src/core/fonts.js
@@ -1434,7 +1434,7 @@ var Font = (function FontClosure() {
             // Continue the loop since there still may be a higher priority
             // table.
           } else if (platformId === 3 && encodingId === 1 &&
-                     ((!isSymbolicFont && hasEncoding) || !potentialTable)) {
+                     (hasEncoding || !potentialTable)) {
             useTable = true;
             if (!isSymbolicFont) {
               canBreak = true;

diff --git a/test/pdfs/.gitignore b/test/pdfs/.gitignore
@@ -62,6 +62,7 @@
 !bug1146106.pdf
 !bug1252420.pdf
 !bug1308536.pdf
+!bug1337429.pdf
 !issue5564_reduced.pdf
 !canvas.pdf
 !bug1132849.pdf

diff --git a/test/pdfs/bug1337429.pdf b/test/pdfs/bug1337429.pdf
diff --git a/test/test_manifest.json b/test/test_manifest.json
@@ -948,6 +948,13 @@
        "rounds": 1,
        "type": "eq"
     },
+    {  "id": "bug1337429",
+       "file": "pdfs/bug1337429.pdf",
+       "md5": "4e6e4dfdab884e9465bdce657b590028",
+       "link": false,
+       "rounds": 1,
+       "type": "eq"
+    },
     {  "id": "glyph_accent",
        "file": "pdfs/glyph_accent.pdf",
        "md5": "1526e4edaa3ec439ebf156d0a0b385aa",