Skip to content

Commit 09f5d2a

Browse files
committed
Add a fonts loader path and have fonts use that for accessing their data.
1 parent 27c47f3 commit 09f5d2a

File tree

3 files changed

+4
-9
lines changed

3 files changed

+4
-9
lines changed

components/mjs/input/tex/extension.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
import {combineDefaults} from '#js/components/global.js';
2-
import {hasWindow} from '#js/util/context.js';
32

4-
export function fontExtension(id, name, pkg = `@mathjax/${name}`) {
3+
export function fontExtension(id, name, pkg = `[fonts]/${name}`) {
54
if (MathJax.loader) {
6-
const FONTPATH = hasWindow ? `https://cdn.jsdelivr.net/npm/${pkg}` : pkg;
75
const path = name.replace(/-font-extension$/, '-extension');
86
const jax = (MathJax.config?.startup?.output || 'chtml');
9-
combineDefaults(MathJax.config.loader, 'paths', {[path]: FONTPATH});
7+
combineDefaults(MathJax.config.loader, 'paths', {[path]: pkg});
108
if (!MathJax._.output?.[jax]) {
119
combineDefaults(MathJax.config.loader, 'dependencies', {[`[${path}]/${jax}`]: [`output/${jax}`]});
1210
}

components/mjs/output/util.js

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,8 @@ import {combineDefaults, combineWithMathJax} from '#js/components/global.js';
22
import {Package} from '#js/components/package.js';
33
import {hasWindow} from '#js/util/context.js';
44

5-
export const FONTPATH = hasWindow
6-
? 'https://cdn.jsdelivr.net/npm/@mathjax/%%FONT%%-font'
7-
: '@mathjax/%%FONT%%-font';
8-
95
export function configFont(font, jax, config, extension = '') {
10-
const path = (config.fontPath || (FONTPATH + extension));
6+
const path = (config.fontPath || `[fonts]/%%FONT%%-font${extension}`);
117
const name = (font.match(/^[a-z]+:/) ? (font.match(/[^/:\\]*$/) || [jax])[0] : font);
128
combineDefaults(MathJax.config.loader, 'paths', {
139
[name+extension]: (name === font ? path.replace(/%%FONT%%/g, font) : font)

ts/components/loader.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -399,6 +399,7 @@ if (typeof MathJax.loader === 'undefined') {
399399
combineDefaults(MathJax.config, 'loader', {
400400
paths: {
401401
mathjax: Loader.getRoot(),
402+
fonts: context.window ? 'https://cdn.jsdelivr.net/npm/@mathjax' : '@mathjax',
402403
},
403404
source: {},
404405
dependencies: {},

0 commit comments

Comments
 (0)