Skip to content

Commit c3d0b86

Browse files
dpvcdpvc
committed
Updates per Volker's request.
2 parents ffeb86b + 1a6e668 commit c3d0b86

File tree

3 files changed

+36
-36
lines changed

3 files changed

+36
-36
lines changed

‎mathjax3-ts/output/chtml/Wrappers/msubsup.ts‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -108,14 +108,14 @@ export class CHTMLmsubsup extends CHTMLscriptbase {
108108
/*
109109
* @return{CHTMLWrapper} The wrapper for the subscript
110110
*/
111-
public get sub() {
111+
public get subChild() {
112112
return this.childNodes[(this.node as MmlMsubsup).sub];
113113
}
114114

115115
/*
116116
* @return{CHTMLWrapper} The wrapper for the superscript
117117
*/
118-
public get sup() {
118+
public get supChild() {
119119
return this.childNodes[(this.node as MmlMsubsup).sup];
120120
}
121121

@@ -124,22 +124,22 @@ export class CHTMLmsubsup extends CHTMLscriptbase {
124124
*/
125125
public toCHTML(parent: HTMLElement) {
126126
this.chtml = this.standardCHTMLnode(parent);
127-
const [u, v, q] = this.getUVQ(this.base.getBBox(), this.sub.getBBox(), this.sup.getBBox());
127+
const [u, v, q] = this.getUVQ(this.baseChild.getBBox(), this.subChild.getBBox(), this.supChild.getBBox());
128128
const style = {'vertical-align': this.em(v)};
129-
this.base.toCHTML(this.chtml);
129+
this.baseChild.toCHTML(this.chtml);
130130
const stack = this.chtml.appendChild(this.html('mjx-script', {style}));
131-
this.sup.toCHTML(stack);
131+
this.supChild.toCHTML(stack);
132132
stack.appendChild(this.html('mjx-spacer', {style: {'margin-top': this.em(q)}}));
133-
this.sub.toCHTML(stack);
133+
this.subChild.toCHTML(stack);
134134
}
135135

136136
/*
137137
* @override
138138
*/
139139
public computeBBox(bbox: BBox) {
140-
const basebox = this.base.getBBox();
141-
const subbox = this.sub.getBBox();
142-
const supbox = this.sup.getBBox();
140+
const basebox = this.baseChild.getBBox();
141+
const subbox = this.subChild.getBBox();
142+
const supbox = this.supChild.getBBox();
143143
bbox.empty();
144144
bbox.append(basebox);
145145
const w = bbox.w;

‎mathjax3-ts/output/chtml/Wrappers/munderover.ts‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,9 @@ export class CHTMLmunder extends CHTMLmsub {
6868
this.chtml = this.standardCHTMLnode(parent);
6969
const base = this.chtml.appendChild(this.html('mjx-row')).appendChild(this.html('mjx-base'));
7070
const under = this.chtml.appendChild(this.html('mjx-row')).appendChild(this.html('mjx-under'));
71-
this.base.toCHTML(base);
71+
this.baseChild.toCHTML(base);
7272
this.script.toCHTML(under);
73-
const basebox = this.base.getBBox();
73+
const basebox = this.baseChild.getBBox();
7474
const underbox = this.script.getBBox();
7575
const [k, v] = this.getUnderKV(basebox, underbox);
7676
under.style.paddingTop = this.em(k);
@@ -86,7 +86,7 @@ export class CHTMLmunder extends CHTMLmsub {
8686
return;
8787
}
8888
bbox.empty();
89-
const basebox = this.base.getBBox();
89+
const basebox = this.baseChild.getBBox();
9090
const underbox = this.script.getBBox();
9191
const [k, v] = this.getUnderKV(basebox, underbox);
9292
const [bw, uw] = this.getDeltaW([basebox, underbox]);
@@ -136,9 +136,9 @@ export class CHTMLmover extends CHTMLmsup {
136136
const over = this.chtml.appendChild(this.html('mjx-over'));
137137
const base = this.chtml.appendChild(this.html('mjx-base'));
138138
this.script.toCHTML(over);
139-
this.base.toCHTML(base);
139+
this.baseChild.toCHTML(base);
140140
const overbox = this.script.getBBox();
141-
const basebox = this.base.getBBox();
141+
const basebox = this.baseChild.getBBox();
142142
const [k, u] = this.getOverKU(basebox, overbox);
143143
over.style.paddingBottom = this.em(k);
144144
this.setDeltaW([base, over], this.getDeltaW([basebox, overbox]));
@@ -156,7 +156,7 @@ export class CHTMLmover extends CHTMLmsup {
156156
return;
157157
}
158158
bbox.empty();
159-
const basebox = this.base.getBBox();
159+
const basebox = this.baseChild.getBBox();
160160
const overbox = this.script.getBBox();
161161
const [k, u] = this.getOverKU(basebox, overbox);
162162
const [bw, ow] = this.getDeltaW([basebox, overbox]);
@@ -188,14 +188,14 @@ export class CHTMLmunderover extends CHTMLmsubsup {
188188
/*
189189
* @return{CHTMLWrapper) The wrapped under node
190190
*/
191-
public get under() {
191+
public get underChild() {
192192
return this.childNodes[(this.node as MmlMunderover).under];
193193
}
194194

195195
/*
196196
* @return{CHTMLWrapper) The wrapped overder node
197197
*/
198-
public get over() {
198+
public get overChild() {
199199
return this.childNodes[(this.node as MmlMunderover).over];
200200
}
201201

@@ -204,17 +204,17 @@ export class CHTMLmunderover extends CHTMLmsubsup {
204204
*
205205
* @override
206206
*/
207-
public get sub() {
208-
return this.under;
207+
public get subChild() {
208+
return this.underChild;
209209
}
210210

211211
/*
212212
* Needed for movablelimits
213213
*
214214
* @override
215215
*/
216-
public get sup() {
217-
return this.over;
216+
public get supChild() {
217+
return this.overChild;
218218
}
219219

220220
/*
@@ -231,12 +231,12 @@ export class CHTMLmunderover extends CHTMLmsubsup {
231231
const table = this.chtml.appendChild(this.html('mjx-box')).appendChild(this.html('mjx-munder'));
232232
const base = table.appendChild(this.html('mjx-row')).appendChild(this.html('mjx-base'));
233233
const under = table.appendChild(this.html('mjx-row')).appendChild(this.html('mjx-under'));
234-
this.over.toCHTML(over);
235-
this.base.toCHTML(base);
236-
this.under.toCHTML(under);
237-
const overbox = this.over.getBBox();
238-
const basebox = this.base.getBBox();
239-
const underbox = this.under.getBBox();
234+
this.overChild.toCHTML(over);
235+
this.baseChild.toCHTML(base);
236+
this.underChild.toCHTML(under);
237+
const overbox = this.overChild.getBBox();
238+
const basebox = this.baseChild.getBBox();
239+
const underbox = this.underChild.getBBox();
240240
const [ok, u] = this.getOverKU(basebox, overbox);
241241
const [uk, v] = this.getUnderKV(basebox, underbox);
242242
over.style.paddingBottom = this.em(ok);
@@ -256,9 +256,9 @@ export class CHTMLmunderover extends CHTMLmsubsup {
256256
return;
257257
}
258258
bbox.empty();
259-
const overbox = this.over.getBBox();
260-
const basebox = this.base.getBBox();
261-
const underbox = this.under.getBBox();
259+
const overbox = this.overChild.getBBox();
260+
const basebox = this.baseChild.getBBox();
261+
const underbox = this.underChild.getBBox();
262262
const [ok, u] = this.getOverKU(basebox, overbox);
263263
const [uk, v] = this.getUnderKV(basebox, underbox);
264264
const [bw, uw, ow] = this.getDeltaW([basebox, underbox, overbox]);

‎mathjax3-ts/output/chtml/Wrappers/scriptbase.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ export class CHTMLscriptbase extends CHTMLWrapper {
4242
/*
4343
* @return{CHTMLWrapper} The base element's wrapper
4444
*/
45-
public get base() {
45+
public get baseChild() {
4646
return this.childNodes[(this.node as MmlMsubsup).base];
4747
}
4848

@@ -61,9 +61,9 @@ export class CHTMLscriptbase extends CHTMLWrapper {
6161
*/
6262
public toCHTML(parent: HTMLElement) {
6363
this.chtml = this.standardCHTMLnode(parent);
64-
const v = this.getOffset(this.base.getBBox(), this.script.getBBox());
64+
const v = this.getOffset(this.baseChild.getBBox(), this.script.getBBox());
6565
const style = {'vertical-align': this.em(v)};
66-
this.base.toCHTML(this.chtml);
66+
this.baseChild.toCHTML(this.chtml);
6767
this.script.toCHTML(this.chtml.appendChild(this.html('mjx-script', {style})));
6868
}
6969

@@ -74,7 +74,7 @@ export class CHTMLscriptbase extends CHTMLWrapper {
7474
* @override
7575
*/
7676
public computeBBox(bbox: BBox) {
77-
const basebox = this.base.getBBox();
77+
const basebox = this.baseChild.getBBox();
7878
const scriptbox = this.script.getBBox();
7979
bbox.append(basebox);
8080
bbox.combine(scriptbox, bbox.w, this.getOffset(basebox, scriptbox));
@@ -86,7 +86,7 @@ export class CHTMLscriptbase extends CHTMLWrapper {
8686
* @return{boolean} True if the base is an mi, mn, or mo (not a largeop) consisting of a single character
8787
*/
8888
protected isCharBase() {
89-
let base = this.base;
89+
let base = this.baseChild;
9090
if ((base.node.isKind('mstyle') || base.node.isKind('mrow')) && base.childNodes.length === 1) {
9191
base = base.childNodes[0];
9292
}
@@ -159,7 +159,7 @@ export class CHTMLscriptbase extends CHTMLWrapper {
159159
const display = this.node.attributes.get('displaystyle');
160160
return (!display && (this.node.getProperty('movablelimits') ||
161161
this.node.attributes.get('movablelimits') ||
162-
this.base.coreMO().node.attributes.get('movablelimits')));
162+
this.baseChild.coreMO().node.attributes.get('movablelimits')));
163163
}
164164

165165
/*

0 commit comments

Comments
 (0)