diff --git a/bower.json b/bower.json index 665622014..757dcc2f6 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "pdfjs-dist", - "version": "1.1.444", + "version": "1.1.446", "main": [ "build/pdf.js", "build/pdf.worker.js" diff --git a/build/pdf.combined.js b/build/pdf.combined.js index c979a2317..b11e25853 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.444'; -PDFJS.build = '3daae40'; +PDFJS.version = '1.1.446'; +PDFJS.build = 'ded4f31'; (function pdfjsWrapper() { // Use strict in our context only - users might not want it @@ -24053,7 +24053,7 @@ var Font = (function FontClosure() { * Read the appropriate subtable from the cmap according to 9.6.6.4 from * PDF spec */ - function readCmapTable(cmap, font, isSymbolicFont) { + function readCmapTable(cmap, font, isSymbolicFont, hasEncoding) { var segment; var start = (font.start ? font.start : 0) + cmap.offset; font.pos = start; @@ -24084,7 +24084,7 @@ var Font = (function FontClosure() { // Continue the loop since there still may be a higher priority // table. } else if (platformId === 3 && encodingId === 1 && - (!isSymbolicFont || !potentialTable)) { + ((!isSymbolicFont && hasEncoding) || !potentialTable)) { useTable = true; if (!isSymbolicFont) { canBreak = true; @@ -25033,13 +25033,14 @@ var Font = (function FontClosure() { } else { // Most of the following logic in this code branch is based on the // 9.6.6.4 of the PDF spec. - var cmapTable = readCmapTable(tables.cmap, font, this.isSymbolicFont); + var hasEncoding = + properties.differences.length > 0 || !!properties.baseEncodingName; + var cmapTable = + readCmapTable(tables.cmap, font, this.isSymbolicFont, hasEncoding); var cmapPlatformId = cmapTable.platformId; var cmapEncodingId = cmapTable.encodingId; var cmapMappings = cmapTable.mappings; var cmapMappingsLength = cmapMappings.length; - var hasEncoding = properties.differences.length || - !!properties.baseEncodingName; // The spec seems to imply that if the font is symbolic the encoding // should be ignored, this doesn't appear to work for 'preistabelle.pdf' diff --git a/build/pdf.js b/build/pdf.js index 56a6b174b..23c69fa52 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.444'; -PDFJS.build = '3daae40'; +PDFJS.version = '1.1.446'; +PDFJS.build = 'ded4f31'; (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 774b87e81..9ed267dd1 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.444'; -PDFJS.build = '3daae40'; +PDFJS.version = '1.1.446'; +PDFJS.build = 'ded4f31'; (function pdfjsWrapper() { // Use strict in our context only - users might not want it @@ -17596,7 +17596,7 @@ var Font = (function FontClosure() { * Read the appropriate subtable from the cmap according to 9.6.6.4 from * PDF spec */ - function readCmapTable(cmap, font, isSymbolicFont) { + function readCmapTable(cmap, font, isSymbolicFont, hasEncoding) { var segment; var start = (font.start ? font.start : 0) + cmap.offset; font.pos = start; @@ -17627,7 +17627,7 @@ var Font = (function FontClosure() { // Continue the loop since there still may be a higher priority // table. } else if (platformId === 3 && encodingId === 1 && - (!isSymbolicFont || !potentialTable)) { + ((!isSymbolicFont && hasEncoding) || !potentialTable)) { useTable = true; if (!isSymbolicFont) { canBreak = true; @@ -18576,13 +18576,14 @@ var Font = (function FontClosure() { } else { // Most of the following logic in this code branch is based on the // 9.6.6.4 of the PDF spec. - var cmapTable = readCmapTable(tables.cmap, font, this.isSymbolicFont); + var hasEncoding = + properties.differences.length > 0 || !!properties.baseEncodingName; + var cmapTable = + readCmapTable(tables.cmap, font, this.isSymbolicFont, hasEncoding); var cmapPlatformId = cmapTable.platformId; var cmapEncodingId = cmapTable.encodingId; var cmapMappings = cmapTable.mappings; var cmapMappingsLength = cmapMappings.length; - var hasEncoding = properties.differences.length || - !!properties.baseEncodingName; // The spec seems to imply that if the font is symbolic the encoding // should be ignored, this doesn't appear to work for 'preistabelle.pdf' diff --git a/package.json b/package.json index dc4c46984..20bf05a62 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pdfjs-dist", - "version": "1.1.444", + "version": "1.1.446", "description": "Generic build of Mozilla's PDF.js library.", "keywords": [ "Mozilla",