Merge branch 'fix/windows-path' into fix/windows-tests

Author: zorkow

.github/workflows/publish.yml

@@ -5,7 +5,7 @@ on:
     types: [published]
 
 jobs:
-  setup:
+  publish:
     runs-on: ubuntu-latest
     name: Build and publish MathJax
     permissions:

.github/workflows/test.yml

@@ -9,7 +9,7 @@ on:
       - develop
 
 jobs:
-  setup:
+  testing:
     runs-on: ubuntu-latest
     name: Compile and test MathJax
     steps:
@@ -22,6 +22,12 @@ jobs:
           version: 10
           run_install: false
 
+      - name: Install Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 24
+          cache: 'pnpm'
+
       - name: Install packages
         run: |
           pnpm -r i

.gitignore

@@ -8,4 +8,5 @@ coverage
 /bundle
 /bundle-cjs
 /testsuite/js
+/testsuite/lib/localstorage
 /lab/sre.js

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

@@ -193,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";',
@@ -264,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}"`;
     }
@@ -293,7 +293,7 @@ function processGlobal() {
   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);

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/core/config.json

@@ -4,6 +4,8 @@
     "targets": [
       "mathjax.ts",
       "core", "util", "handlers",
+      "ui/dialog/DraggableDialog.ts",
+      "ui/dialog/InfoDialog.ts",
       "adaptors/HTMLAdaptor.ts",
       "adaptors/browserAdaptor.ts",
       "components/global.ts"

components/mjs/input/tex/extension.js

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

components/mjs/node-main/config.json

@@ -5,7 +5,7 @@
     "copy": [
       "node-main.mjs",
       "node-main.cjs",
-      "node-main-setup.mjs"
+      "node-main-setup.cjs"
     ]
   },
   "webpack": {

components/mjs/node-main/node-main-setup.cjs

@@ -0,0 +1,5 @@
+global.require = require;
+const path = require("path");
+
+if (!global.MathJax) global.MathJax = {};
+global.MathJax.__dirname = __dirname;