Merge branch 'develop' into issue3406

Author: dpvc

components/mjs/input/tex/extension.js

@@ -7,7 +7,9 @@ export function fontExtension(id, name, pkg = `@mathjax/${name}`) {
     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, 'dependencies', {[`[${path}]/${jax}`]: [`output/${jax}`]});
+    if (!MathJax._.output?.[jax]) {
+      combineDefaults(MathJax.config.loader, 'dependencies', {[`[${path}]/${jax}`]: [`output/${jax}`]});
+    }
     MathJax.loader.addPackageData(id, {
       extraLoads: [`[${path}]/${jax}`],
       rendererExtensions: [path]

components/mjs/output/util.js

@@ -2,9 +2,29 @@ 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 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 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)
+  });
+  return `[${name}${extension}]`;
+}
+
+export function configExtensions(jax, config) {
+  const extensions = [];
+  for (const name of (config.fontExtensions || [])) {
+    const font = configFont(name, jax, config, '-extension');
+    const module = `${font}/${jax}`
+    extensions.push(module);
+  }
+  return extensions;
+}
+
 export const OutputUtil = {
   config(jax, jaxClass, defaultFont, fontClass) {
 
@@ -20,15 +40,15 @@ export const OutputUtil = {
       }
 
       if (font.charAt(0) !== '[') {
-        const path = (config.fontPath || FONTPATH);
-        const name = (font.match(/^[a-z]+:/) ? (font.match(/[^/:\\]*$/) || [jax])[0] : font);
-        combineDefaults(MathJax.config.loader, 'paths', {
-          [name]: (name === font ? path.replace(/%%FONT%%/g, font) : font)
-        });
-        font = `[${name}]`;
+        font = configFont(font, jax, config);
       }
       const name = font.substring(1, font.length - 1);
 
+      const extensions = configExtensions(jax, config);
+      if (extensions.length) {
+        MathJax.loader.addPackageData(`${font}/${jax}`, {extraLoads: extensions});
+      }
+
       if (name !== defaultFont || !fontClass) {
 
         MathJax.loader.addPackageData(`output/${jax}`, {extraLoads: [`${font}/${jax}`]});

components/mjs/startup/hasown.js

@@ -0,0 +1,10 @@
+import {MathJax} from '#js/components/global.js';
+
+if (!Object.hasOwn && MathJax.config.startup.polyfillHasOwn) {
+  Object.hasOwn = function (el, prop) {
+    if (typeof el === 'undefined' || el === null) {
+      throw new TypeError('Cannot convert undefined or null to object');
+    }
+    return Object.prototype.hasOwnProperty.call(Object(el), prop);
+  }
+}

components/mjs/startup/init.js

@@ -1,3 +1,4 @@
+import './hasown.js'; // Can be removed with ES2024 implementation of Object.hasown
 import './lib/startup.js';
 
 import {combineDefaults} from '#js/components/global.js';

package.json

@@ -100,7 +100,7 @@
     "cjs:components:compile": "pnpm -s log:single 'Compiling component files'; pnpm tsc --project tsconfig/components.json",
     "cjs:components:copy": "pnpm copyfiles -u 2 -e 'components/mjs/**/*.js' 'components/mjs/**/*' components/cjs",
     "cjs:components:finalize": "pnpm -s log:comp 'Finalize cjs components'; pnpm -s cjs:components:copy && pnpm -s copy:pkg components/cjs && pnpm -s clean:lib cjs",
-    "cjs:components:make": "make() { pnpm -s log:single 'Making cjs components'; components/bin/makeAll --cjs --terse --bundle-cjs $1 components/cjs; }; make",
+    "cjs:components:make": "make() { pnpm -s log:single 'Making cjs components'; node components/bin/makeAll --cjs --terse --bundle-cjs $1 components/cjs; }; make",
     "cjs:components:src:build": "pnpm -s log:comp 'Building cjs components sources'; pnpm cjs:components:clean && pnpm cjs:components:compile && pnpm cjs:components:finalize",
     "cjs:src:build": "pnpm -s log:comp 'Building cjs sources'; pnpm -s link:src && pnpm clean:dir cjs && pnpm -s cjs:compile && pnpm -s copy:assets cjs && pnpm -s copy:pkg cjs",
     "cjs:copy:components": "pnpm -s log:single 'Moving cjs files from components' && pnpm copyfiles -u 2 'components/mjs/**/*.cjs' 'components/mjs/**/*.d.cts' components/cjs",
@@ -110,7 +110,7 @@
     "mjs:bundle:finalize": "pnpm -s log:single 'Finalize mjs bundle'; echo '{\n  \"type\": \"commonjs\"\n}' > bundle/package.json;",
     "mjs:compile": "pnpm -s log:single 'Compiling mjs typescript files'; pnpm tsc --project tsconfig/mjs.json && pnpm tsc --project tsconfig/worker.json",
     "mjs:components:build": "pnpm -s log:comp 'Compiling mjs component files'; pnpm clean:lib mjs && pnpm clean:dir bundle && pnpm mjs:components:make && pnpm mjs:bundle:finalize",
-    "mjs:components:make": "pnpm -s log:single 'Making mjs components'; components/bin/makeAll --mjs --terse components/mjs",
+    "mjs:components:make": "pnpm -s log:single 'Making mjs components'; node components/bin/makeAll --mjs --terse components/mjs",
     "mjs:src:build": "pnpm -s log:comp 'Building mjs sources'; pnpm -s link:src && pnpm -s clean:dir mjs && pnpm -s mjs:compile && pnpm -s copy:assets mjs",
     "=============================================================================== mml3": "",
     "mml3:make:xslt": "pnpm xslt3 -t -xsl:/tmp/mml3.xsl -export:ts/input/mathml/mml3/mml3.sef.json -nogo",
@@ -132,7 +132,7 @@
     "build-mjs": "pnpm -s mjs:build",
     "make-cjs-components": "pnpm -s cjs:components:make && pnpm -s cjs:bundle:finalize",
     "make-mjs-components": "pnpm -s mjs:components:make",
-    "make-one": "make() { components/bin/makeAll --no-subdirs $3 $4 --${2:-mjs} components/${2-:mjs}/$1; }; make",
+    "make-one": "make() { node components/bin/makeAll --no-subdirs $3 $4 --${2:-mjs} components/${2-:mjs}/$1; }; make",
     "make-components": "pnpm -s make-mjs-components",
     "compile": "pnpm -s compile-mjs",
     "build": "pnpm -s build-mjs",

testsuite/package.json

@@ -14,7 +14,7 @@
   },
   "dependencies": {
     "@jest/globals": "^29.7.0",
-    "@mathjax/mathjax-bbm-font-extension": "0.4.2-beta.8",
+    "@mathjax/mathjax-bbm-font-extension": "^4.0.0",
     "@types/jest": "^29.5.14",
     "jest": "^29.7.0",
     "ts-jest": "^29.3.4",