Skip to content

Commit 9f89b3e

Browse files
dpvcdpvc
authored
Merge pull request #1076 from mathjax/use-textmacros
Fix use of textmacros in textcomp/bboldx, and update source.js and dependencies.js
2 parents 5ed20c7 + 0922e60 commit 9f89b3e

File tree

6 files changed

+39
-16
lines changed

6 files changed

+39
-16
lines changed

‎components/mjs/dependencies.js‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,26 +20,29 @@ export const dependencies = {
2020
'a11y/complexity': ['a11y/semantic-enrich'],
2121
'a11y/explorer': ['a11y/semantic-enrich', 'ui/menu'],
2222
'[mml]/mml3': ['input/mml'],
23-
'[tex]/all-packages': ['input/tex-base'],
2423
'[tex]/action': ['input/tex-base', '[tex]/newcommand'],
25-
'[tex]/autoload': ['input/tex-base', '[tex]/require'],
24+
'[tex]/all-packages': ['input/tex-base'],
2625
'[tex]/ams': ['input/tex-base'],
2726
'[tex]/amscd': ['input/tex-base'],
27+
'[tex]/autoload': ['input/tex-base', '[tex]/require'],
2828
'[tex]/bbm': ['input/tex-base'],
2929
'[tex]/bboldx': ['input/tex-base', '[tex]/textmacros'],
3030
'[tex]/bbox': ['input/tex-base', '[tex]/ams', '[tex]/newcommand'],
3131
'[tex]/boldsymbol': ['input/tex-base'],
3232
'[tex]/braket': ['input/tex-base'],
3333
'[tex]/bussproofs': ['input/tex-base'],
3434
'[tex]/cancel': ['input/tex-base', '[tex]/enclose'],
35+
'[tex]/cases': ['[tex]/empheq'],
3536
'[tex]/centernot': ['input/tex-base'],
3637
'[tex]/color': ['input/tex-base'],
37-
'[tex]/colorv2': ['input/tex-base'],
3838
'[tex]/colortbl': ['input/tex-base', '[tex]/color'],
39+
'[tex]/colorv2': ['input/tex-base'],
3940
'[tex]/configmacros': ['input/tex-base', '[tex]/newcommand'],
4041
'[tex]/dsfont': ['input/tex-base'],
42+
'[tex]/empheq': ['input/tex-base', '[tex]/ams'],
4143
'[tex]/enclose': ['input/tex-base'],
4244
'[tex]/extpfeil': ['input/tex-base', '[tex]/newcommand', '[tex]/ams'],
45+
'[tex]/gensymb': ['input/tex-base'],
4346
'[tex]/html': ['input/tex-base'],
4447
'[tex]/mathtools': ['input/tex-base', '[tex]/newcommand', '[tex]/ams'],
4548
'[tex]/mhchem': ['input/tex-base', '[tex]/ams'],
@@ -54,9 +57,9 @@ export const dependencies = {
5457
'[tex]/textcomp': ['input/tex-base', '[tex]/textmacros'],
5558
'[tex]/textmacros': ['input/tex-base'],
5659
'[tex]/unicode': ['input/tex-base'],
57-
'[tex]/verb': ['input/tex-base'],
58-
'[tex]/cases': ['[tex]/empheq'],
59-
'[tex]/empheq': ['input/tex-base', '[tex]/ams']
60+
'[tex]/units': ['input/tex-base'],
61+
'[tex]/upgreek': ['input/tex-base'],
62+
'[tex]/verb': ['input/tex-base']
6063
};
6164

6265
export const paths = {

‎components/mjs/input/tex/extension.js‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ export function fontExtension(id, name, pkg = `@mathjax/${name}`) {
77
const path = name.replace(/-font-extension$/, '-extension');
88
const extension = name.replace(/-font-extension$/, '');
99
combineDefaults(MathJax.config.loader, 'paths', {[path]: FONTPATH});
10+
combineDefaults(MathJax.config.loader, 'dependencies', {
11+
[`[${path}]/chtml`]: ['output/chtml'],
12+
[`[${path}]/svg`]: ['output/svg']
13+
});
1014
MathJax.config.loader[id] = {
1115
checkReady() {
1216
return MathJax.loader.load(

‎components/mjs/input/tex/extensions/texhtml/config.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"build": {
3+
"id": "[tex]/texhtml",
34
"component": "input/tex/extensions/texhtml",
45
"targets": ["input/tex/texhtml"]
56
},

‎components/mjs/source.js‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,23 +25,27 @@ export const source = {
2525
'input/tex-full': `${src}/input/tex-full/tex-full.js`,
2626
'[tex]/action': `${src}/input/tex/extensions/action/action.js`,
2727
'[tex]/all-packages': `${src}/input/tex/extensions/all-packages/all-packages.js`,
28-
'[tex]/autoload': `${src}/input/tex/extensions/autoload/autoload.js`,
2928
'[tex]/ams': `${src}/input/tex/extensions/ams/ams.js`,
3029
'[tex]/amscd': `${src}/input/tex/extensions/amscd/amscd.js`,
30+
'[tex]/autoload': `${src}/input/tex/extensions/autoload/autoload.js`,
3131
'[tex]/bbm': `${src}/input/tex/extensions/bbm/bbm.js`,
3232
'[tex]/bboldx': `${src}/input/tex/extensions/bboldx/bboldx.js`,
3333
'[tex]/bbox': `${src}/input/tex/extensions/bbox/bbox.js`,
3434
'[tex]/boldsymbol': `${src}/input/tex/extensions/boldsymbol/boldsymbol.js`,
3535
'[tex]/braket': `${src}/input/tex/extensions/braket/braket.js`,
3636
'[tex]/bussproofs': `${src}/input/tex/extensions/bussproofs/bussproofs.js`,
3737
'[tex]/cancel': `${src}/input/tex/extensions/cancel/cancel.js`,
38+
'[tex]/cases': `${src}/input/tex/extensions/cases/cases.js`,
3839
'[tex]/centernot': `${src}/input/tex/extensions/centernot/centernot.js`,
3940
'[tex]/color': `${src}/input/tex/extensions/color/color.js`,
41+
'[tex]/colortbl': `${src}/input/tex/extensions/colortbl/colortbl.js`,
4042
'[tex]/colorv2': `${src}/input/tex/extensions/colorv2/colorv2.js`,
4143
'[tex]/configmacros': `${src}/input/tex/extensions/configmacros/configmacros.js`,
4244
'[tex]/dsfont': `${src}/input/tex/extensions/dsfont/dsfont.js`,
45+
'[tex]/empheq': `${src}/input/tex/extensions/empheq/empheq.js`,
4346
'[tex]/enclose': `${src}/input/tex/extensions/enclose/enclose.js`,
4447
'[tex]/extpfeil': `${src}/input/tex/extensions/extpfeil/extpfeil.js`,
48+
'[tex]/gensymb': `${src}/input/tex/extensions/gensymb/gensymb.js`,
4549
'[tex]/html': `${src}/input/tex/extensions/html/html.js`,
4650
'[tex]/mathtools': `${src}/input/tex/extensions/mathtools/mathtools.js`,
4751
'[tex]/mhchem': `${src}/input/tex/extensions/mhchem/mhchem.js`,
@@ -52,12 +56,13 @@ export const source = {
5256
'[tex]/require': `${src}/input/tex/extensions/require/require.js`,
5357
'[tex]/setoptions': `${src}/input/tex/extensions/setoptions/setoptions.js`,
5458
'[tex]/tagformat': `${src}/input/tex/extensions/tagformat/tagformat.js`,
55-
'[tex]/textmacros': `${src}/input/tex/extensions/textmacros/textmacros.js`,
5659
'[tex]/texhtml': `${src}/input/tex/extensions/texhtml/texhtml.js`,
60+
'[tex]/textcomp': `${src}/input/tex/extensions/textcomp/textcomp.js`,
61+
'[tex]/textmacros': `${src}/input/tex/extensions/textmacros/textmacros.js`,
5762
'[tex]/unicode': `${src}/input/tex/extensions/unicode/unicode.js`,
63+
'[tex]/units': `${src}/input/tex/extensions/units/units.js`,
64+
'[tex]/upgreek': `${src}/input/tex/extensions/upgreek/upgreek.js`,
5865
'[tex]/verb': `${src}/input/tex/extensions/verb/verb.js`,
59-
'[tex]/cases': `${src}/input/tex/extensions/cases/cases.js`,
60-
'[tex]/empheq': `${src}/input/tex/extensions/empheq/empheq.js`,
6166
'input/mml': `${src}/input/mml/mml.js`,
6267
'input/mml/entities': `${src}/input/mml/entities/entities.js`,
6368
'[mml]/mml3': `${src}/input/mml/extensions/mml3/mml3.js`,
@@ -73,11 +78,17 @@ export const source = {
7378
'ui/menu': `${src}/ui/menu/menu.js`,
7479
'ui/safe': `${src}/ui/safe/safe.js`,
7580
'mml-chtml': `${src}/mml-chtml/mml-chtml.js`,
81+
'mml-chtml-nofont': `${src}/mml-chtml-nofont/mml-chtml-nofont.js`,
7682
'mml-svg': `${src}/mml-svg/mml-svg.js`,
83+
'mml-svg-nofont': `${src}/mml-svg-nofont/mml-svg-nofont.js`,
7784
'tex-chtml': `${src}/tex-chtml/tex-chtml.js`,
85+
'tex-chtml-nofont': `${src}/tex-chtml-nofont/tex-chtml-nofont.js`,
7886
'tex-svg': `${src}/tex-svg/tex-svg.js`,
87+
'tex-svg-nofont': `${src}/tex-svg-nofont/tex-svg-nofont.js`,
7988
'tex-mml-chtml': `${src}/tex-mml-chtml/tex-mml-chtml.js`,
89+
'tex-mml-chtml-nofont': `${src}/tex-mml-chtml-nofont/tex-mml-chtml-nofont.js`,
8090
'tex-mml-svg': `${src}/tex-mml-svg/tex-mml-svg.js`,
91+
'tex-mml-svg-nofont': `${src}/tex-mml-svg-nofont/tex-mml-svg-nofont.js`,
8192
'loader': `${src}/loader/loader.js`,
8293
'startup': `${src}/startup/startup.js`
8394
};

‎ts/input/tex/bboldx/BboldxConfiguration.ts‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,11 @@ export const BboldxConfiguration = Configuration.create('bboldx', {
5555
}
5656
},
5757
config(_config, jax) {
58-
const {textConf, parseOptions} = jax.parseOptions.packageData.get('textmacros');
59-
parseOptions.options.textmacros.packages.push('text-bboldx');
60-
textConf.add('text-bboldx', jax, {});
58+
const textmacros = jax.parseOptions.packageData.get('textmacros')
59+
if (textmacros) {
60+
textmacros.parseOptions.options.textmacros.packages.push('text-bboldx');
61+
textmacros.textConf.add('text-bboldx', jax, {});
62+
}
6163
},
6264
priority: 3 // load before base, since we override \mathbb
6365
});

‎ts/input/tex/textcomp/TextcompConfiguration.ts‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,11 @@ export const TextcompConfiguration = Configuration.create(
3434
'textcomp', {
3535
handler: {macro: ['textcomp-macros']},
3636
config(_config, jax) {
37-
const {textConf, parseOptions} = jax.parseOptions.packageData.get('textmacros');
38-
parseOptions.options.textmacros.packages.push('text-textcomp');
39-
textConf.add('text-textcomp', jax, {});
37+
const textmacros = jax.parseOptions.packageData.get('textmacros');
38+
if (textmacros) {
39+
textmacros.parseOptions.options.textmacros.packages.push('text-textcomp');
40+
textmacros.textConf.add('text-textcomp', jax, {});
41+
}
4042
}
4143
}
4244
);

0 commit comments

Comments
 (0)