diff --git a/bower.json b/bower.json index ba4ae21e7..9c9bd46f4 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "pdfjs-dist", - "version": "1.1.187", + "version": "1.1.189", "main": [ "build/pdf.js", "build/pdf.worker.js" diff --git a/build/pdf.combined.js b/build/pdf.combined.js index 102756c52..239cc6a36 100644 --- a/build/pdf.combined.js +++ b/build/pdf.combined.js @@ -22,8 +22,8 @@ if (typeof PDFJS === 'undefined') { (typeof window !== 'undefined' ? window : this).PDFJS = {}; } -PDFJS.version = '1.1.187'; -PDFJS.build = '8aa1c81'; +PDFJS.version = '1.1.189'; +PDFJS.build = '749a60a'; (function pdfjsWrapper() { // Use strict in our context only - users might not want it @@ -24700,13 +24700,18 @@ var Font = (function FontClosure() { } } - var charCodeToGlyphId = [], charCode, toUnicode = properties.toUnicode; + var charCodeToGlyphId = [], charCode; + var toUnicode = properties.toUnicode, widths = properties.widths; + var isIdentityUnicode = toUnicode instanceof IdentityToUnicodeMap; - function hasGlyph(glyphId, charCode) { + function hasGlyph(glyphId, charCode, widthCode) { if (!missingGlyphs[glyphId]) { return true; } - if (charCode >= 0 && toUnicode.has(charCode)) { + if (!isIdentityUnicode && charCode >= 0 && toUnicode.has(charCode)) { + return true; + } + if (widths && widthCode >= 0 && isNum(widths[widthCode])) { return true; } return false; @@ -24726,7 +24731,7 @@ var Font = (function FontClosure() { } if (glyphId >= 0 && glyphId < numGlyphs && - hasGlyph(glyphId, charCode)) { + hasGlyph(glyphId, charCode, cid)) { charCodeToGlyphId[charCode] = glyphId; } }); @@ -24787,7 +24792,7 @@ var Font = (function FontClosure() { var found = false; for (i = 0; i < cmapMappingsLength; ++i) { if (cmapMappings[i].charCode === unicodeOrCharCode && - hasGlyph(cmapMappings[i].glyphId, unicodeOrCharCode)) { + hasGlyph(cmapMappings[i].glyphId, unicodeOrCharCode, -1)) { charCodeToGlyphId[charCode] = cmapMappings[i].glyphId; found = true; break; @@ -24797,7 +24802,7 @@ var Font = (function FontClosure() { // Try to map using the post table. There are currently no known // pdfs that this fixes. var glyphId = properties.glyphNames.indexOf(glyphName); - if (glyphId > 0 && hasGlyph(glyphId, -1)) { + if (glyphId > 0 && hasGlyph(glyphId, -1, -1)) { charCodeToGlyphId[charCode] = glyphId; } } diff --git a/build/pdf.js b/build/pdf.js index d9e15f862..34e81519d 100644 --- a/build/pdf.js +++ b/build/pdf.js @@ -22,8 +22,8 @@ if (typeof PDFJS === 'undefined') { (typeof window !== 'undefined' ? window : this).PDFJS = {}; } -PDFJS.version = '1.1.187'; -PDFJS.build = '8aa1c81'; +PDFJS.version = '1.1.189'; +PDFJS.build = '749a60a'; (function pdfjsWrapper() { // Use strict in our context only - users might not want it diff --git a/build/pdf.worker.js b/build/pdf.worker.js index 577035187..9f23ba223 100644 --- a/build/pdf.worker.js +++ b/build/pdf.worker.js @@ -22,8 +22,8 @@ if (typeof PDFJS === 'undefined') { (typeof window !== 'undefined' ? window : this).PDFJS = {}; } -PDFJS.version = '1.1.187'; -PDFJS.build = '8aa1c81'; +PDFJS.version = '1.1.189'; +PDFJS.build = '749a60a'; (function pdfjsWrapper() { // Use strict in our context only - users might not want it @@ -18347,13 +18347,18 @@ var Font = (function FontClosure() { } } - var charCodeToGlyphId = [], charCode, toUnicode = properties.toUnicode; + var charCodeToGlyphId = [], charCode; + var toUnicode = properties.toUnicode, widths = properties.widths; + var isIdentityUnicode = toUnicode instanceof IdentityToUnicodeMap; - function hasGlyph(glyphId, charCode) { + function hasGlyph(glyphId, charCode, widthCode) { if (!missingGlyphs[glyphId]) { return true; } - if (charCode >= 0 && toUnicode.has(charCode)) { + if (!isIdentityUnicode && charCode >= 0 && toUnicode.has(charCode)) { + return true; + } + if (widths && widthCode >= 0 && isNum(widths[widthCode])) { return true; } return false; @@ -18373,7 +18378,7 @@ var Font = (function FontClosure() { } if (glyphId >= 0 && glyphId < numGlyphs && - hasGlyph(glyphId, charCode)) { + hasGlyph(glyphId, charCode, cid)) { charCodeToGlyphId[charCode] = glyphId; } }); @@ -18434,7 +18439,7 @@ var Font = (function FontClosure() { var found = false; for (i = 0; i < cmapMappingsLength; ++i) { if (cmapMappings[i].charCode === unicodeOrCharCode && - hasGlyph(cmapMappings[i].glyphId, unicodeOrCharCode)) { + hasGlyph(cmapMappings[i].glyphId, unicodeOrCharCode, -1)) { charCodeToGlyphId[charCode] = cmapMappings[i].glyphId; found = true; break; @@ -18444,7 +18449,7 @@ var Font = (function FontClosure() { // Try to map using the post table. There are currently no known // pdfs that this fixes. var glyphId = properties.glyphNames.indexOf(glyphName); - if (glyphId > 0 && hasGlyph(glyphId, -1)) { + if (glyphId > 0 && hasGlyph(glyphId, -1, -1)) { charCodeToGlyphId[charCode] = glyphId; } } diff --git a/package.json b/package.json index 76b8f4ac8..1ef2924d3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pdfjs-dist", - "version": "1.1.187", + "version": "1.1.189", "description": "Generic build of Mozilla's PDF.js library.", "keywords": [ "Mozilla",