Merge pull request #1373 from mathjax/feature/font-path

Add a fonts loader path and have fonts use that for accessing their data

Author: dpvc

components/mjs/input/tex/extension.js

@@ -1,12 +1,10 @@
 import {combineDefaults} from '#js/components/global.js';
-import {hasWindow} from '#js/util/context.js';
 
-export function fontExtension(id, name, pkg = `@mathjax/${name}`) {
+export function fontExtension(id, name, pkg = `[fonts]/${name}`) {
   if (MathJax.loader) {
-    const FONTPATH = hasWindow ? `https://cdn.jsdelivr.net/npm/${pkg}` : pkg;
     const path = name.replace(/-font-extension$/, '-extension');
     const jax = (MathJax.config?.startup?.output || 'chtml');
-    combineDefaults(MathJax.config.loader, 'paths', {[path]: FONTPATH});
+    combineDefaults(MathJax.config.loader, 'paths', {[path]: pkg});
     if (!MathJax._.output?.[jax]) {
       combineDefaults(MathJax.config.loader, 'dependencies', {[`[${path}]/${jax}`]: [`output/${jax}`]});
     }

components/mjs/output/util.js

@@ -2,12 +2,8 @@ import {combineDefaults, combineWithMathJax} from '#js/components/global.js';
 import {Package} from '#js/components/package.js';
 import {hasWindow} from '#js/util/context.js';
 
-export const FONTPATH = hasWindow
-  ? 'https://cdn.jsdelivr.net/npm/@mathjax/%%FONT%%-font'
-  : '@mathjax/%%FONT%%-font';
-
 export function configFont(font, jax, config, extension = '') {
-  const path = (config.fontPath || (FONTPATH + extension));
+  const path = (config.fontPath || `[fonts]/%%FONT%%-font${extension}`);
   const name = (font.match(/^[a-z]+:/) ? (font.match(/[^/:\\]*$/) || [jax])[0] : font);
   combineDefaults(MathJax.config.loader, 'paths', {
     [name+extension]: (name === font ? path.replace(/%%FONT%%/g, font) : font)

ts/components/loader.ts

@@ -399,6 +399,9 @@ if (typeof MathJax.loader === 'undefined') {
   combineDefaults(MathJax.config, 'loader', {
     paths: {
       mathjax: Loader.getRoot(),
+      fonts: context.window
+        ? 'https://cdn.jsdelivr.net/npm/@mathjax'
+        : '@mathjax',
     },
     source: {},
     dependencies: {},