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

[Editor] Correctly save a non-ascii alt text

Browse source
This commit is contained in:
Calixte Denizet 2024-07-24 18:55:31 +02:00
parent cb737512de
commit c3065629ca
4 changed files with 67 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/core/annotation.js
View file

@ -42,12 +42,12 @@ import {
escapeString,
getInheritableProperty,
getRotationMatrix,
isAscii,
isNumberArray,
lookupMatrix,
lookupNormalRect,
lookupRect,
numberToString,
stringToAsciiOrUTF16BE,
stringToUTF16String,
} from "./core_utils.js";
import {
@ -2133,9 +2133,12 @@ class WidgetAnnotation extends Annotation {
value,
};
const encoder = val =>
isAscii(val) ? val : stringToUTF16String(val, /* bigEndian = */ true);
dict.set("V", Array.isArray(value) ? value.map(encoder) : encoder(value));
dict.set(
"V",
Array.isArray(value)
? value.map(stringToAsciiOrUTF16BE)
: stringToAsciiOrUTF16BE(value)
);
this.amendSavedDict(annotationStorage, dict);
const maybeMK = this._getMKDict(rotation);
@ -3852,21 +3855,13 @@ class FreeTextAnnotation extends MarkupAnnotation {
freetext.set("Rect", rect);
const da = `/Helv ${fontSize} Tf ${getPdfColor(color, /* isFill */ true)}`;
freetext.set("DA", da);
freetext.set(
"Contents",
isAscii(value)
? value
: stringToUTF16String(value, /* bigEndian = */ true)
);
freetext.set("Contents", stringToAsciiOrUTF16BE(value));
freetext.set("F", 4);
freetext.set("Border", [0, 0, 0]);
freetext.set("Rotate", rotation);
if (user) {
freetext.set(
"T",
isAscii(user) ? user : stringToUTF16String(user, /* bigEndian = */ true)
);
freetext.set("T", stringToAsciiOrUTF16BE(user));
}
if (apRef || ap) {
@ -4600,10 +4595,7 @@ class HighlightAnnotation extends MarkupAnnotation {
highlight.set("CA", opacity);
if (user) {
highlight.set(
"T",
isAscii(user) ? user : stringToUTF16String(user, /* bigEndian = */ true)
);
highlight.set("T", stringToAsciiOrUTF16BE(user));
}
if (apRef || ap) {
@ -4885,10 +4877,7 @@ class StampAnnotation extends MarkupAnnotation {
stamp.set("Rotate", rotation);
if (user) {
stamp.set(
"T",
isAscii(user) ? user : stringToUTF16String(user, /* bigEndian = */ true)
);
stamp.set("T", stringToAsciiOrUTF16BE(user));
}
if (apRef || ap) {

5
src/core/core_utils.js
View file

@ -613,6 +613,10 @@ function getNewAnnotationsMap(annotationStorage) {
return newAnnotationsByPage.size > 0 ? newAnnotationsByPage : null;
}
function stringToAsciiOrUTF16BE(str) {
return isAscii(str) ? str : stringToUTF16String(str, /* bigEndian = */ true);
}
function isAscii(str) {
return /^[\x00-\x7F]*$/.test(str);
}
@ -699,6 +703,7 @@ export {
readUint16,
readUint32,
recoverJsURL,
stringToAsciiOrUTF16BE,
stringToUTF16HexString,
stringToUTF16String,
toRomanNumerals,

9
src/core/struct_tree.js
View file

@ -16,6 +16,7 @@
import { AnnotationPrefix, stringToPDFString, warn } from "../shared/util.js";
import { Dict, isName, Name, Ref, RefSetCache } from "./primitives.js";
import { NumberTree } from "./name_number_tree.js";
import { stringToAsciiOrUTF16BE } from "./core_utils.js";
import { writeObject } from "./writer.js";
const MAX_DEPTH = 40;
@ -316,19 +317,19 @@ class StructTreeRoot {
tagDict.set("S", Name.get(type));
if (title) {
tagDict.set("T", title);
tagDict.set("T", stringToAsciiOrUTF16BE(title));
}
if (lang) {
tagDict.set("Lang", lang);
}
if (alt) {
tagDict.set("Alt", alt);
tagDict.set("Alt", stringToAsciiOrUTF16BE(alt));
}
if (expanded) {
tagDict.set("E", expanded);
tagDict.set("E", stringToAsciiOrUTF16BE(expanded));
}
if (actualText) {
tagDict.set("ActualText", actualText);
tagDict.set("ActualText", stringToAsciiOrUTF16BE(actualText));
}
await this.#updateParentTag({