Skip to content

Set FontFace weight ranges based on Typr info #7727

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
merged 3 commits into from
Apr 12, 2025
Merged

Set FontFace weight ranges based on Typr info #7727

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bd70f58
Set FontFace weight ranges based on Typr info
davepagurek Apr 12, 2025
33ae373
Fix order of values
davepagurek Apr 12, 2025
e02bd37
Use 100% font stretch as default
davepagurek Apr 12, 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
16 changes: 14 additions & 2 deletions src/type/p5.Font.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -684,14 +684,14 @@ export class Font {
let axs;
if ((this.data?.fvar?.length ?? 0) > 0) {
const fontAxes = this.data.fvar[0];
axs = fontAxes.map(([tag, minVal, maxVal, defaultVal, flags, name]) => {
axs = fontAxes.map(([tag, minVal, defaultVal, maxVal, flags, name]) => {
if (!renderer) return defaultVal;
if (tag === 'wght') {
return renderer.states.fontWeight;
} else if (tag === 'wdth') {
// TODO: map from keywords (normal, ultra-condensed, etc) to values
// return renderer.states.fontStretch
return defaultVal;
return 100;
} else if (renderer.textCanvas().style.fontVariationSettings) {
const match = new RegExp(`\\b${tag}\s+(\d+)`)
.exec(renderer.textCanvas().style.fontVariationSettings);
Expand Down Expand Up @@ -971,6 +971,18 @@ function createFontFace(name, path, descriptors, rawFont) {
fontArg = path;
}

if ((rawFont?.fvar?.length ?? 0) > 0) {
descriptors = descriptors || {};
for (const [tag, minVal, defaultVal, maxVal, flags, name] of rawFont.fvar[0]) {
if (tag === 'wght') {
descriptors.weight = `${minVal} ${maxVal}`;
} else if (tag === 'wdth') {
descriptors.stretch = `${minVal}% ${maxVal}%`;
}
// TODO add other descriptors
}
}

// create/return the FontFace object
let face = new FontFace(name, fontArg, descriptors);
if (face.status === 'error') {
Expand Down
2 changes: 0 additions & 2 deletions test/unit/visual/cases/typography.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,6 @@ visualSuite("Typography", function () {
p5.createCanvas(100, 100);
const font = await p5.loadFont(
'/unit/assets/BricolageGrotesque-Variable.ttf',
{ weight: '200 800' }
);
for (let weight = 400; weight <= 800; weight += 100) {
p5.background(255);
Expand All @@ -130,7 +129,6 @@ visualSuite("Typography", function () {
p5.createCanvas(100, 100, p5.WEBGL);
const font = await p5.loadFont(
'/unit/assets/BricolageGrotesque-Variable.ttf',
{ weight: '200 800' }
);
for (let weight = 400; weight <= 800; weight += 100) {
p5.push();
Expand Down