Skip to content

Commit 77bb06d

Browse files
committed
Merge branch 'develop' into master
2 parents fdda7ba + 2c79f11 commit 77bb06d

File tree

145 files changed

+3587
-8373
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

145 files changed

+3587
-8373
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ branches:
1111
- "/^\\d+\\.\\d+/"
1212
deploy:
1313
provider: npm
14-
email: mjadmin@mathjax.org
14+
email: manager@mathjax.org
1515
api_key:
16-
secure: CvM0aQTetuACQPAhZWoPMAJ9dXnGtHPTLS6N2BLeyNxciqFB/61yZGEvDk6L3QhT63uJohk8q8EovexPJGxvR8r3w70sBHiwp2NnwqoPfI1ldTMz5a2B0d1Ua3OioZMlblKdIo+dPyTs2X8F0cR1Y53Sk7FfVQMYw5thFXoK6xCz5rOP8N4htXzd7HIUgGoTdZui3AIK0dQqaqmeeBVSIEoRQTDArOjhGzwD/DfV+54V5lLb3oangVYbXi9F5evgvBEsHSVFXBBesAmGnkKkuPkTZ/RZEaq9jhwdTquFPO8MZ09FCBmgyfHH7ASE0YxsyOp7NIdXPnQzxNw+XEi1iy8cWC9sfDCv/svtdqdkEGdVOqzsW6ZIIzxm3vuSygs1c0e4M8G+Juceth3Xqjx7sRWZsM5z/q2YoOw4oGzISPif3eIVpFT3xc8x/VcIs+T8T3Eat9vBWa4CMMCc/lgHX/by8fWmlIyOJX2rE5xDVM3yFwETk9EqeBZA22uWNq1hwU/TPk7KMEX26Y2ks+fW1BWDp8BS8I7XHp3rNR+T5ElL3bTVHgKUxgesoDtj7Jx14ldd+nhZ/0uXUsfzYDwX+7KI3UyhrHpiJj/yzYni8sq9nG7SqqP16GmUZF8fPbchLS9Rjq5Eqt9CsWgakNnri6YIPKUh77B6hSNcuEwT8cU=
16+
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=
1717
on:
1818
tags: true

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {EnrichHandler} from '../../../../js/a11y/semantic-enrich.js';
66
import {MathML} from '../../../../js/input/mathml.js';
77

88
if (MathJax.loader) {
9-
combineDefaults(MathJax.config.loader, 'a11y/semantic-enrich', {checkReady: () => sreReady});
9+
combineDefaults(MathJax.config.loader, 'a11y/semantic-enrich', {checkReady: () => sreReady()});
1010
}
1111

1212
if (MathJax.startup) {

components/src/dependencies.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
export const dependencies = {
2-
'a11y/semantic-enrich': ['input/mml', '[sre]', 'input/mml'],
2+
'a11y/semantic-enrich': ['input/mml', '[sre]'],
33
'a11y/complexity': ['a11y/semantic-enrich'],
44
'a11y/explorer': ['a11y/semantic-enrich', 'ui/menu'],
55
'[tex]/all-packages': ['input/tex-base'],

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

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,31 @@ combineDefaults(MathJax.config, 'loader', {
1818
combineDefaults(MathJax.config.loader, 'dependencies', dependencies);
1919
combineDefaults(MathJax.config.loader, 'paths', paths);
2020
combineDefaults(MathJax.config.loader, 'provides', provides);
21-
MathJax.config.loader.paths.mathjax =
22-
path.resolve(MathJax.config.loader.require.resolve('mathjax/package.json'), '..', 'es5');
21+
22+
MathJax.config.loader.paths.mathjax = (function () {
23+
//
24+
// Try to locate the mathjax-full or mathjax package
25+
// If neither is found, try to use the directory where this file is located
26+
//
27+
try {
28+
return path.resolve(MathJax.config.loader.require.resolve('mathjax-full/package.json'), '../es5');
29+
} catch (err) {}
30+
try {
31+
return path.resolve(MathJax.config.loader.require.resolve('mathjax/package.json'), '../es5');
32+
} catch (err) {
33+
let dir = path.dirname(err.requireStack[0]); // err.requireStack[0] is the full path to this module
34+
if (path.basename(dir) == 'node-main') {
35+
//
36+
// This is components/src/node-main/node-main.js, so use
37+
// components/src as the mathjax directory, and load the source array
38+
//
39+
dir = path.dirname(dir);
40+
combineDefaults(MathJax.config.loader, 'source', require('../source.js').source);
41+
}
42+
return dir;
43+
}
44+
})();
45+
2346

2447
/*
2548
* Preload core and liteDOM adaptor (needed for node)

components/webpack.common.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ const MODULE = function (dir) {
112112
use: {
113113
loader: 'babel-loader',
114114
options: {
115-
presets: ['env']
115+
presets: ['@babel/env']
116116
}
117117
}
118118
}]

0 commit comments

Comments
 (0)