Make a utility for loading SRE, and use it in combined configurations

Author: dpvc

components/src/a11y/assistive-mml/assistive-mml.js

@@ -1,7 +1,17 @@
 import './lib/assistive-mml.js';
 
+import {combineDefaults} from '../../../../js/components/global.js';
 import {AssistiveMmlHandler} from '../../../../js/a11y/assistive-mml.js';
 
 if (MathJax.startup) {
+  if (MathJax.config.options && MathJax.config.options.enableAssistiveMml !== false) {
+    combineDefaults(MathJax.config, 'options', {
+      menuOptions: {
+        settings: {
+          assistiveMml: true
+        }
+      }
+    });
+  }
   MathJax.startup.extendHandler(handler => AssistiveMmlHandler(handler));
 }

components/src/a11y/explorer/explorer.js

@@ -4,5 +4,14 @@ import {combineDefaults} from '../../../../js/components/global.js';
 import {ExplorerHandler} from '../../../../js/a11y/explorer.js';
 
 if (MathJax.startup) {
+  if (MathJax.config.options && MathJax.config.options.enableExplorer !== false) {
+    combineDefaults(MathJax.config, 'options', {
+      menuOptions: {
+        settings: {
+          explorer: true
+        }
+      }
+    });
+  }
   MathJax.startup.extendHandler(handler => ExplorerHandler(handler));
 }

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

@@ -5,6 +5,8 @@ import Sre from '../../../../js/a11y/sre.js';
 import {EnrichHandler} from '../../../../js/a11y/semantic-enrich.js';
 import {MathML} from '../../../../js/input/mathml.js';
 
+export {Sre};
+
 if (MathJax.loader) {
   combineDefaults(MathJax.config.loader, 'a11y/semantic-enrich', {checkReady: () => Sre.sreReady()});
 }

components/src/a11y/sre/sre.js

@@ -2,6 +2,8 @@ import './lib/sre.js';
 import './sre_config.js';
 import Sre from '../../../../js/a11y/sre.js';
 
+export {Sre};
+
 if (MathJax.startup) {
   ((typeof window !== 'undefined') ? window : global).
     SREfeature.custom = (loc) => Sre.preloadLocales(loc);

components/src/a11y/util.js

@@ -0,0 +1,23 @@
+import {Loader} from '../../../js/components/loader.js';
+import '../input/mml/init.js';
+import {Sre} from '../a11y/sre/sre.js';
+import '../a11y/semantic-enrich/semantic-enrich.js';
+import '../a11y/explorer/explorer.js';
+import MathMaps from '../../../js/a11y/mathmaps.js';
+import base from 'speech-rule-engine/lib/mathmaps/base.json';
+import en from 'speech-rule-engine/lib/mathmaps/en.json';
+import nemeth from 'speech-rule-engine/lib/mathmaps/nemeth.json';
+
+Loader.preLoad(
+  'a11y/sre',
+  'a11y/semantic-enrich',
+  'a11y/explorer'
+);
+
+MathMaps.set('base', base);
+MathMaps.set('en', en);
+MathMaps.set('nemeth', nemeth);
+
+export function checkSre(startup) {
+  return () => startup(() => Sre.sreReady());
+}

components/src/input/mml/init.js

@@ -0,0 +1,15 @@
+import './lib/mml.js';
+
+import {MathML} from '../../../../js/input/mathml.js';
+export {MathML};
+
+if (MathJax.loader) {
+  //
+  // Install a path-filter to cause loading of an entity file to load all entities,
+  //   since the individual files don't have individual components.
+  //
+  MathJax.loader.pathFilters.add((data) => {
+    data.name = data.name.replace(/\/util\/entities\/.*?\.js/, '/input/mml/entities.js');
+    return true;
+  });
+}

components/src/input/mml/mml.js

@@ -1,18 +1,6 @@
-import './lib/mml.js';
-
-import {MathML} from '../../../../js/input/mathml.js';
+import {MathML} from './init.js';
 
 if (MathJax.startup) {
   MathJax.startup.registerConstructor('mml', MathML);
   MathJax.startup.useInput('mml');
 }
-if (MathJax.loader) {
-  //
-  // Install a path-filter to cause loading of an entity file to load all entities,
-  //   since the individual files don't have individual components.
-  //
-  MathJax.loader.pathFilters.add((data) => {
-    data.name = data.name.replace(/\/util\/entities\/.*?\.js/, '/input/mml/entities.js');
-    return true;
-  });
-}

components/src/mml-chtml-nofont/mml-chtml-nofont.js

@@ -4,15 +4,14 @@ import '../core/core.js';
 import '../input/mml/mml.js';
 import {loadFont} from '../output/chtml/chtml.js';
 import '../ui/menu/menu.js';
-import '../a11y/assistive-mml/assistive-mml.js';
+import {checkSre} from '../a11y/util.js';
 
 Loader.preLoad(
   'loader', 'startup',
   'core',
   'input/mml',
   'output/chtml',
-  'ui/menu',
-  'a11y/assistive-mml'
+  'ui/menu'
 );
 
-loadFont(startup);
+loadFont(checkSre(startup));

components/src/mml-chtml/mml-chtml.js

@@ -4,14 +4,14 @@ import '../core/core.js';
 import '../input/mml/mml.js';
 import {loadFont} from '../output/chtml/chtml.js';
 import '../ui/menu/menu.js';
-import '../a11y/assistive-mml/assistive-mml.js';
+import {checkSre} from '../a11y/util.js';
 
 Loader.preLoad(
   'loader', 'startup',
   'core',
   'input/mml',
   'output/chtml',
-  'ui/menu', 'a11y/assistive-mml'
+  'ui/menu'
 );
 
-loadFont(startup, true);
+loadFont(checkSre(startup), true);

components/src/mml-svg-nofont/mml-svg-nofont.js

@@ -4,15 +4,14 @@ import '../core/core.js';
 import '../input/mml/mml.js';
 import {loadFont} from '../output/svg/svg.js';
 import '../ui/menu/menu.js';
-import '../a11y/assistive-mml/assistive-mml.js';
+import {checkSre} from '../a11y/util.js';
 
 Loader.preLoad(
   'loader', 'startup',
   'core',
   'input/mml',
   'output/svg',
-  'ui/menu',
-  'a11y/assistive-mml'
+  'ui/menu'
 );
 
-loadFont(startup);
+loadFont(checkSre(startup));