Skip to content
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

Fixed metadata that enables fonts to be recognised as a family #606

Closed
wants to merge 2 commits into from
Closed

Fixed metadata that enables fonts to be recognised as a family #606

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
0428d1d
Fixed metadata that enables fonts to be recognised as a family
Lmpessoa Jul 21, 2023
8f3861d
Merge branch 'master' into master
Connum Oct 4, 2023
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
28 changes: 27 additions & 1 deletion src/font.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,12 +86,38 @@ function Font(options) {
this.unitsPerEm = options.unitsPerEm || 1000;
this.ascender = options.ascender;
this.descender = options.descender;
this.slope = options.slope;
this.italicAngle = options.italicAngle;
this.createdTimestamp = options.createdTimestamp;

var selection = 0;
if (this.italicAngle < 0) {
selection |= this.fsSelectionValues.ITALIC;
} else if (this.italicAngle > 0) {
selection |= this.fsSelectionValues.OBLIQUE;
}
if (this.weightClass >= 600) {
selection |= this.fsSelectionValues.BOLD;
}
if (selection == 0) {
selection = this.fsSelectionValues.REGULAR;
}

this.tables = Object.assign(options.tables, {
os2: Object.assign({
usWeightClass: options.weightClass || this.usWeightClasses.MEDIUM,
usWidthClass: options.widthClass || this.usWidthClasses.MEDIUM,
fsSelection: options.fsSelection || this.fsSelectionValues.REGULAR,
bFamilyType: options.panose[0] || 0,
bSerifStyle: options.panose[1] || 0,
bWeight: options.panose[2] || 0,
bProportion: options.panose[3] || 0,
bContrast: options.panose[4] || 0,
bStrokeVariation: options.panose[5] || 0,
bArmStyle: options.panose[6] || 0,
bLetterform: options.panose[7] || 0,
bMidline: options.panose[8] || 0,
bXHeight: options.panose[9] || 0,
fsSelection: selection,
}, options.tables.os2)
});
}
Expand Down
2 changes: 1 addition & 1 deletion src/tables/head.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ function makeHeadTable(options) {
{name: 'yMin', type: 'SHORT', value: 0},
{name: 'xMax', type: 'SHORT', value: 0},
{name: 'yMax', type: 'SHORT', value: 0},
{name: 'macStyle', type: 'USHORT', value: 0},
{name: 'macStyle', type: 'USHORT', value: options.macStyle},
{name: 'lowestRecPPEM', type: 'USHORT', value: 0},
{name: 'fontDirectionHint', type: 'SHORT', value: 2},
{name: 'indexToLocFormat', type: 'SHORT', value: 0},
Expand Down
6 changes: 3 additions & 3 deletions src/tables/post.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,17 +50,17 @@ function parsePostTable(data, start) {
return post;
}

function makePostTable(postTable) {
function makePostTable(font) {
const {
italicAngle = 0,
italicAngle = Math.round((font.italicAngle || 0) * 0x10000),
underlinePosition = 0,
underlineThickness = 0,
isFixedPitch = 0,
minMemType42 = 0,
maxMemType42 = 0,
minMemType1 = 0,
maxMemType1 = 0
} = postTable || {};
} = font.tables.post || {};
return new table.Table('post', [
{ name: 'version', type: 'FIXED', value: 0x00030000 },
{ name: 'italicAngle', type: 'FIXED', value: italicAngle },
Expand Down
13 changes: 11 additions & 2 deletions src/tables/sfnt.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,13 @@ function fontToSfntTable(font) {
globals.ascender = font.ascender;
globals.descender = font.descender;

var macStyle = 0;
if (font.italicAngle < 0) {
macStyle |= 2;
}
if (font.weightClass >= 600) {
macStyle |= 1;
}
const headTable = head.make({
flags: 3, // 00000011 (baseline for font at y=0; left sidebearing point at x=0)
unitsPerEm: font.unitsPerEm,
Expand All @@ -215,6 +222,7 @@ function fontToSfntTable(font) {
xMax: globals.xMax,
yMax: globals.yMax,
lowestRecPPEM: 3,
macStyle: macStyle,
createdTimestamp: font.createdTimestamp
});

Expand All @@ -225,7 +233,8 @@ function fontToSfntTable(font) {
minLeftSideBearing: globals.minLeftSideBearing,
minRightSideBearing: globals.minRightSideBearing,
xMaxExtent: globals.maxLeftSideBearing + (globals.xMax - globals.xMin),
numberOfHMetrics: font.glyphs.length
numberOfHMetrics: font.glyphs.length,
slope: font.slope,
});

const maxpTable = maxp.make(font.glyphs.length);
Expand Down Expand Up @@ -325,7 +334,7 @@ function fontToSfntTable(font) {
const nameTable = _name.make(names, languageTags);
const ltagTable = (languageTags.length > 0 ? ltag.make(languageTags) : undefined);

const postTable = post.make(font.tables.post);
const postTable = post.make(font);
const cffTable = cff.make(font.glyphs, {
version: font.getEnglishName('version'),
fullName: englishFullName,
Expand Down