mirrors/pdf.js
1
0
Fork 0
mirror of https://github.com/mozilla/pdf.js.git synced 2025-04-22 16:18:08 +02:00
Code Activity

Merge pull request #15563 from Snuffleupagus/issue-15559

Browse source 
Take the /CIDToGIDMap into account when getting the glyph mapping for CFF fonts (issue 15559)
This commit is contained in:
Jonas Jenwald 2022-10-14 09:13:41 +02:00 • committed by GitHub
commit 15d4d80d45
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 34 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/core/cff_font.js
View file

@ -48,11 +48,23 @@ class CFFFont {
getGlyphMapping() {
const cff = this.cff;
const properties = this.properties;
const { cidToGidMap, cMap } = properties;
const charsets = cff.charset.charset;
let charCodeToGlyphId;
let glyphId;
if (properties.composite) {
let invCidToGidMap;
if (cidToGidMap && cidToGidMap.length > 0) {
invCidToGidMap = Object.create(null);
for (let i = 0, ii = cidToGidMap.length; i < ii; i++) {
const gid = cidToGidMap[i];
if (gid !== undefined) {
invCidToGidMap[gid] = i;
}
}
}
charCodeToGlyphId = Object.create(null);
let charCode;
if (cff.isCIDFont) {
@ -60,14 +72,25 @@ class CFFFont {
// to map CIDs to GIDs.
for (glyphId = 0; glyphId < charsets.length; glyphId++) {
const cid = charsets[glyphId];
charCode = properties.cMap.charCodeOf(cid);
charCode = cMap.charCodeOf(cid);
if (invCidToGidMap && invCidToGidMap[charCode] !== undefined) {
// According to the PDF specification, see Table 117, it's not clear
// that a /CIDToGIDMap should be used with any non-TrueType fonts,
// however it's necessary to do so in order to fix issue 15559.
//
// It seems, in the CFF-case, that the /CIDToGIDMap needs to be used
// "inverted" compared to the TrueType-case. Here it thus seem to be
// a charCode mapping, rather than the normal CID to GID mapping.
charCode = invCidToGidMap[charCode];
}
charCodeToGlyphId[charCode] = glyphId;
}
} else {
// If it is NOT actually a CID font then CIDs should be mapped
// directly to GIDs.
for (glyphId = 0; glyphId < cff.charStrings.count; glyphId++) {
charCode = properties.cMap.charCodeOf(glyphId);
charCode = cMap.charCodeOf(glyphId);
charCodeToGlyphId[charCode] = glyphId;
}
}