Merge branch 'develop' into context

Author: dpvc

components/bin/pack

@@ -126,7 +126,7 @@ async function webpackLib(dir) {
     }
     const list = [];
     for (const module of modules) {
-      if (module.moduleType.match(/javascript/)) {
+      if (module.moduleType.match(/javascript|json/)) {
         let name = (module.nameForCondition || module.name)
             .replace(compRE, '[components]')
             .replace(nodeRE, '[node]')

components/bin/package.json

@@ -7,6 +7,6 @@
     "#menu/*": "mj-context-menu/cjs/*",
     "#sre/*": "speech-rule-engine/cjs/*",
     "#mhchem/*": "mhchemparser/dist/*",
-    "#default-font/*": "mathjax-modern-font/cjs/*"
+    "#default-font/*": "mathjax-newcm-font/cjs/*"
   }
 }

components/mjs/a11y/semantic-enrich/semantic-enrich.js

@@ -1,7 +1,7 @@
 import './lib/semantic-enrich.js';
 
 import {combineDefaults} from '#js/components/global.js';
-import {Sre} from '#js/a11y/sre.js';
+import * as Sre from '#js/a11y/sre.js';
 import {EnrichHandler} from '#js/a11y/semantic-enrich.js';
 import {MathML} from '#js/input/mathml.js';
 

components/mjs/a11y/sre/sre.js

@@ -1,7 +1,7 @@
 import './lib/sre.js';
 import './sre_config.js';
-import {Sre} from '#js/a11y/sre.js';
 import {context} from '#js/util/context.js';
+import * as Sre from '#js/a11y/sre.js';
 
 export {Sre};
 

components/mjs/a11y/util-lab.js

@@ -5,9 +5,9 @@ import './semantic-enrich/semantic-enrich.js';
 import './explorer/explorer.js';
 import {MathMaps} from '#js/a11y/mathmaps.js';
 
-const base = require('speech-rule-engine/lib/mathmaps/base.json');
-const en = require('speech-rule-engine/lib/mathmaps/en.json');
-const nemeth = require('speech-rule-engine/lib/mathmaps/nemeth.json');
+import base from 'speech-rule-engine/lib/mathmaps/base.json' with {type: 'json'};
+import en from 'speech-rule-engine/lib/mathmaps/en.json' with {type: 'json'};
+import nemeth from 'speech-rule-engine/lib/mathmaps/nemeth.json' with {type: 'json'};
 
 Loader.preLoad(
   'a11y/sre',

components/mjs/a11y/util-pack.js

@@ -34,11 +34,11 @@ const dir = global.MathJax.config.__dirname;   // set up by node-main.mjs or nod
  * Set up the initial configuration
  */
 combineDefaults(MathJax.config, 'loader', {
-  paths: {'mathjax-modern': 'mathjax-modern-font'},
+  paths: {'mathjax-newcm': 'mathjax-newcm-font'},
   require: eval("(file) => import(file)"),   // use dynamic imports
   failed: (err) => {throw err}               // pass on error message to init()'s catch function
 });
-combineDefaults(MathJax.config, 'output', {font: 'mathjax-modern'});
+combineDefaults(MathJax.config, 'output', {font: 'mathjax-newcm'});
 
 /*
  * Mark the preloaded components