Move the isAscii helper function into the worker-thread

Given that this helper function is only used on the worker-thread, there's no reason to duplicate it in both of the `pdf.js` and `pdf.worker.js` files.
This commit is contained in:
Jonas Jenwald 2022-11-16 12:07:24 +01:00
parent 2eaa708e3a
commit e5859e145d
5 changed files with 17 additions and 17 deletions

View File

@ -27,7 +27,6 @@ import {
FeatureTest,
getModificationDate,
IDENTITY_MATRIX,
isAscii,
LINE_DESCENT_FACTOR,
LINE_FACTOR,
OPS,
@ -42,6 +41,7 @@ import {
collectActions,
getInheritableProperty,
getRotationMatrix,
isAscii,
numberToString,
stringToUTF16String,
} from "./core_utils.js";

View File

@ -572,6 +572,10 @@ function getNewAnnotationsMap(annotationStorage) {
return newAnnotationsByPage.size > 0 ? newAnnotationsByPage : null;
}
function isAscii(str) {
return /^[\x00-\x7F]*$/.test(str);
}
function stringToUTF16HexString(str) {
const buf = [];
for (let i = 0, ii = str.length; i < ii; i++) {
@ -622,6 +626,7 @@ export {
getLookupTableFactory,
getNewAnnotationsMap,
getRotationMatrix,
isAscii,
isWhiteSpace,
log2,
MissingDataException,

View File

@ -1051,10 +1051,6 @@ function escapeString(str) {
});
}
function isAscii(str) {
return /^[\x00-\x7F]*$/.test(str);
}
function stringToUTF8String(str) {
return decodeURIComponent(escape(str));
}
@ -1168,7 +1164,6 @@ export {
InvalidPDFException,
isArrayBuffer,
isArrayEqual,
isAscii,
LINE_DESCENT_FACTOR,
LINE_FACTOR,
MissingPDFException,

View File

@ -18,6 +18,7 @@ import {
encodeToXmlString,
escapePDFName,
getInheritableProperty,
isAscii,
isWhiteSpace,
log2,
parseXFAPath,
@ -335,6 +336,16 @@ describe("core_utils", function () {
});
});
describe("isAscii", function () {
it("handles ascii/non-ascii strings", function () {
expect(isAscii("hello world")).toEqual(true);
expect(isAscii("こんにちは世界の")).toEqual(false);
expect(isAscii("hello world in Japanese is こんにちは世界の")).toEqual(
false
);
});
});
describe("stringToUTF16String", function () {
it("should encode a string in UTF16", function () {
expect(stringToUTF16String("hello world")).toEqual(

View File

@ -20,7 +20,6 @@ import {
escapeString,
getModificationDate,
isArrayBuffer,
isAscii,
string32,
stringToBytes,
stringToPDFString,
@ -259,14 +258,4 @@ describe("util", function () {
expect(getModificationDate(date)).toEqual("31410609020653");
});
});
describe("isAscii", function () {
it("handles ascii/non-ascii strings", function () {
expect(isAscii("hello world")).toEqual(true);
expect(isAscii("こんにちは世界の")).toEqual(false);
expect(isAscii("hello world in Japanese is こんにちは世界の")).toEqual(
false
);
});
});
});