Skip to content

[pull] master from mozilla:master #175

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

Merged
pull merged 6 commits into from
Dec 23, 2025
Merged

[pull] master from mozilla:master #175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6d95eaa
Dont' throw when adding page labels in thumbnails
calixteman Dec 22, 2025
fc49858
Avoid exception when trying to render some glyphs contours
calixteman Dec 21, 2025
01531da
Simplify regex escaping
calixteman Dec 23, 2025
9f4db38
Merge pull request #20514 from calixteman/issue20513
calixteman Dec 23, 2025
cc0dada
Merge pull request #20524 from calixteman/simplify_regex_escaping
timvandermeij Dec 23, 2025
7f1f5ec
Merge pull request #20521 from calixteman/issue20520
timvandermeij Dec 23, 2025
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
2 changes: 1 addition & 1 deletion src/display/font_loader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,7 +436,7 @@ class FontFaceObject {
} catch (ex) {
warn(`getPathGenerator - ignoring character: "${ex}".`);
}
const path = makePathFromDrawOPS(cmds.path);
const path = makePathFromDrawOPS(cmds?.path);

if (!this.fontExtraProperties) {
// Remove the raw path-string, since we don't need it anymore.
Expand Down
1 change: 1 addition & 0 deletions test/pdfs/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -765,4 +765,5 @@
!two_paragraphs.pdf
!paragraph_and_link.pdf
!issue20225.pdf
!issue20513.pdf
!issue20516.pdf
Binary file added test/pdfs/issue20513.pdf
View file
Open in desktop
Binary file not shown.
7 changes: 7 additions & 0 deletions test/test_manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13099,5 +13099,12 @@
"enableXfa": true,
"lastPage": 1,
"type": "eq"
},
{
"id": "issue20513",
"file": "pdfs/issue20513.pdf",
"md5": "19a3a347773518242fa3cf1c04a9a1e4",
"rounds": 1,
"type": "eq"
}
]
8 changes: 2 additions & 6 deletions web/pdf_find_controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@ const DIACRITICS_EXCEPTION = new Set([
let DIACRITICS_EXCEPTION_STR; // Lazily initialized, see below.

const DIACRITICS_REG_EXP = /\p{M}+/gu;
const SPECIAL_PUNCTUATION_CHARACTERS = /[.?*{}()[\]\\]/g;
const SPECIAL_CHARS_REG_EXP = /([+^$|])|(\p{P}+)|(\s+)|(\p{M})|(\p{L})/gu;
const NOT_DIACRITIC_FROM_END_REG_EXP = /([^\p{M}])\p{M}*$/u;
const NOT_DIACRITIC_FROM_START_REG_EXP = /^\p{M}*([^\p{M}])/u;
Expand Down Expand Up @@ -735,14 +734,11 @@ class PDFFindController {

if (p1) {
// Escape characters like *+?... to not interfere with regexp syntax.
return addExtraWhitespaces(p1, `\\${p1}`);
return addExtraWhitespaces(p1, RegExp.escape(p1));
}
if (p2) {
// Allow whitespaces around group of punctuation signs.
return addExtraWhitespaces(
p2,
p2.replaceAll(SPECIAL_PUNCTUATION_CHARACTERS, "\\$&")
);
return addExtraWhitespaces(p2, RegExp.escape(p2));
}
if (p3) {
// Replace spaces by \s+ to be sure to match any spaces.
Expand Down
1 change: 0 additions & 1 deletion web/pdf_thumbnail_view.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,7 +449,6 @@ class PDFThumbnailView {
*/
setPageLabel(label) {
this.pageLabel = typeof label === "string" ? label : null;
this.anchor.setAttribute("data-l10n-args", this.#pageL10nArgs);
this.image.setAttribute("data-l10n-args", this.#pageL10nArgs);
}
}
Expand Down
Loading