Skip to content

Commit 56e795f

Browse files
committed
Added URW Gothic font
1 parent 6e179e2 commit 56e795f

12 files changed

+37
-8
lines changed

fonts/all/URWGothicBook-Bold.woff

30.1 KB
Binary file not shown.
32.3 KB
Binary file not shown.
32 KB
Binary file not shown.
30.2 KB
Binary file not shown.
20 KB
Binary file not shown.
21.2 KB
Binary file not shown.
21.2 KB
Binary file not shown.
20.1 KB
Binary file not shown.

js/containers/fontContainer.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,6 @@ export async function loadFontContainerFamily(family, src, opt = false) {
191191
/**
192192
*
193193
* @param {StyleLookup} styleLookup
194-
* @returns
195194
*/
196195
const loadType = (styleLookup) => new Promise((resolve) => {
197196
const srcType = (src[styleLookup]);
@@ -419,6 +418,10 @@ export class FontCont {
419418
family = 'Palatino';
420419
} else if (/Garamond/i.test(family)) {
421420
family = 'Garamond';
421+
} else if (/CenturyGothic/i.test(family)) {
422+
family = 'Gothic';
423+
} else if (/AvantGarde/i.test(family)) {
424+
family = 'Gothic';
422425
} else if (/Carlito/i.test(family)) {
423426
family = 'Carlito';
424427
} else if (/Calibri/i.test(family)) {

js/fontContainerMain.js

Lines changed: 27 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,10 @@ export async function loadBuiltInFontsRaw(glyphSet = 'latin') {
4949
let /** @type {Promise<ArrayBuffer>} */nimbusMonoItalic;
5050
let /** @type {Promise<ArrayBuffer>} */nimbusMonoBold;
5151
let /** @type {Promise<ArrayBuffer>} */nimbusMonoBoldItalic;
52+
let /** @type {Promise<ArrayBuffer>} */gothicNormal;
53+
let /** @type {Promise<ArrayBuffer>} */gothicItalic;
54+
let /** @type {Promise<ArrayBuffer>} */gothicBold;
55+
let /** @type {Promise<ArrayBuffer>} */gothicBoldItalic;
5256
if (typeof process === 'undefined') {
5357
if (glyphSet === 'latin') {
5458
carlitoNormal = fetch(new URL('../fonts/latin/Carlito-Regular.woff', import.meta.url)).then((res) => res.arrayBuffer());
@@ -79,6 +83,10 @@ export async function loadBuiltInFontsRaw(glyphSet = 'latin') {
7983
nimbusMonoItalic = fetch(new URL('../fonts/latin/NimbusMono-Italic.woff', import.meta.url)).then((res) => res.arrayBuffer());
8084
nimbusMonoBold = fetch(new URL('../fonts/latin/NimbusMono-Bold.woff', import.meta.url)).then((res) => res.arrayBuffer());
8185
nimbusMonoBoldItalic = fetch(new URL('../fonts/latin/NimbusMono-BoldItalic.woff', import.meta.url)).then((res) => res.arrayBuffer());
86+
gothicNormal = fetch(new URL('../fonts/latin/URWGothicBook-Regular.woff', import.meta.url)).then((res) => res.arrayBuffer());
87+
gothicItalic = fetch(new URL('../fonts/latin/URWGothicBook-Italic.woff', import.meta.url)).then((res) => res.arrayBuffer());
88+
gothicBold = fetch(new URL('../fonts/latin/URWGothicBook-Bold.woff', import.meta.url)).then((res) => res.arrayBuffer());
89+
gothicBoldItalic = fetch(new URL('../fonts/latin/URWGothicBook-BoldItalic.woff', import.meta.url)).then((res) => res.arrayBuffer());
8290
} else {
8391
carlitoNormal = fetch(new URL('../fonts/all/Carlito-Regular.woff', import.meta.url)).then((res) => res.arrayBuffer());
8492
carlitoItalic = fetch(new URL('../fonts/all/Carlito-Italic.woff', import.meta.url)).then((res) => res.arrayBuffer());
@@ -108,6 +116,10 @@ export async function loadBuiltInFontsRaw(glyphSet = 'latin') {
108116
nimbusMonoItalic = fetch(new URL('../fonts/all/NimbusMono-Italic.woff', import.meta.url)).then((res) => res.arrayBuffer());
109117
nimbusMonoBold = fetch(new URL('../fonts/all/NimbusMono-Bold.woff', import.meta.url)).then((res) => res.arrayBuffer());
110118
nimbusMonoBoldItalic = fetch(new URL('../fonts/all/NimbusMono-BoldItalic.woff', import.meta.url)).then((res) => res.arrayBuffer());
119+
gothicNormal = fetch(new URL('../fonts/all/URWGothicBook-Regular.woff', import.meta.url)).then((res) => res.arrayBuffer());
120+
gothicItalic = fetch(new URL('../fonts/all/URWGothicBook-Italic.woff', import.meta.url)).then((res) => res.arrayBuffer());
121+
gothicBold = fetch(new URL('../fonts/all/URWGothicBook-Bold.woff', import.meta.url)).then((res) => res.arrayBuffer());
122+
gothicBoldItalic = fetch(new URL('../fonts/all/URWGothicBook-BoldItalic.woff', import.meta.url)).then((res) => res.arrayBuffer());
111123
}
112124
} else {
113125
const { readFile } = await import('fs/promises');
@@ -139,6 +151,10 @@ export async function loadBuiltInFontsRaw(glyphSet = 'latin') {
139151
nimbusMonoItalic = readFile(new URL('../fonts/all/NimbusMono-Italic.woff', import.meta.url)).then((res) => res.buffer);
140152
nimbusMonoBold = readFile(new URL('../fonts/all/NimbusMono-Bold.woff', import.meta.url)).then((res) => res.buffer);
141153
nimbusMonoBoldItalic = readFile(new URL('../fonts/all/NimbusMono-BoldItalic.woff', import.meta.url)).then((res) => res.buffer);
154+
gothicNormal = readFile(new URL('../fonts/all/URWGothicBook-Regular.woff', import.meta.url)).then((res) => res.buffer);
155+
gothicItalic = readFile(new URL('../fonts/all/URWGothicBook-Italic.woff', import.meta.url)).then((res) => res.buffer);
156+
gothicBold = readFile(new URL('../fonts/all/URWGothicBook-Bold.woff', import.meta.url)).then((res) => res.buffer);
157+
gothicBoldItalic = readFile(new URL('../fonts/all/URWGothicBook-BoldItalic.woff', import.meta.url)).then((res) => res.buffer);
142158
}
143159

144160
const srcObj = {
@@ -151,6 +167,9 @@ export async function loadBuiltInFontsRaw(glyphSet = 'latin') {
151167
Garamond: {
152168
normal: await garamondNormal, italic: await garamondItalic, bold: await garamondBold, boldItalic: await garamondBoldItalic,
153169
},
170+
Gothic: {
171+
normal: await gothicNormal, italic: await gothicItalic, bold: await gothicBold, boldItalic: await gothicBoldItalic,
172+
},
154173
Palatino: {
155174
normal: await palatinoNormal, italic: await palatinoItalic, bold: await palatinoBold, boldItalic: await palatinoBoldItalic,
156175
},
@@ -430,22 +449,25 @@ export async function optimizeFontContainerAll(fontPrivate, charMetricsObj) {
430449
const carlitoPromise = optimizeFontContainerFamily(fontPrivate.Carlito, charMetricsObj);
431450
const centuryPromise = optimizeFontContainerFamily(fontPrivate.Century, charMetricsObj);
432451
const garamondPromise = optimizeFontContainerFamily(fontPrivate.Garamond, charMetricsObj);
452+
const gothicPromise = optimizeFontContainerFamily(fontPrivate.Gothic, charMetricsObj);
433453
const palatinoPromise = optimizeFontContainerFamily(fontPrivate.Palatino, charMetricsObj);
434454
const nimbusRomanPromise = optimizeFontContainerFamily(fontPrivate.NimbusRoman, charMetricsObj);
435455
const nimbusSansPromise = optimizeFontContainerFamily(fontPrivate.NimbusSans, charMetricsObj);
436456
const nimbusMonoPromise = optimizeFontContainerFamily(fontPrivate.NimbusMono, charMetricsObj);
437457

438-
const results = await Promise.all([carlitoPromise, centuryPromise, garamondPromise, palatinoPromise, nimbusRomanPromise, nimbusSansPromise, nimbusMonoPromise]);
458+
const results = await Promise.all([carlitoPromise, centuryPromise, garamondPromise, gothicPromise,
459+
palatinoPromise, nimbusRomanPromise, nimbusSansPromise, nimbusMonoPromise]);
439460

440461
if (results.every((x) => x === null)) return null;
441462

442463
return {
443464
Carlito: results[0],
444465
Century: results[1],
445466
Garamond: results[2],
446-
Palatino: results[3],
447-
NimbusRoman: results[4],
448-
NimbusSans: results[5],
449-
NimbusMono: results[6],
467+
Gothic: results[3],
468+
Palatino: results[4],
469+
NimbusRoman: results[5],
470+
NimbusSans: results[6],
471+
NimbusMono: results[7],
450472
};
451473
}

0 commit comments

Comments
 (0)