Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[api-minor] Don't normalize the text used in the text layer. #16200

Merged
merged 1 commit into from
Apr 17, 2023
Merged

[api-minor] Don't normalize the text used in the text layer. #16200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/core/bidi.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,11 @@ function bidi(str, startLevel = -1, vertical = false) {
if (!charType) {
warn("Bidi: invalid Unicode character " + charCode.toString(16));
}
} else if (0x0700 <= charCode && charCode <= 0x08ac) {
} else if (
(0x0700 <= charCode && charCode <= 0x08ac) ||
(0xfb50 <= charCode && charCode <= 0xfdff) ||
(0xfe70 <= charCode && charCode <= 0xfeff)
) {
charType = "AL";
}
if (charType === "R" || charType === "AL" || charType === "AN") {
Expand Down
9 changes: 8 additions & 1 deletion src/core/document.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -511,7 +511,13 @@ class Page {
});
}

extractTextContent({ handler, task, includeMarkedContent, sink }) {
extractTextContent({
handler,
task,
includeMarkedContent,
disableNormalization,
sink,
}) {
const contentStreamPromise = this.getContentStream();
const resourcesPromise = this.loadResources([
"ExtGState",
Expand Down Expand Up @@ -539,6 +545,7 @@ class Page {
task,
resources: this.resources,
includeMarkedContent,
disableNormalization,
sink,
viewBox: this.view,
});
Expand Down
10 changes: 8 additions & 2 deletions src/core/evaluator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import {
IDENTITY_MATRIX,
info,
isArrayEqual,
normalizeUnicode,
OPS,
shadow,
stringToPDFString,
Expand Down Expand Up @@ -2271,6 +2272,7 @@ class PartialEvaluator {
seenStyles = new Set(),
viewBox,
markedContentData = null,
disableNormalization = false,
calixteman marked this conversation as resolved.
Show resolved Hide resolved
}) {
// Ensure that `resources`/`stateManager` is correctly initialized,
// even if the provided parameter is e.g. `null`.
Expand Down Expand Up @@ -2524,7 +2526,10 @@ class PartialEvaluator {
}

function runBidiTransform(textChunk) {
const text = textChunk.str.join("");
let text = textChunk.str.join("");
if (!disableNormalization) {
text = normalizeUnicode(text);
}
const bidiResult = bidi(text, -1, textChunk.vertical);
return {
str: bidiResult.str,
Expand Down Expand Up @@ -2859,7 +2864,7 @@ class PartialEvaluator {
textChunk.prevTransform = getCurrentTextTransform();
}

const glyphUnicode = glyph.normalizedUnicode;
const glyphUnicode = glyph.unicode;
if (saveLastChar(glyphUnicode)) {
// The two last chars are a non-whitespace followed by a whitespace
// and then this non-whitespace, so we insert a whitespace here.
Expand Down Expand Up @@ -3242,6 +3247,7 @@ class PartialEvaluator {
seenStyles,
viewBox,
markedContentData,
disableNormalization,
})
.then(function () {
if (!sinkWrapper.enqueueInvoked) {
Expand Down
32 changes: 6 additions & 26 deletions src/core/fonts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,9 @@ import {
} from "./fonts_utils.js";
import {
getCharUnicodeCategory,
getNormalizedUnicodes,
getUnicodeForGlyph,
getUnicodeRangeFor,
mapSpecialUnicodeValues,
reverseIfRtl,
} from "./unicode.js";
import { getDingbatsGlyphsUnicode, getGlyphsUnicode } from "./glyphlist.js";
import {
Expand Down Expand Up @@ -277,24 +275,6 @@ class Glyph {
/* nonSerializable = */ true
);
}

/**
* This property, which is only used by `PartialEvaluator.getTextContent`,
* is purposely made non-serializable.
* @type {string}
*/
get normalizedUnicode() {
return shadow(
this,
"normalizedUnicode",
reverseIfRtl(Glyph._NormalizedUnicodes[this.unicode] || this.unicode),
/* nonSerializable = */ true
);
}

static get _NormalizedUnicodes() {
return shadow(this, "_NormalizedUnicodes", getNormalizedUnicodes());
}
}

function int16(b0, b1) {
Expand Down Expand Up @@ -507,6 +487,9 @@ function adjustMapping(charCodeToGlyphId, hasGlyph, newGlyphZeroId, toUnicode) {
const privateUseOffetStart = PRIVATE_USE_AREAS[privateUseAreaIndex][0];
let nextAvailableFontCharCode = privateUseOffetStart;
let privateUseOffetEnd = PRIVATE_USE_AREAS[privateUseAreaIndex][1];
const isInPrivateArea = code =>
(PRIVATE_USE_AREAS[0][0] <= code && code <= PRIVATE_USE_AREAS[0][1]) ||
(PRIVATE_USE_AREAS[1][0] <= code && code <= PRIVATE_USE_AREAS[1][1]);
for (let originalCharCode in charCodeToGlyphId) {
originalCharCode |= 0;
let glyphId = charCodeToGlyphId[originalCharCode];
Expand Down Expand Up @@ -539,11 +522,7 @@ function adjustMapping(charCodeToGlyphId, hasGlyph, newGlyphZeroId, toUnicode) {
if (typeof unicode === "string") {
unicode = unicode.codePointAt(0);
}
if (
unicode &&
unicode < privateUseOffetStart &&
!usedGlyphIds.has(glyphId)
) {
if (unicode && !isInPrivateArea(unicode) && !usedGlyphIds.has(glyphId)) {
toUnicodeExtraMap.set(unicode, glyphId);
usedGlyphIds.add(glyphId);
}
Expand Down Expand Up @@ -785,6 +764,7 @@ function createOS2Table(properties, charstrings, override) {

let firstCharIndex = null;
let lastCharIndex = 0;
let position = -1;

if (charstrings) {
for (let code in charstrings) {
Expand All @@ -796,7 +776,7 @@ function createOS2Table(properties, charstrings, override) {
lastCharIndex = code;
}

const position = getUnicodeRangeFor(code);
position = getUnicodeRangeFor(code, position);
if (position < 32) {
ulUnicodeRange1 |= 1 << position;
} else if (position < 64) {
Expand Down
Loading