Merge branch 'develop' into master

Author: dpvc

.travis.yml

@@ -11,8 +11,8 @@ branches:
   - "/^\\d+\\.\\d+/"
 deploy:
   provider: npm
-  email: mjadmin@mathjax.org
+  email: manager@mathjax.org
   api_key:
-    secure: CvM0aQTetuACQPAhZWoPMAJ9dXnGtHPTLS6N2BLeyNxciqFB/61yZGEvDk6L3QhT63uJohk8q8EovexPJGxvR8r3w70sBHiwp2NnwqoPfI1ldTMz5a2B0d1Ua3OioZMlblKdIo+dPyTs2X8F0cR1Y53Sk7FfVQMYw5thFXoK6xCz5rOP8N4htXzd7HIUgGoTdZui3AIK0dQqaqmeeBVSIEoRQTDArOjhGzwD/DfV+54V5lLb3oangVYbXi9F5evgvBEsHSVFXBBesAmGnkKkuPkTZ/RZEaq9jhwdTquFPO8MZ09FCBmgyfHH7ASE0YxsyOp7NIdXPnQzxNw+XEi1iy8cWC9sfDCv/svtdqdkEGdVOqzsW6ZIIzxm3vuSygs1c0e4M8G+Juceth3Xqjx7sRWZsM5z/q2YoOw4oGzISPif3eIVpFT3xc8x/VcIs+T8T3Eat9vBWa4CMMCc/lgHX/by8fWmlIyOJX2rE5xDVM3yFwETk9EqeBZA22uWNq1hwU/TPk7KMEX26Y2ks+fW1BWDp8BS8I7XHp3rNR+T5ElL3bTVHgKUxgesoDtj7Jx14ldd+nhZ/0uXUsfzYDwX+7KI3UyhrHpiJj/yzYni8sq9nG7SqqP16GmUZF8fPbchLS9Rjq5Eqt9CsWgakNnri6YIPKUh77B6hSNcuEwT8cU=
+    secure: iiJYaydsd6nypSMgjvQiTYIy+YF/oil5fqfVLmMkAQtykAqE5oS/HcJ6QxQa8DKHQCmNNhmUqMnD7H5jVhXGcbhEcx7dNxr7pXkrY2Vkyj8voYFIfZ05rwfaojQQPlPdrkwiLmAcUnz1v9gP20M6uVJrhVpBSe4bfHxSHbSUBjlRu4md8fXyA9cLJ3hu/QHV2ahjRDHL+axklCH8YFMW2bN7IRYALUaFeN6gZFWQvq6A4gT1zaFo0yTsej5z+PmyvDHYGzI1KfUioNa81KMWvSMIkRooJes2JrDFdo4HYXgYhZ/wb+7FLOJGeLLQejfQiVw+MS+7R+C6Ss/TcxddeBGg+x9+pZY4AvnVjuWfYW7WSh+iMZ1ujFE3xhqjVUI6WpowSfLK2lguY/8AZ1hKuWxnWw/UwCGcy6qOG0HMyE05mkl+VvPMITckkkeM/an4k7PeR+DY9L25Imp0jmpCyfk72KXMAEgVLAjnsy+l0EnZWK7oeYzDwEaw8HdOCmKKraRYFSetbqC+25g1iKc8ylTs1IxN7HXo0e0dTGSxwtU14L26GMHrC2pVsDdeR7+b5ll0C/6kevK794eQpzSEM50Addb1+fUJ3bn1y22H7OaglnJYxfuP44AYTENOn3fDJrIgcVG/yp273MImSYZiXL+xQBK8ZPEG5z36sH5/iAI=
   on:
     tags: true

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

@@ -6,7 +6,7 @@ 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: () => sreReady()});
 }
 
 if (MathJax.startup) {

components/src/dependencies.js

@@ -1,5 +1,5 @@
 export const dependencies = {
-    'a11y/semantic-enrich': ['input/mml', '[sre]', 'input/mml'],
+    'a11y/semantic-enrich': ['input/mml', '[sre]'],
     'a11y/complexity': ['a11y/semantic-enrich'],
     'a11y/explorer': ['a11y/semantic-enrich', 'ui/menu'],
     '[tex]/all-packages': ['input/tex-base'],

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

@@ -18,8 +18,31 @@ combineDefaults(MathJax.config, 'loader', {
 combineDefaults(MathJax.config.loader, 'dependencies', dependencies);
 combineDefaults(MathJax.config.loader, 'paths', paths);
 combineDefaults(MathJax.config.loader, 'provides', provides);
-MathJax.config.loader.paths.mathjax =
-  path.resolve(MathJax.config.loader.require.resolve('mathjax/package.json'), '..', 'es5');
+
+MathJax.config.loader.paths.mathjax = (function () {
+  //
+  // Try to locate the mathjax-full or mathjax package
+  // If neither is found, try to use the directory where this file is located
+  //
+  try {
+    return path.resolve(MathJax.config.loader.require.resolve('mathjax-full/package.json'), '../es5');
+  } catch (err) {}
+  try {
+     return path.resolve(MathJax.config.loader.require.resolve('mathjax/package.json'), '../es5');
+  } catch (err) {
+    let dir = path.dirname(err.requireStack[0]); // err.requireStack[0] is the full path to this module
+    if (path.basename(dir) == 'node-main') {
+      //
+      // This is components/src/node-main/node-main.js, so use
+      // components/src as the mathjax directory, and load the source array
+      //
+      dir = path.dirname(dir);
+      combineDefaults(MathJax.config.loader, 'source', require('../source.js').source);
+    }
+    return dir;
+  }
+})();
+
 
 /*
  * Preload core and liteDOM adaptor (needed for node)

components/webpack.common.js

@@ -112,7 +112,7 @@ const MODULE = function (dir) {
             use: {
                 loader: 'babel-loader',
                 options: {
-                    presets: ['env']
+                    presets: ['@babel/env']
                 }
             }
         }]