Merge pull request #1437 from mathjax/develop

Merge v4.1.1 into master branch

Author: dpvc

README.md

@@ -99,7 +99,7 @@ await MathJax.init({
   loader: {load: ['input/tex', 'output/svg']}
 });
 const svg = await MathJax.tex2svgPromise('\\frac{1}{x^2-1}', {display: true});
-console.log(MathJax.startup.adaptor.outerHTML(svg));
+console.log(MathJax.startup.adaptor.serializeXML(svg));
 ```
 
 
@@ -119,7 +119,7 @@ MathJax.init({
   loader: {load: ['input/tex', 'output/svg']}
 }).then(() => {
   const svg = MathJax.tex2svg('\\frac{1}{x^2-1}', {display: true});
-  console.log(MathJax.startup.adaptor.outerHTML(svg));
+  console.log(MathJax.startup.adaptor.serializeXML(svg));
 }).catch((err) => console.log(err.message));
 ```
 

components/bin/copy

@@ -48,11 +48,10 @@ const bundle = (process.argv[3] || 'bundle');
 const json = path.resolve(process.argv[4] || '.', 'config.json');
 let configs = require(json).copy;
 if (!configs) process.exit();
-const wd = path.dirname(json);
-process.chdir(wd);
 if (!Array.isArray(configs)) {
   configs = [configs];
 }
+process.chdir(path.dirname(json));
 
 /**
  * Get the directory for node modules (either the parent of the MathJax directory,
@@ -61,6 +60,13 @@ if (!Array.isArray(configs)) {
 const parent = path.resolve(__dirname, '..', '..');
 const nodeDir = (dir => (fs.existsSync(dir) ? dir : path.resolve(parent, '..')))(path.join(parent, 'node_modules'));
 
+/**
+ * Other top-level directories
+ */
+const tsDir = path.resolve(parent, 'ts');
+const jsDir = path.resolve(parent, target);
+const bundleDir = path.resolve(parent, bundle);
+
 /**
  * Copy a file or directory tree
  *
@@ -84,14 +90,28 @@ function copyFile(from, to, name, space) {
   }
 }
 
+/**
+ * @param {string} name   The file name to process
+ * @returns {string}      The name with paths replaced by full directories
+ */
+function resolvePaths(name) {
+  return path.resolve(
+    process.cwd(),
+    name.replace(/^\[node\]/, nodeDir)
+      .replace(/^\[ts\]/, tsDir)
+      .replace(/^\[js\]/, jsDir)
+      .replace(/^\[bundle\]/, bundleDir)
+  );
+}
+
 /**
  * Handle the copying for a given configuration
  *
  * @param {{from: string, to: string, copy: string[]}} config  The configuration for the copy operation
  */
 function processConfig(config) {
-  const to = path.resolve(wd, config.to.replace(/\/bundle(\/|$)/, '/' + bundle + '$1'));
-  const from = path.resolve(wd, config.from.replace(/\[node\]/, nodeDir));
+  const to = resolvePaths(config.to);
+  const from = resolvePaths(config.from);
   for (const name of config.copy) {
     copyFile(from, to, name, '');
   }

components/bin/pack

@@ -74,17 +74,17 @@ async function readJSON(dir) {
   return new Promise((ok, fail) => {
     const buffer = [];
     const child = spawn(
-      'npx',
+      'node',
       [
-        'webpack',
+        require.resolve(path.join('webpack', 'bin', 'webpack.js')),
         '--env', `dir=${path.relative(packDir, path.resolve(dir))}`,
         '--env', `bundle=${bundle}`,
         '--json',
         '-c', path.relative(packDir, path.join(compPath, 'webpack.config.' + target))
       ],
       {
         cwd: packDir,
-        shell: true,
+        shell: process.platform === 'Win32',
       }
     );
     child.stdout.on('data', (data) => buffer.push(String(data)));

components/mjs/a11y/sre/worker/config.json

@@ -3,8 +3,8 @@
     "name": "sre/speech-worker"
   },
   "copy": {
-    "to": "../../../../../bundle/sre",
-    "from": "../../../../../ts/a11y/sre",
+    "to": "[bundle]/sre",
+    "from": "[ts]/a11y/sre",
     "copy": [
       "require.mjs",
       "require.d.mts"

components/mjs/input/mml/extensions/mml3/config.json

@@ -6,8 +6,8 @@
     "excludeSubdirs": true
   },
   "copy": {
-    "to": "../../../../../../bundle/input/mml/extensions",
-    "from": "../../../../../../ts/input/mathml/mml3",
+    "to": "[bundle]/input/mml/extensions",
+    "from": "[ts]/input/mathml/mml3",
     "copy": [
       "mml3.sef.json"
     ]

components/mjs/node-main/config.json

@@ -1,6 +1,6 @@
 {
   "copy": {
-    "to": "../../../bundle",
+    "to": "[bundle]",
     "from": ".",
     "copy": [
       "node-main.mjs",

components/mjs/output/util.js

@@ -1,12 +1,20 @@
 import {combineDefaults, combineWithMathJax} from '#js/components/global.js';
 import {Package} from '#js/components/package.js';
 import {hasWindow} from '#js/util/context.js';
+import {mathjax} from '#js/mathjax.js'
 
 export function configFont(font, jax, config, extension = '') {
-  const path = (config.fontPath || `[fonts]/%%FONT%%-font${extension}`);
+  const version =
+        (MathJax.config.loader?.paths?.fonts || '').substring(0, 24) === 'https://cdn.jsdelivr.net'
+          ? `@%%VERSION%%` : '';
+  const path = (config.fontPath || `[fonts]/%%FONT%%-font${extension}${version}`);
   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)
+    [name+extension]: (
+      name === font
+        ? path.replace(/%%FONT%%/g, font).replace(/%%VERSION%%/g, mathjax.version)
+        : font
+    )
   });
   return `[${name}${extension}]`;
 }

components/mjs/require/config.json

@@ -1,6 +1,6 @@
 {
   "copy": {
-    "to": "../../../bundle",
+    "to": "[bundle]",
     "from": "../..",
     "copy": [
       "require.mjs"

components/mjs/source.js

@@ -82,6 +82,7 @@ export const source = {
   '[mathmaps]': `${src}/../../bundle/sre/mathmaps`,
   'ui/lazy': `${src}/ui/lazy/lazy.js`,
   'ui/menu': `${src}/ui/menu/menu.js`,
+  'ui/no-dark-mode': `${src}/ui/nodarkmode/nodarkmode.js`,
   'ui/safe': `${src}/ui/safe/safe.js`,
   'mml-chtml': `${src}/mml-chtml/mml-chtml.js`,
   'mml-chtml-nofont': `${src}/mml-chtml-nofont/mml-chtml-nofont.js`,

components/mjs/sre/config.json

@@ -1,6 +1,6 @@
 {
   "copy": {
-    "to": "../../../bundle/sre",
+    "to": "[bundle]/sre",
     "from": "[node]/speech-rule-engine/lib",
     "copy": [
       "mathmaps"