Sre v4 Integration

components/src/a11y/complexity/build.json

@@ -3,7 +3,6 @@
   "targets": [
     "a11y/complexity.ts",
     "a11y/complexity",
-    "a11y/semantic-enrich.ts",
-    "a11y/sre.ts"
+    "a11y/semantic-enrich.ts"
   ]
 }

components/src/a11y/explorer/build.json

@@ -1,4 +1,4 @@
 {
   "component": "a11y/explorer",
-  "targets": ["a11y/explorer.ts", "a11y/sre.ts", "a11y/explorer"]
+  "targets": ["a11y/explorer.ts", "a11y/explorer"]
 }

components/src/a11y/explorer/webpack.config.js

@@ -6,6 +6,7 @@ module.exports = PACKAGE(
   [                                   // packages to link to
     'components/src/ui/menu/lib',
     'components/src/a11y/semantic-enrich/lib',
+    'components/src/a11y/sre/lib',
     'components/src/input/mml/lib',
     'components/src/core/lib'
   ],

components/src/a11y/semantic-enrich/build.json

@@ -1,5 +1,5 @@
 {
   "component": "a11y/semantic-enrich",
-  "targets": ["a11y/semantic-enrich.ts", "a11y/sre.ts"]
+  "targets": ["a11y/semantic-enrich.ts"]
 }
 

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

@@ -1,12 +1,12 @@
 import './lib/semantic-enrich.js';
 
 import {combineDefaults} from '../../../../js/components/global.js';
-import {sreReady} from '../../../../js/a11y/sre.js';
+import Sre from '../../../../js/a11y/sre.js';
 import {EnrichHandler} from '../../../../js/a11y/semantic-enrich.js';
 import {MathML} from '../../../../js/input/mathml.js';
 
 if (MathJax.loader) {
-  combineDefaults(MathJax.config.loader, 'a11y/semantic-enrich', {checkReady: () => sreReady()});
+  combineDefaults(MathJax.config.loader, 'a11y/semantic-enrich', {checkReady: () => Sre.sreReady()});
 }
 
 if (MathJax.startup) {

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

@@ -5,7 +5,8 @@ module.exports = PACKAGE(
   '../../../../js',                   // location of the MathJax js library
   [                                   // packages to link to
     'components/src/input/mml/lib',
-    'components/src/core/lib'
+    'components/src/core/lib',
+    'components/src/a11y/sre/lib'
   ],
   __dirname                           // our directory
 );

components/src/a11y/sre/build.json

@@ -0,0 +1,5 @@
+{
+  "component": "a11y/sre",
+  "targets": ["a11y/sre.ts"]
+}
+

components/src/a11y/sre/sre.js

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

components/src/a11y/sre/sre_config.js

@@ -0,0 +1,19 @@
+import {combineDefaults} from '../../../../js/components/global.js';
+import {Package} from '../../../../js/components/package.js';
+
+// This sets up the correct link to the mathmaps files.
+if (MathJax.startup) {
+
+  let path = Package.resolvePath('[sre]', false);
+
+  if (typeof window !== 'undefined') {
+    window.SREfeature = {json: path};
+  } else {
+    // In Node get the absolute path to the mathmaps directory.
+    try {
+      path = MathJax.config.loader.require.resolve(
+        path + '/base.json').replace(/\/base\.json$/, '');
+    } catch(_err) { }
+    global.SREfeature = {json: path};
+  }
+}

components/src/a11y/sre/webpack.config.js

@@ -0,0 +1,12 @@
+const PACKAGE = require('../../../webpack.common.js');
+
+module.exports = PACKAGE(
+  'a11y/sre',                         // the package to build
+  '../../../../js',                   // location of the MathJax js library
+  [                                   // packages to link to
+    'components/src/input/mml/lib',
+    'components/src/core/lib',
+    'components/src/startup/lib'
+  ],
+  __dirname                           // our directory
+);

components/src/dependencies.js

@@ -16,7 +16,7 @@
  */
 
 export const dependencies = {
-  'a11y/semantic-enrich': ['input/mml', '[sre]'],
+  'a11y/semantic-enrich': ['input/mml', 'a11y/sre'],
   'a11y/complexity': ['a11y/semantic-enrich'],
   'a11y/explorer': ['a11y/semantic-enrich', 'ui/menu'],
   '[mml]/mml3': ['input/mml'],
@@ -58,7 +58,7 @@ export const dependencies = {
 export const paths = {
   tex: '[mathjax]/input/tex/extensions',
   mml: '[mathjax]/input/mml/extensions',
-  sre: '[mathjax]/sre/' + (typeof window === 'undefined' ? 'sre-node' : 'sre_browser')
+  sre: '[mathjax]/sre/mathmaps'
 };
 
 const allPackages = Array.from(Object.keys(dependencies))

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

@@ -1,4 +1,4 @@
-import '../startup/lib/startup.js';
+import '../startup/init.js';
 import './preload.js';
 import '../core/core.js';
 import '../input/mml/mml.js';

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

@@ -1,4 +1,4 @@
-import '../startup/lib/startup.js';
+import '../startup/init.js';
 import './preload.js';
 import '../core/core.js';
 import '../input/mml/mml.js';

components/src/node-main/node-main.js

@@ -20,10 +20,9 @@ const path = eval("require('path')");  // use actual node version, not webpack's
 /*
  * Load the needed MathJax components
  */
-require('../startup/lib/startup.js');
+require('../startup/init.js');
 const {Loader, CONFIG} = require('../../../js/components/loader.js');
 const {combineDefaults, combineConfig} = require('../../../js/components/global.js');
-const {dependencies, paths, provides} = require('../dependencies.js');
 
 /*
  * Set up the initial configuration
@@ -32,9 +31,6 @@ combineDefaults(MathJax.config, 'loader', {
   require: eval('require'),      // use node's require() to load files
   failed: (err) => {throw err}   // pass on error message to init()'s catch function
 });
-combineDefaults(MathJax.config.loader, 'dependencies', dependencies);
-combineDefaults(MathJax.config.loader, 'paths', paths);
-combineDefaults(MathJax.config.loader, 'provides', provides);
 
 /*
  * Preload core and liteDOM adaptor (needed for node)

components/src/source.js

@@ -66,8 +66,7 @@ export const source = {
   'a11y/semantic-enrich': `${src}/a11y/semantic-enrich/semantic-enrich.js`,
   'a11y/complexity': `${src}/a11y/complexity/complexity.js`,
   'a11y/explorer': `${src}/a11y/explorer/explorer.js`,
-  '[sre]': (typeof window === 'undefined' ? `${src}/../../js/a11y/sre-node.js` :
-            `${src}/../../node_modules/speech-rule-engine/lib/sre_browser.js`),
+  'a11y/sre': `${src}/a11y/sre/sre.js`,
   'ui/lazy': `${src}/ui/lazy/lazy.js`,
   'ui/menu': `${src}/ui/menu/menu.js`,
   'ui/safe': `${src}/ui/safe/safe.js`,

components/src/sre/copy.json

@@ -2,7 +2,6 @@
   "to": "../../../es5/sre",
   "from": "[node]/speech-rule-engine/lib",
   "copy": [
-    "sre_browser.js",
     "mathmaps"
   ]
 }

components/src/startup/init.js

@@ -0,0 +1,9 @@
+import './lib/startup.js';
+
+import {combineDefaults} from '../../../js/components/global.js';
+import {dependencies, paths, provides, compatibility} from '../dependencies.js';
+
+combineDefaults(MathJax.config.loader, 'dependencies', dependencies);
+combineDefaults(MathJax.config.loader, 'paths', paths);
+combineDefaults(MathJax.config.loader, 'provides', provides);
+combineDefaults(MathJax.config.loader, 'source', compatibility);

components/src/startup/startup.js

@@ -1,13 +1,5 @@
-import './lib/startup.js';
-
+import './init.js';
 import {Loader, CONFIG} from '../../../js/components/loader.js';
-import {combineDefaults} from '../../../js/components/global.js';
-import {dependencies, paths, provides, compatibility} from '../dependencies.js';
-
-combineDefaults(MathJax.config.loader, 'dependencies', dependencies);
-combineDefaults(MathJax.config.loader, 'paths', paths);
-combineDefaults(MathJax.config.loader, 'provides', provides);
-combineDefaults(MathJax.config.loader, 'source', compatibility);
 
 Loader.preLoad('loader');
 

components/src/tex-chtml-full-speech/preload.js

@@ -0,0 +1,9 @@
+import {Loader} from '../../../js/components/loader.js';
+
+Loader.preLoad(
+  'loader', 'startup',
+  'core',
+  'input/tex-full',
+  'output/chtml', 'output/chtml/fonts/tex.js',
+  'ui/menu', 'a11y/assistive-mml', 'a11y/sre'
+);

components/src/tex-chtml-full-speech/tex-chtml-full-speech.js

@@ -0,0 +1,19 @@
+import '../startup/init.js';
+import './preload.js';
+import '../core/core.js';
+import '../input/tex-full/tex-full.js';
+import '../output/chtml/chtml.js';
+import '../output/chtml/fonts/tex/tex.js';
+import '../ui/menu/menu.js';
+import '../a11y/assistive-mml/assistive-mml.js';
+import '../a11y/sre/sre.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';
+
+MathMaps.set('base', base);
+MathMaps.set('en', en);
+MathMaps.set('nemeth', nemeth);
+
+import '../startup/startup.js';

components/src/tex-chtml-full-speech/webpack.config.js

@@ -0,0 +1,9 @@
+const PACKAGE = require('../../webpack.common.js');
+
+module.exports = PACKAGE(
+  'tex-chtml-full-speech',            // the package to build
+  '../../../js',                      // location of the MathJax js library
+  [                                   // packages to link to
+  ],
+  __dirname                           // our directory
+);

components/src/tex-chtml-full/tex-chtml-full.js

@@ -1,4 +1,4 @@
-import '../startup/lib/startup.js';
+import '../startup/init.js';
 import './preload.js';
 import '../core/core.js';
 import '../input/tex-full/tex-full.js';

components/src/tex-chtml/tex-chtml.js

@@ -1,4 +1,4 @@
-import '../startup/lib/startup.js';
+import '../startup/init.js';
 import './preload.js';
 import '../core/core.js';
 import '../input/tex/tex.js';

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

@@ -1,4 +1,4 @@
-import '../startup/lib/startup.js';
+import '../startup/init.js';
 import './preload.js';
 import '../core/core.js';
 import '../input/tex/tex.js';

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

@@ -1,4 +1,4 @@
-import '../startup/lib/startup.js';
+import '../startup/init.js';
 import './preload.js';
 import '../core/core.js';
 import '../input/tex/tex.js';

components/src/tex-svg-full/tex-svg-full.js

@@ -1,4 +1,4 @@
-import '../startup/lib/startup.js';
+import '../startup/init.js';
 import './preload.js';
 import '../core/core.js';
 import '../input/tex-full/tex-full.js';

components/src/tex-svg/tex-svg.js

@@ -1,4 +1,4 @@
-import '../startup/lib/startup.js';
+import '../startup/init.js';
 import './preload.js';
 import '../core/core.js';
 import '../input/tex/tex.js';