Merge branch 'develop' into issue3459

Author: dpvc

README.md

@@ -168,7 +168,35 @@ npm run --silent build-all
 ```
 
 in order to compile the JavaScript files from the TypeScript source,
-and build the component files from the JavaScript files.
+and build the component files from the JavaScript files.  Windows
+users will need to use the command
+
+``` bash
+npm config set script-shell "C:\\Program Files\\Git\\bin\\bash.exe"
+```
+
+first in order to tell `pnpm` to use the `bash` shell for scripts that
+it runs, as that is required by the build scripts that MathJax defines
+in the `package.json` file.  You may also need to use
+
+``` bash
+Set-ExecutionPolicy Unrestricted
+```
+
+to allow the scripts to run, if you receive errors about not being
+able to run the scripts.
+
+The build process requires MathJax to set up a symbolic link, and in
+Windows, that requires permission, so you may receive an error message
+to that effect.  If so, you may need to run
+
+``` bash
+pnpm link:src
+```
+
+from a shell with administrator privileges.  Once that is done, you
+can run the build process from a non-administrator shell.
+
 
 ## Code Contributions
 

components/bin/build

@@ -61,6 +61,9 @@ process.chdir(path.dirname(json));
 const mjPath = path.relative(process.cwd(), path.resolve(__dirname, '..', '..', target));
 const mjGlobal = path.join('..', mjPath, 'components', 'global.js');
 
+/**
+ * Determine the module type
+ */
 function getType() {
   const component = config.component || 'part';
   if (component.match(/\/(svg|chtml|common)\/fonts\//)) return RegExp.$1 + '-font';
@@ -69,6 +72,13 @@ function getType() {
   return component;
 }
 
+/**
+ * Convert Windows paths to unix paths
+ */
+const normalize = process.platform === 'win32'
+      ? (file) => file.replace(/\\/g, '/')
+      : (file) => file;
+
 /**
  * Extract the configuration values
  */
@@ -100,7 +110,7 @@ let PACKAGE = [];
  */
 function processList(base, dir, list, top = true) {
   for (const item of list) {
-    const file = path.join(dir, item);
+    const file = normalize(path.join(dir, item));
     if (!EXCLUDE.has(file)) {
       const stat = fs.statSync(path.resolve(base, file));
       if (stat.isDirectory()) {
@@ -183,9 +193,9 @@ function processParts(parts) {
 function processLines(file, objects) {
   if (objects.length === 0) return [];
   const base = path.dirname(file).replace(/^\.$/, '');
-  const dir = (PREFIX ? path.join(PREFIX, base) : base);
+  const dir = (PREFIX ? normalize(path.join(PREFIX, base)) : base);
   const dots = dir.replace(/[^\/]+/g, '..') || '.';
-  const relative = path.join(dots, '..', JS, dir, path.basename(file)).replace(/\.ts$/, '.js');
+  const relative = normalize(path.join(dots, '..', JS, dir, path.basename(file))).replace(/\.ts$/, '.js');
   const name = path.parse(file).name;
   const lines = (target === 'mjs' ? [] : [
     '"use strict";',
@@ -254,7 +264,7 @@ function getExtraDirectories() {
   let prefix = '';
   let indent = INDENT;
   let postfix = '';
-  for (let name of PREFIX.split(/\//)) {
+  for (let name of PREFIX.split('/')) {
     if (name.match(/[^a-zA-Z0-9]/)) {
       name = `"${name}"`;
     }
@@ -271,19 +281,19 @@ function getExtraDirectories() {
 function processGlobal() {
   console.info('  ' + COMPONENT + '.ts');
   const lines = (target === 'cjs' ? [
-    `const {combineWithMathJax} = require('${GLOBAL}')`,
-    `const {VERSION} = require('${VERSION}');`,
+    `const {combineWithMathJax} = require('${normalize(GLOBAL)}')`,
+    `const {VERSION} = require('${normalize(VERSION)}');`,
     '',
   ] : [
-    `import {combineWithMathJax} from '${GLOBAL}';`,
-    `import {VERSION} from '${VERSION}';`,
+    `import {combineWithMathJax} from '${normalize(GLOBAL)}';`,
+    `import {VERSION} from '${normalize(VERSION)}';`,
     '',
   ]);
   const [prefix, indent, postfix] = getExtraDirectories();
   const packages = [];
   PACKAGE = PACKAGE.sort(sortDir);
   while (PACKAGE.length) {
-    const dir = path.dirname(PACKAGE[0]).split(path.sep)[0];
+    const dir = path.dirname(PACKAGE[0]).split('/')[0];
     packages.push(processPackage(lines, indent, dir));
   }
   const name = (ID.match(/[^a-zA-Z0-9_]/) ? `"${ID}"` : ID);
@@ -337,7 +347,7 @@ function processPackage(lines, space, dir) {
     if (path.dirname(PACKAGE[0]) === dir) {
       const file = PACKAGE.shift();
       const name = path.basename(file);
-      let relativefile = path.join('..', JS, dir, name).replace(/\.ts$/, '.js')
+      const relativefile = normalize(path.join('..', JS, dir, name).replace(/\.ts$/, '.js'));
       const component = 'module' + (++importCount);
       lines.push(
         target === 'cjs' ?

components/bin/makeAll

@@ -124,6 +124,13 @@ function fileRegExp(name) {
   return new RegExp(name.replace(/([\\.{}[\]()?*^$])/g, '\\$1'), 'g');
 }
 
+/**
+ * Options for the execSync() function
+ */
+const execOptions = process.platform === 'win32'
+      ? { shell: `${process.env.ProgramFiles}\\Git\\bin\\bash.exe` }
+      : {};
+
 /**
  * Get the current working directory
  */
@@ -196,7 +203,7 @@ function processSubdirs(dir, action, config) {
  * Run a command on a given directory
  */
 function run(cmd, dir) {
-  return execSync(cmd + ` '${path.relative('.', dir).replace(/'/g, '\\\'')}'`);
+  return execSync(cmd + ` '${path.relative('.', dir).replace(/'/g, '\\\'')}'`, execOptions);
 }
 
 /**

components/bin/pack

@@ -25,7 +25,7 @@
 
 const fs = require('fs');
 const path = require('path');
-const {spawn, execSync} = require('child_process');
+const {spawn} = require('child_process');
 
 /**
  * The module type to use ('cjs' or 'mjs')
@@ -64,14 +64,7 @@ const rootRE = fileRegExp(path.dirname(jsPath));
 const nodeRE = /^.*\/node_modules/;
 const fontRE = new RegExp('^.*\\/(mathjax-[^\/-]*)(?:-font)?\/(build|[cm]js)');
 
-/**
- * Find the directory where npx runs (so we know where "npx webpack" will run)
- * (We use npx rather than pnpm here as it seems that pnpm doesn't
- * find the executable from a node_modules directory higher than the
- * first package.json, and extensions and fonts can have their own
- * package.json.)
- */
-const packDir = String(execSync('npx node -e "console.log(process.cwd())"'));
+const packDir = process.cwd();
 
 /**
  * @param {string} dir   The directory to pack
@@ -80,11 +73,20 @@ const packDir = String(execSync('npx node -e "console.log(process.cwd())"'));
 async function readJSON(dir) {
   return new Promise((ok, fail) => {
     const buffer = [];
-    const child = spawn('npx', [
-      'webpack', '--env', `dir=${path.relative(packDir, path.resolve(dir))}`,
-      '--env', `bundle=${bundle}`, '--json',
-      '-c', path.relative(packDir, path.join(compPath, 'webpack.config.' + target))
-    ]);
+    const child = spawn(
+      'npx',
+      [
+        'webpack',
+        '--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,
+      }
+    );
     child.stdout.on('data', (data) => buffer.push(String(data)));
     child.stderr.on('data', (data) => console.error(String(data)));
     child.on('close', (code) => {

components/mjs/a11y/speech/speech.js

@@ -2,20 +2,20 @@ import './lib/speech.js';
 
 import {combineDefaults} from '#js/components/global.js';
 import {Package} from '#js/components/package.js';
-import {hasWindow} from '#js/util/context.js';
+import {context} from '#js/util/context.js';
 import {SpeechHandler} from '#js/a11y/speech.js';
 
 if (MathJax.loader) {
   let path = Package.resolvePath('[sre]', false);
   let maps = Package.resolvePath('[mathmaps]', false);
-  if (hasWindow) {
+  if (context.window) {
     path = new URL(path, location).href;
     maps = new URL(maps, location).href;
   } else {
     const REQUIRE = typeof require !== 'undefined' ? require : MathJax.config.loader.require;
     if (REQUIRE?.resolve) {
-      path = REQUIRE.resolve(`${path}/require.mjs`).replace(/\/[^\/]*$/, '');
-      maps = REQUIRE.resolve(`${maps}/base.json`).replace(/\/[^\/]*$/, '');
+      path = context.path(REQUIRE.resolve(`${path}/require.mjs`)).replace(/\/[^\/]*$/, '');
+      maps = context.path(REQUIRE.resolve(`${maps}/base.json`)).replace(/\/[^\/]*$/, '');
     } else {
       path = maps = '';
     }

components/mjs/a11y/util.js

@@ -9,5 +9,6 @@ Loader.preLoaded(
   'a11y/sre',
   'a11y/semantic-enrich',
   'a11y/speech',
-  'a11y/explorer'
+  'a11y/explorer',
+  'input/mml',
 );

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/node-main/node-main-setup.mjs

@@ -4,4 +4,4 @@ global.require = createRequire(import.meta.url);
 const path = require("path");
 
 if (!global.MathJax) global.MathJax = {};
-global.MathJax.__dirname =  path.dirname(new URL(import.meta.url).pathname);
+global.MathJax.__dirname = path.dirname(new URL(import.meta.url).pathname);

components/mjs/node-main/node-main.js

@@ -23,14 +23,15 @@ import '../startup/init.js';
 import {Loader, CONFIG} from '#js/components/loader.js';
 import {Package} from '#js/components/package.js';
 import {combineDefaults, combineConfig} from '#js/components/global.js';
+import {context} from '#js/util/context.js';
 import '../core/core.js';
 import '../adaptors/liteDOM/liteDOM.js';
 import {source} from '../source.js';
 
 const MathJax = global.MathJax;
 
 const path = eval('require("path")');   // get path from node, not webpack
-const dir = MathJax.config.__dirname;   // set up by node-main.mjs or node-main.cjs
+const dir = context.path(MathJax.config.__dirname);   // set up by node-main.mjs or node-main.cjs
 
 /*
  * Set up the initial configuration

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)