Sakurai/pdf.js
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5379 from brendandahl/nbsp

Browse Source 
Don't map glyphs to unicode non breaking space.
This commit is contained in:
Yury Delendik 2014-12-18 13:38:03 -06:00
commit 31ae5f2a3d
3 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/core/fonts.js
View File

@ -2690,6 +2690,7 @@ var Font = (function FontClosure() {
fontCharCode <= 0x1f || // Control chars fontCharCode <= 0x1f || // Control chars
fontCharCode === 0x7F || // Control char fontCharCode === 0x7F || // Control char
fontCharCode === 0xAD || // Soft hyphen fontCharCode === 0xAD || // Soft hyphen
fontCharCode === 0xA0 || // Non breaking space
(fontCharCode >= 0x80 && fontCharCode <= 0x9F) || // Control chars (fontCharCode >= 0x80 && fontCharCode <= 0x9F) || // Control chars
// Prevent drawing characters in the specials unicode block. // Prevent drawing characters in the specials unicode block.
(fontCharCode >= 0xFFF0 && fontCharCode <= 0xFFFF) || (fontCharCode >= 0xFFF0 && fontCharCode <= 0xFFFF) ||
@ -4708,6 +4709,8 @@ function type1FontGlyphMapping(properties, builtInEncoding, glyphNames) {
glyphId = glyphNames.indexOf(baseEncoding[charCode]); glyphId = glyphNames.indexOf(baseEncoding[charCode]);
if (glyphId >= 0) { if (glyphId >= 0) {
charCodeToGlyphId[charCode] = glyphId; charCodeToGlyphId[charCode] = glyphId;
} else {
charCodeToGlyphId[charCode] = 0; // notdef
} }
} }
} else if (!!(properties.flags & FontFlags.Symbolic)) { } else if (!!(properties.flags & FontFlags.Symbolic)) {
@ -4724,6 +4727,8 @@ function type1FontGlyphMapping(properties, builtInEncoding, glyphNames) {
glyphId = glyphNames.indexOf(baseEncoding[charCode]); glyphId = glyphNames.indexOf(baseEncoding[charCode]);
if (glyphId >= 0) { if (glyphId >= 0) {
charCodeToGlyphId[charCode] = glyphId; charCodeToGlyphId[charCode] = glyphId;
} else {
charCodeToGlyphId[charCode] = 0; // notdef
} }
} }
} }
@ -4736,6 +4741,8 @@ function type1FontGlyphMapping(properties, builtInEncoding, glyphNames) {
glyphId = glyphNames.indexOf(glyphName); glyphId = glyphNames.indexOf(glyphName);
if (glyphId >= 0) { if (glyphId >= 0) {
charCodeToGlyphId[charCode] = glyphId; charCodeToGlyphId[charCode] = glyphId;
} else {
charCodeToGlyphId[charCode] = 0; // notdef
} }
} }
} }

BIN
test/pdfs/issue5138.pdf Normal file
View File

Binary file not shown.

8
test/test_manifest.json
View File

@ -615,6 +615,14 @@
"type": "eq", "type": "eq",
"about": "Glyph accent drawn as curves." "about": "Glyph accent drawn as curves."
}, },
{ "id": "issue5138",
"file": "pdfs/issue5138.pdf",
"md5": "9931686d7dee0df62640fbf58bed3323",
"link": false,
"rounds": 1,
"type": "eq",
"about": "Glyph that gets mapped to unicode non-breaking-space."
},
{ "id": "simpletype3font", { "id": "simpletype3font",
"file": "pdfs/simpletype3font.pdf", "file": "pdfs/simpletype3font.pdf",
"md5": "b374c7543920840c61999e9e86939f99", "md5": "b374c7543920840c61999e9e86939f99",