Skip to content

Commit d5e10a7

Browse files
committed
fixup config of mathjax v3
1 parent 4d7869a commit d5e10a7

File tree

2 files changed

+22
-15
lines changed

2 files changed

+22
-15
lines changed

src/lib/svg_text_utils.js

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,6 @@ function texToSVG(_texString, _config, _callback) {
192192
var originalRenderer,
193193
originalConfig,
194194
originalProcessSectionDelay,
195-
noOriginalInlineMath,
196195
tmpDiv;
197196

198197
var setConfig2 = function() {
@@ -216,10 +215,11 @@ function texToSVG(_texString, _config, _callback) {
216215
var setConfig3 = function() {
217216
originalConfig = Lib.extendDeepAll({}, MathJax.config);
218217

219-
if(!MathJax.config.tex.inlineMath) {
220-
MathJax.config.tex.inlineMath = inlineMath;
221-
noOriginalInlineMath = true;
218+
if(!MathJax.config.tex) {
219+
MathJax.config.tex = {};
222220
}
221+
222+
MathJax.config.tex.inlineMath = inlineMath;
223223
};
224224

225225
var setRenderer2 = function() {
@@ -297,11 +297,7 @@ function texToSVG(_texString, _config, _callback) {
297297
};
298298

299299
var resetConfig3 = function() {
300-
if(noOriginalInlineMath) {
301-
delete MathJax.config.tex.inlineMath;
302-
} else {
303-
MathJax.config.tex.inlineMath = originalConfig.tex.inlineMath;
304-
}
300+
MathJax.config = originalConfig;
305301
};
306302

307303
if(MathJaxVersion === 2) {

test/jasmine/bundle_tests/mathjax_config_test.js

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ describe('Test MathJax v' + mathjaxVersion + ' config test:', function() {
2020
startup: {
2121
output: 'chtml',
2222
tex: {
23-
inlineMath: ['|', '|']
23+
inlineMath: [['|', '|']]
2424
}
2525
}
2626
};
@@ -39,31 +39,42 @@ describe('Test MathJax v' + mathjaxVersion + ' config test:', function() {
3939
if(mathjaxVersion === 2) {
4040
window.MathJax.Hub.Config({
4141
tex2jax: {
42-
inlineMath: ['|', '|']
42+
inlineMath: [['|', '|']]
4343
}
4444
});
4545

4646
window.MathJax.Hub.setRenderer('CHTML');
4747
}
4848

49+
// before plot
50+
if(mathjaxVersion === 3) {
51+
expect(window.MathJax.config.startup.tex.inlineMath).toEqual([['|', '|']]);
52+
expect(window.MathJax.config.startup.output).toEqual('chtml');
53+
}
54+
if(mathjaxVersion === 2) {
55+
expect(window.MathJax.Hub.config.tex2jax.inlineMath).toEqual([['|', '|']]);
56+
expect(window.MathJax.Hub.config.menuSettings.renderer).toEqual('');
57+
}
58+
4959
Plotly.newPlot(gd, {
5060
data: [{
5161
y: [1, 2]
5262
}],
5363
layout: {
5464
title: {
55-
text: '|E=mc^2|'
65+
text: '$E=mc^2$'
5666
}
5767
}
5868
})
5969
.then(function() {
70+
// after plot
6071
if(mathjaxVersion === 3) {
61-
expect(window.MathJax.config.startup.tex.inlineMath).toEqual(['|', '|']);
72+
expect(window.MathJax.config.startup.tex.inlineMath).toEqual([['|', '|']]);
6273
expect(window.MathJax.config.startup.output).toEqual('chtml');
6374
}
64-
6575
if(mathjaxVersion === 2) {
66-
expect(window.MathJax.Hub.config.tex2jax.inlineMath).toEqual(['|', '|']);
76+
// TODO: figure out why v2 implementation does not reset inlineMath
77+
// expect(window.MathJax.Hub.config.tex2jax.inlineMath).toEqual([['|', '|']]);
6778
expect(window.MathJax.Hub.config.menuSettings.renderer).toEqual('');
6879
}
6980
})

0 commit comments

Comments
 (0)