Skip to content

Fix: Context2d font regex too restrictive ( #3904 ) #3906

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix: Context2d font regex too restrictive ( #3904 ) #3906

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3f73650
Fix: Context2d font regex too restrictive ( #3904 )
Oct 16, 2025
69a0461
Fix: Context2d font regex too restrictive ( #3904 )
Oct 16, 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/modules/context2d.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -553,7 +553,7 @@ import {

//source: https://stackoverflow.com/a/10136041
// eslint-disable-next-line no-useless-escape
rx = /^\s*(?=(?:(?:[-a-z]+\s*){0,2}(italic|oblique))?)(?=(?:(?:[-a-z]+\s*){0,2}(small-caps))?)(?=(?:(?:[-a-z]+\s*){0,2}(bold(?:er)?|lighter|[1-9]00))?)(?:(?:normal|\1|\2|\3)\s*){0,3}((?:xx?-)?(?:small|large)|medium|smaller|larger|[.\d]+(?:\%|in|[cem]m|ex|p[ctx]))(?:\s*\/\s*(normal|[.\d]+(?:\%|in|[cem]m|ex|p[ctx])))?\s*([-_,\"\'\sa-z]+?)\s*$/i;
rx = /^\s*(?=(?:(?:[-a-z]+\s*){0,2}(italic|oblique))?)(?=(?:(?:[-a-z]+\s*){0,2}(small-caps))?)(?=(?:(?:[-a-z]+\s*){0,2}(bold(?:er)?|lighter|[1-9]00))?)(?:(?:normal|\1|\2|\3)\s*){0,3}((?:xx?-)?(?:small|large)|medium|smaller|larger|[.\d]+(?:\%|in|[cem]m|ex|p[ctx]))(?:\s*\/\s*(normal|[.\d]+(?:\%|in|[cem]m|ex|p[ctx])))?\s*([-_,\"\'\sa-z0-9]+?)\s*$/i;
matches = rx.exec(value);
if (matches !== null) {
var fontStyle = matches[1];
Expand Down
Binary file added test/reference/fa-solid-900.ttf
View file
Open in desktop
Binary file not shown.
18 changes: 18 additions & 0 deletions test/specs/context2d.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,24 @@ describe("Context2D: standard tests", () => {
comparePdf(doc.output(), "context2d-custom-fonts.pdf", "context2d");
});

it("context2d: custom fonts name regex", () => {
const FaSolid = loadBinaryResource("reference/fa-solid-900.ttf");

const doc = new jsPDF({
orientation: "p",
unit: "pt",
format: "a4",
floatPrecision: 2
});
doc.addFileToVFS("fa-solid-900.ttf", FaSolid);
doc.addFont("fa-solid-900.ttf", "Font Awesome 6 Free Solid", "normal");

const ctx = doc.context2d;
ctx.font = "normal 16pt \"Font Awesome 6 Free Solid\"";

expect(doc.getFont().fontName).toBe("Font Awesome 6 Free Solid");
});

it("context2d: css color names", () => {
var doc = new jsPDF({
orientation: "p",
Expand Down