Fix problems found during packing of files

This commit is contained in:
Davide P. Cervone 2015-09-19 17:26:48 -04:00
parent ce99625de7
commit c83db737ec
9 changed files with 34 additions and 38 deletions

View File

@ -1040,15 +1040,15 @@ MathJax.HTML = {
// " for more details.)"]); // " for more details.)"]);
// //
Element: function (type,def,contents) { Element: function (type,def,contents) {
var obj = document.createElement(type); var obj = document.createElement(type), id;
if (def) { if (def) {
if (def.style) { if (def.style) {
var style = def.style; def.style = {}; var style = def.style; def.style = {};
for (var id in style) {if (style.hasOwnProperty(id)) for (id in style) {if (style.hasOwnProperty(id))
{def.style[id.replace(/-([a-z])/g,this.ucMatch)] = style[id]}} {def.style[id.replace(/-([a-z])/g,this.ucMatch)] = style[id]}}
} }
MathJax.Hub.Insert(obj,def); MathJax.Hub.Insert(obj,def);
for (var id in def) { for (id in def) {
if (id === "role" || id.substr(0,5) === "aria-") obj.setAttribute(id,def[id]); if (id === "role" || id.substr(0,5) === "aria-") obj.setAttribute(id,def[id]);
} }
} }

View File

@ -623,7 +623,7 @@
if (!this.hidden) { if (!this.hidden) {
var def = this.Attributes(); var def = this.Attributes();
var label = this.Label(def,menu); var label = this.Label(def,menu);
var node = HTML.addElement(menu, "div", def, label); HTML.addElement(menu, "div", def, label);
} }
}, },
Name: function () {return _(this.name[0],this.name[1])}, Name: function () {return _(this.name[0],this.name[1])},
@ -1034,7 +1034,6 @@
* Handle the ABOUT box * Handle the ABOUT box
*/ */
MENU.About = function (event) { MENU.About = function (event) {
var HTMLCSS = OUTPUT["HTML-CSS"] || {};
var font = MENU.About.GetFont(); var font = MENU.About.GetFont();
var format = MENU.About.GetFormat(); var format = MENU.About.GetFormat();
var jax = ["MathJax.js v"+MathJax.fileversion,["br"]]; var jax = ["MathJax.js v"+MathJax.fileversion,["br"]];

View File

@ -27,7 +27,6 @@
MathJax.Hub.Register.StartupHook("CommonHTML Jax Ready",function () { MathJax.Hub.Register.StartupHook("CommonHTML Jax Ready",function () {
var VERSION = "2.6.0-beta"; var VERSION = "2.6.0-beta";
var MML = MathJax.ElementJax.mml, var MML = MathJax.ElementJax.mml,
HTML = MathJax.HTML,
CHTML = MathJax.OutputJax.CommonHTML; CHTML = MathJax.OutputJax.CommonHTML;
var currentTip, hover, clear; var currentTip, hover, clear;

View File

@ -27,7 +27,6 @@
MathJax.Hub.Register.StartupHook("CommonHTML Jax Ready",function () { MathJax.Hub.Register.StartupHook("CommonHTML Jax Ready",function () {
var VERSION = "2.6.0-beta"; var VERSION = "2.6.0-beta";
var MML = MathJax.ElementJax.mml, var MML = MathJax.ElementJax.mml,
HTML = MathJax.HTML,
CHTML = MathJax.OutputJax.CommonHTML; CHTML = MathJax.OutputJax.CommonHTML;
var SVGNS = "http://www.w3.org/2000/svg"; var SVGNS = "http://www.w3.org/2000/svg";
@ -107,7 +106,7 @@ MathJax.Hub.Register.StartupHook("CommonHTML Jax Ready",function () {
circle: function (child,cbox,bb,p,t,SOLID) { circle: function (child,cbox,bb,p,t,SOLID) {
var H = bb.H, D = bb.D, W = bb.W; var H = bb.H, D = bb.D, W = bb.W;
svg = this.CHTMLsvg(child,bb,t); var svg = this.CHTMLsvg(child,bb,t);
this.CHTMLsvgElement(svg.firstChild,"ellipse",{ this.CHTMLsvgElement(svg.firstChild,"ellipse",{
rx:CHTML.Px(W/2-t/2), ry:CHTML.Px((H+D)/2-t/2), rx:CHTML.Px(W/2-t/2), ry:CHTML.Px((H+D)/2-t/2),
cx:CHTML.Px(W/2), cy:CHTML.Px((H+D)/2) cx:CHTML.Px(W/2), cy:CHTML.Px((H+D)/2)
@ -184,7 +183,7 @@ MathJax.Hub.Register.StartupHook("CommonHTML Jax Ready",function () {
updiagonalstrike: function (child,cbox,bb,p,t,SOLID) { updiagonalstrike: function (child,cbox,bb,p,t,SOLID) {
var H = bb.H, D = bb.D, W = bb.W; var H = bb.H, D = bb.D, W = bb.W;
svg = this.CHTMLsvg(child,bb,t); var svg = this.CHTMLsvg(child,bb,t);
this.CHTMLsvgElement(svg.firstChild,"line",{ this.CHTMLsvgElement(svg.firstChild,"line",{
x1:CHTML.Px(t/2), y1:CHTML.Px(H+D-t), x2:CHTML.Px(W-t), y2:CHTML.Px(t/2) x1:CHTML.Px(t/2), y1:CHTML.Px(H+D-t), x2:CHTML.Px(W-t), y2:CHTML.Px(t/2)
}); });
@ -194,7 +193,7 @@ MathJax.Hub.Register.StartupHook("CommonHTML Jax Ready",function () {
downdiagonalstrike: function (child,cbox,bb,p,t,SOLID) { downdiagonalstrike: function (child,cbox,bb,p,t,SOLID) {
var H = bb.H, D = bb.D, W = bb.W; var H = bb.H, D = bb.D, W = bb.W;
svg = this.CHTMLsvg(child,bb,t); var svg = this.CHTMLsvg(child,bb,t);
this.CHTMLsvgElement(svg.firstChild,"line",{ this.CHTMLsvgElement(svg.firstChild,"line",{
x1:CHTML.Px(t/2), y1:CHTML.Px(t/2), x2:CHTML.Px(W-t), y2:CHTML.Px(H+D-t) x1:CHTML.Px(t/2), y1:CHTML.Px(t/2), x2:CHTML.Px(W-t), y2:CHTML.Px(H+D-t)
}); });
@ -206,7 +205,7 @@ MathJax.Hub.Register.StartupHook("CommonHTML Jax Ready",function () {
var H = bb.H + bb.D - t, W = bb.W - t/2; var H = bb.H + bb.D - t, W = bb.W - t/2;
var a = Math.atan2(H,W)*(-180/Math.PI).toFixed(3); var a = Math.atan2(H,W)*(-180/Math.PI).toFixed(3);
var R = Math.sqrt(H*H + W*W); var R = Math.sqrt(H*H + W*W);
svg = this.CHTMLsvg(child,bb,t); var svg = this.CHTMLsvg(child,bb,t);
var g = this.CHTMLsvgElement(svg.firstChild,"g",{ var g = this.CHTMLsvgElement(svg.firstChild,"g",{
fill:"currentColor", fill:"currentColor",
transform:"translate("+this.CHTMLpx(t/2)+" "+this.CHTMLpx(H+t/2)+") rotate("+a+")" transform:"translate("+this.CHTMLpx(t/2)+" "+this.CHTMLpx(H+t/2)+") rotate("+a+")"
@ -227,9 +226,11 @@ MathJax.Hub.Register.StartupHook("CommonHTML Jax Ready",function () {
/********************************************************/ /********************************************************/
phasorangle: function (child,cbox,bb,p,t,SOLID) { phasorangle: function (child,cbox,bb,p,t,SOLID) {
var P = p, H = bb.H, D = bb.D, p = (H+D)/2, W = bb.W + p - P; bb.W = W; bb.L = p; var P = p, H = bb.H, D = bb.D;
p = (H+D)/2;
var W = bb.W + p - P; bb.W = W; bb.L = p;
child.style.margin = "0 0 0 "+CHTML.Em(p-P); child.style.margin = "0 0 0 "+CHTML.Em(p-P);
svg = this.CHTMLsvg(child,bb,t); var svg = this.CHTMLsvg(child,bb,t);
this.CHTMLsvgElement(svg.firstChild,"path",{ this.CHTMLsvgElement(svg.firstChild,"path",{
d: "M "+this.CHTMLpx(p)+",1 " + d: "M "+this.CHTMLpx(p)+",1 " +
"L 1,"+this.CHTMLpx(H+D-t)+" L "+this.CHTMLpx(W)+","+this.CHTMLpx(H+D-t) "L 1,"+this.CHTMLpx(H+D-t)+" L "+this.CHTMLpx(W)+","+this.CHTMLpx(H+D-t)
@ -242,7 +243,7 @@ MathJax.Hub.Register.StartupHook("CommonHTML Jax Ready",function () {
bb.W += 1.5*p; bb.L += 1.5*p; bb.W += 1.5*p; bb.L += 1.5*p;
var H = bb.H, D = bb.D, W = bb.W; var H = bb.H, D = bb.D, W = bb.W;
child.style.margin = "0 0 0 "+CHTML.Em(1.5*p); child.style.margin = "0 0 0 "+CHTML.Em(1.5*p);
svg = this.CHTMLsvg(child,bb,t); var svg = this.CHTMLsvg(child,bb,t);
this.CHTMLsvgElement(svg.firstChild,"path",{ this.CHTMLsvgElement(svg.firstChild,"path",{
d: "M "+this.CHTMLpx(W)+",1 L 1,1 "+ d: "M "+this.CHTMLpx(W)+",1 L 1,1 "+
"a"+this.CHTMLpx(p)+","+this.CHTMLpx((H+D)/2-t/2)+" 0 0,1 1,"+this.CHTMLpx(H+D-1.5*t) "a"+this.CHTMLpx(p)+","+this.CHTMLpx((H+D)/2-t/2)+" 0 0,1 1,"+this.CHTMLpx(H+D-1.5*t)
@ -255,7 +256,7 @@ MathJax.Hub.Register.StartupHook("CommonHTML Jax Ready",function () {
bb.W += 1.5*p; bb.L += 1.5*p; bb.W += 1.5*p; bb.L += 1.5*p;
var H = bb.H, D = bb.D, W = bb.W; var H = bb.H, D = bb.D, W = bb.W;
child.style.margin = "0 0 0 "+CHTML.Em(1.5*p); child.style.margin = "0 0 0 "+CHTML.Em(1.5*p);
svg = this.CHTMLsvg(child,bb,t); var svg = this.CHTMLsvg(child,bb,t);
this.CHTMLsvgElement(svg.firstChild,"path",{ this.CHTMLsvgElement(svg.firstChild,"path",{
d: "M 1,"+this.CHTMLpx(.6*(H+D)) + d: "M 1,"+this.CHTMLpx(.6*(H+D)) +
" L "+this.CHTMLpx(p)+","+this.CHTMLpx(H+D) + " L "+this.CHTMLpx(p)+","+this.CHTMLpx(H+D) +

View File

@ -27,7 +27,6 @@
MathJax.Hub.Register.StartupHook("CommonHTML Jax Ready",function () { MathJax.Hub.Register.StartupHook("CommonHTML Jax Ready",function () {
var VERSION = "2.6.0-beta"; var VERSION = "2.6.0-beta";
var MML = MathJax.ElementJax.mml, var MML = MathJax.ElementJax.mml,
HTML = MathJax.HTML,
CHTML = MathJax.OutputJax.CommonHTML; CHTML = MathJax.OutputJax.CommonHTML;
MML.mmultiscripts.Augment({ MML.mmultiscripts.Augment({

View File

@ -27,7 +27,7 @@
MathJax.Hub.Register.StartupHook("CommonHTML Jax Ready",function () { MathJax.Hub.Register.StartupHook("CommonHTML Jax Ready",function () {
var VERSION = "2.6.0-beta"; var VERSION = "2.6.0-beta";
var MML = MathJax.ElementJax.mml, var MML = MathJax.ElementJax.mml,
HTML = MathJax.HTML, CONFIG = MathJax.Hub.config, CONFIG = MathJax.Hub.config,
CHTML = MathJax.OutputJax.CommonHTML, CHTML = MathJax.OutputJax.CommonHTML,
SPLIT = MathJax.Hub.SplitList; SPLIT = MathJax.Hub.SplitList;
@ -179,7 +179,7 @@ MathJax.Hub.Register.StartupHook("CommonHTML Jax Ready",function () {
// Add styles to cells to handle borders, spacing, alignment, etc. // Add styles to cells to handle borders, spacing, alignment, etc.
// //
CHTMLadjustCells: function(values,state) { CHTMLadjustCells: function(values,state) {
var ROWS = state.rows, H = state.H, D = state.D, var ROWS = state.rows,
CSPACE = state.CSPACE, CLINES = state.CLINES, CSPACE = state.CSPACE, CLINES = state.CLINES,
RSPACE = state.RSPACE, RLINES = state.RLINES, RSPACE = state.RSPACE, RLINES = state.RLINES,
CALIGN = state.CALIGN, RALIGN = state.RALIGN, CALIGN = state.CALIGN, RALIGN = state.RALIGN,
@ -187,14 +187,14 @@ MathJax.Hub.Register.StartupHook("CommonHTML Jax Ready",function () {
CSPACE[state.J] *= 2; RSPACE[ROWS.length-1] *= 2; // since halved below CSPACE[state.J] *= 2; RSPACE[ROWS.length-1] *= 2; // since halved below
var LH = CHTML.FONTDATA.lineH * values.useHeight, var LH = CHTML.FONTDATA.lineH * values.useHeight,
LD = CHTML.FONTDATA.lineD * values.useHeight; LD = CHTML.FONTDATA.lineD * values.useHeight;
var T = "0", B, R, L, border, HD, cbox, align; var T = "0", B, R, L, border, cbox, align;
if (values.fspace) T = CHTML.Em(state.FSPACE[1]); if (values.fspace) T = CHTML.Em(state.FSPACE[1]);
for (var i = 0, m = ROWS.length; i < m; i++) { for (var i = 0, m = ROWS.length; i < m; i++) {
var row = ROWS[i], rdata = this.data[i]; var row = ROWS[i], rdata = this.data[i];
// //
// Space and borders between rows // Space and borders between rows
// //
B = RSPACE[i]/2; border = F = null; L = "0"; B = RSPACE[i]/2; border = null; L = "0";
if (RLINES[i] !== MML.LINES.NONE) { if (RLINES[i] !== MML.LINES.NONE) {
border = "1px "+RLINES[i]; border = "1px "+RLINES[i];
B -= 1/CHTML.em/2; B -= 1/CHTML.em/2;

View File

@ -27,7 +27,7 @@
MathJax.Hub.Register.StartupHook("CommonHTML Jax Ready",function () { MathJax.Hub.Register.StartupHook("CommonHTML Jax Ready",function () {
var VERSION = "2.6.0-beta"; var VERSION = "2.6.0-beta";
var MML = MathJax.ElementJax.mml, var MML = MathJax.ElementJax.mml,
HTML = MathJax.HTML, CONFIG = MathJax.Hub.config, CONFIG = MathJax.Hub.config,
CHTML = MathJax.OutputJax.CommonHTML; CHTML = MathJax.OutputJax.CommonHTML;
// //
@ -170,7 +170,7 @@ MathJax.Hub.Register.StartupHook("CommonHTML Jax Ready",function () {
}, },
CHTMLaddWidth: function (i,info,scanW) { CHTMLaddWidth: function (i,info,scanW) {
if (this.data[i]) { if (this.data[i]) {
var node = this.data[i].CHTMLnodeElement(), bbox = this.data[i].CHTML; var bbox = this.data[i].CHTML;
scanW += bbox.w + (bbox.L||0) + (bbox.R||0); scanW += bbox.w + (bbox.L||0) + (bbox.R||0);
info.W = info.scanW = scanW; info.w = 0; info.W = info.scanW = scanW; info.w = 0;
} }
@ -563,7 +563,7 @@ MathJax.Hub.Register.StartupHook("CommonHTML Jax Ready",function () {
}, },
CHTMLmoveLine: function (start,end,node,state,values) { CHTMLmoveLine: function (start,end,node,state,values) {
var NODE = this.CHTMLnodeElement(), data = this.CHTML, BOX = this.CHTMLbbox, NODE; var NODE = this.CHTMLnodeElement(), BOX = this.CHTMLbbox, w;
// //
// If this is the start, move the prescripts, if any. // If this is the start, move the prescripts, if any.
// //
@ -575,7 +575,7 @@ MathJax.Hub.Register.StartupHook("CommonHTML Jax Ready",function () {
if (prestack) node.appendChild(prestack); if (prestack) node.appendChild(prestack);
else if (presup) node.appendChild(presup); else if (presup) node.appendChild(presup);
else if (presub) node.appendChild(presub); else if (presub) node.appendChild(presub);
var w = state.bbox.w, bbox; w = state.bbox.w;
if (presup) state.bbox.combine(BOX.presup,w+BOX.presup.X,BOX.presup.Y); if (presup) state.bbox.combine(BOX.presup,w+BOX.presup.X,BOX.presup.Y);
if (presub) state.bbox.combine(BOX.presub,w+BOX.presub.X,BOX.presub.Y); if (presub) state.bbox.combine(BOX.presub,w+BOX.presub.X,BOX.presub.Y);
} }
@ -604,7 +604,7 @@ MathJax.Hub.Register.StartupHook("CommonHTML Jax Ready",function () {
if (stack) node.appendChild(stack); if (stack) node.appendChild(stack);
else if (sup) node.appendChild(sup); else if (sup) node.appendChild(sup);
else if (sub) node.appendChild(sub); else if (sub) node.appendChild(sub);
var w = state.bbox.w, bbox; w = state.bbox.w;
if (sup) state.bbox.combine(BOX.sup,w,BOX.sup.Y); if (sup) state.bbox.combine(BOX.sup,w,BOX.sup.Y);
if (sub) state.bbox.combine(BOX.sub,w,BOX.sub.Y); if (sub) state.bbox.combine(BOX.sub,w,BOX.sub.Y);
} }
@ -638,7 +638,7 @@ MathJax.Hub.Register.StartupHook("CommonHTML Jax Ready",function () {
// //
// Get the default penalty for this location // Get the default penalty for this location
// //
var W = info.scanW, mo = (info.embellished||this); delete info.embellished; var W = info.scanW; delete info.embellished;
var w = this.CHTML.w + (this.CHTML.L||0) + (this.CHTML.R||0); var w = this.CHTML.w + (this.CHTML.L||0) + (this.CHTML.R||0);
if (values.linebreakstyle === MML.LINEBREAKSTYLE.AFTER) {W += w; w = 0} if (values.linebreakstyle === MML.LINEBREAKSTYLE.AFTER) {W += w; w = 0}
if (W - info.shift === 0 && values.linebreak !== MML.LINEBREAK.NEWLINE) if (W - info.shift === 0 && values.linebreak !== MML.LINEBREAK.NEWLINE)

View File

@ -190,7 +190,6 @@
/************************************************************/ /************************************************************/
var BIGDIMEN = 1000000; var BIGDIMEN = 1000000;
var V = "V", H = "H";
var LINEBREAKS = {}, CONFIG = MathJax.Hub.config; var LINEBREAKS = {}, CONFIG = MathJax.Hub.config;
CHTML.Augment({ CHTML.Augment({
@ -726,7 +725,7 @@
// require looking through the data again. // require looking through the data again.
// //
getCharList: function (variant,n) { getCharList: function (variant,n) {
var id, M, list = [], cache = variant.cache, N = n; var id, M, list = [], cache = variant.cache, nn = n;
if (cache[n]) return cache[n]; if (cache[n]) return cache[n];
var RANGES = this.FONTDATA.RANGES, VARIANT = this.FONTDATA.VARIANT; var RANGES = this.FONTDATA.RANGES, VARIANT = this.FONTDATA.VARIANT;
if (n >= RANGES[0].low && n <= RANGES[RANGES.length-1].high) { if (n >= RANGES[0].low && n <= RANGES[RANGES.length-1].high) {
@ -764,7 +763,7 @@
if (variant.cache[n]) {list = variant.cache[n]} if (variant.cache[n]) {list = variant.cache[n]}
else {variant.cache[n] = list = [this.lookupChar(variant,n)]} else {variant.cache[n] = list = [this.lookupChar(variant,n)]}
} }
cache[N] = list; cache[nn] = list;
return list; return list;
}, },
// //
@ -895,7 +894,7 @@
// //
// Character from the known fonts // Character from the known fonts
// //
char: function (item,node,bbox,state,m) { "char": function (item,node,bbox,state,m) {
var font = item.font; var font = item.font;
if (state.className && font.className !== state.className) this.flushText(node,state); if (state.className && font.className !== state.className) this.flushText(node,state);
if (!state.a) state.a = font.centerline/1000; if (!state.a) state.a = font.centerline/1000;
@ -924,7 +923,7 @@
// An unknown character (one not in the font data) // An unknown character (one not in the font data)
// //
unknown: function (item,node,bbox,state) { unknown: function (item,node,bbox,state) {
this.char(item,node,bbox,state,0); (this["char"])(item,node,bbox,state,0);
var C = item.font[item.n]; var C = item.font[item.n];
if (C[5].a) { if (C[5].a) {
state.a = C[5].a; state.a = C[5].a;
@ -1494,7 +1493,7 @@
CHTMLhandleStyle: function (node) { CHTMLhandleStyle: function (node) {
if (!this.style) return; if (!this.style) return;
var BBOX = this.CHTML, style = node.style; var style = node.style;
style.cssText = this.style; this.removedStyles = {}; style.cssText = this.style; this.removedStyles = {};
for (var i = 0, m = CHTML.removeStyles.length; i < m; i++) { for (var i = 0, m = CHTML.removeStyles.length; i < m; i++) {
var id = CHTML.removeStyles[i]; var id = CHTML.removeStyles[i];
@ -1832,7 +1831,6 @@
// something, so put them over a space and remove the space's width // something, so put them over a space and remove the space's width
// //
node = node.firstChild; node = node.firstChild;
var char = node.textContent;
var space = CHTML.Element("mjx-span",{style:{width:".25em","margin-left":"-.25em"}}); var space = CHTML.Element("mjx-span",{style:{width:".25em","margin-left":"-.25em"}});
node.insertBefore(space,node.firstChild); node.insertBefore(space,node.firstChild);
}, },
@ -1996,7 +1994,7 @@
} }
var cbox = this.CHTMLbboxFor(0); var cbox = this.CHTMLbboxFor(0);
var values = this.getValues("width","height","depth","lspace","voffset"); var values = this.getValues("width","height","depth","lspace","voffset");
var dimen, x = 0, y = 0, w = cbox.w, h = cbox.h, d = cbox.d; var x = 0, y = 0, w = cbox.w, h = cbox.h, d = cbox.d;
child.style.width = 0; child.style.margin = CHTML.Em(-h)+" 0 "+CHTML.Em(-d); child.style.width = 0; child.style.margin = CHTML.Em(-h)+" 0 "+CHTML.Em(-d);
if (values.width !== "") w = this.CHTMLdimen(values.width,"w",w,0); if (values.width !== "") w = this.CHTMLdimen(values.width,"w",w,0);
if (values.height !== "") h = this.CHTMLdimen(values.height,"h",h,0); if (values.height !== "") h = this.CHTMLdimen(values.height,"h",h,0);
@ -2124,7 +2122,7 @@
// //
CHTMLaddOverscript: function (over,boxes,values,delta,base,stretch) { CHTMLaddOverscript: function (over,boxes,values,delta,base,stretch) {
var BBOX = this.CHTML; var BBOX = this.CHTML;
var w, z1, z2, z3 = CHTML.TEX.big_op_spacing5, k; var z1, z2, z3 = CHTML.TEX.big_op_spacing5, k;
var obox = boxes[this.over], bbox = boxes[this.base], scale = obox.rscale; var obox = boxes[this.over], bbox = boxes[this.base], scale = obox.rscale;
// //
// Put the base and script into a stack // Put the base and script into a stack
@ -2171,8 +2169,8 @@
// //
CHTMLaddUnderscript: function (under,boxes,values,delta,node,stack,stretch) { CHTMLaddUnderscript: function (under,boxes,values,delta,node,stack,stretch) {
var BBOX = this.CHTML; var BBOX = this.CHTML;
var w, x = 0, z1, z2, z3 = CHTML.TEX.big_op_spacing5, k; var z1, z2, z3 = CHTML.TEX.big_op_spacing5, k;
var ubox = boxes[this.under], bbox = boxes[this.base], scale = ubox.rscale; var ubox = boxes[this.under], scale = ubox.rscale;
// //
// Create a table for the underscript // Create a table for the underscript
// //

View File

@ -428,7 +428,7 @@ MathJax.Hub.Register.StartupHook("HTML-CSS Jax Ready",function () {
var labelspace = HTMLCSS.length2em(values.minlabelspacing,mu,HTMLCSS.cwidth); var labelspace = HTMLCSS.length2em(values.minlabelspacing,mu,HTMLCSS.cwidth);
var labelW = labelspace + C[LABEL].bbox.w, labelshift = 0, tw = mw; var labelW = labelspace + C[LABEL].bbox.w, labelshift = 0, tw = mw;
var dIndent = HTMLCSS.length2em(this.displayIndent,mu,HTMLCSS.cwidth); var dIndent = HTMLCSS.length2em(this.displayIndent,mu,HTMLCSS.cwidth);
var s = (CALIGN[LABEL] === MML.INDENTALIGN.RIGHT ? -1 : 1); s = (CALIGN[LABEL] === MML.INDENTALIGN.RIGHT ? -1 : 1);
if (indent.indentalign === MML.INDENTALIGN.CENTER) { if (indent.indentalign === MML.INDENTALIGN.CENTER) {
tw += 2 * (labelW - s*(shift + dIndent)); tw += 2 * (labelW - s*(shift + dIndent));
shift += dIndent; shift += dIndent;