suzanne.soy/scribble-mathjax
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Handle spacing via classes, get bbox right for MathML spacing, and temporarily restore table formatting.

Browse Source
This commit is contained in:
Davide P. Cervone 2015-03-10 21:22:27 -04:00
parent 83b120d061
commit ba50c5c690
1 changed files with 31 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
unpacked/jax/output/CommonHTML/jax.js
View File

@ -96,18 +96,21 @@
"mjx-line": {display:"block", width:"100%", "border-top":"0 solid"}, "mjx-line": {display:"block", width:"100%", "border-top":"0 solid"},
".MJXc-script": {"font-size":SCRIPTFACTOR+"em"}, ".MJXc-script": {"font-size":SCRIPTFACTOR+"em"},
".MJXc-space1": {"margin-left":".167em"},
".MJXc-space2": {"margin-left":".222em"},
".MJXc-space3": {"margin-left":".278em"},
/*********************************/ /*********************************/
".MJXc-mtable": {"vertical-align":AXISHEIGHT+"em", "margin":"0 .125em"}, "mjx-mtable": {"vertical-align":AXISHEIGHT+"em", "margin":"0 .125em"},
".MJXc-mtable > span": {"display":"inline-table!important", "vertical-align":"middle"}, "mjx-mtable > span": {"display":"inline-table!important", "vertical-align":"middle"},
".MJXc-mtr": {"display":"table-row!important"}, "mjx-mtr": {"display":"table-row!important"},
".MJXc-mtd": {"display":"table-cell!important", "text-align":"center", "padding":".5em 0 0 .5em"}, "mjx-mtd": {"display":"table-cell!important", "text-align":"center", "padding":".5em 0 0 .5em"},
".MJXc-mtr > .MJXc-mtd:first-child": {"padding-left":0}, "mjx-mtr > mjx-mtd:first-child": {"padding-left":0},
".MJXc-mtr:first-child > .MJXc-mtd": {"padding-top":0}, "mjx-mtr:first-child > mjx-mtd": {"padding-top":0},
".MJXc-mlabeledtr": {"display":"table-row!important"}, "mjx-mlabeledtr": {"display":"table-row!important"},
".MJXc-mlabeledtr > .MJXc-mtd:first-child": {"padding-left":0}, "mjx-mlabeledtr > mjx-mtd:first-child": {"padding-left":0},
".MJXc-mlabeledtr:first-child > .MJXc-mtd": {"padding-top":0} "mjx-mlabeledtr:first-child > mjx-mtd": {"padding-top":0}
}; };
@ -388,6 +391,11 @@
infinity: BIGDIMEN infinity: BIGDIMEN
}, },
SPACECLASS: {
thinmathspace: "MJXc-space1",
mediummathspace: "MJXc-space2",
thickmathspace: "MJXc-space3"
},
pxPerInch: 96, pxPerInch: 96,
em: 16, em: 16,
@ -931,9 +939,10 @@
CHTMLhandleSpace: function (node) { CHTMLhandleSpace: function (node) {
if (!this.useMMLspacing) { if (!this.useMMLspacing) {
var space = this.texSpacing(); var space = this.texSpacing();
if (space !== "") this.CHTML.L = CHTML.length2em(space) + (this.CHTML.L||0); if (space !== "") {
if (this.CHTML.L) node.style.marginLeft = CHTML.Em(this.CHTML.L); this.CHTML.L = CHTML.length2em(space);
if (this.CHTML.R) node.style.marginRight = CHTML.Em(this.CHTML.R); node.className += " "+CHTML.SPACECLASS[space];
}
} }
}, },
@ -1076,8 +1085,9 @@
var core = this, parent = this.Parent(); var core = this, parent = this.Parent();
while (parent && parent.isEmbellished() && parent.Core() === core) while (parent && parent.isEmbellished() && parent.Core() === core)
{core = parent; parent = parent.Parent(); node = core.CHTMLnodeElement()} {core = parent; parent = parent.Parent(); node = core.CHTMLnodeElement()}
if (values.lspace) {node.style.paddingLeft = CHTML.Em(values.lspace)} if (values.lspace) node.style.paddingLeft = CHTML.Em(values.lspace);
if (values.rspace) {node.style.paddingRight = CHTML.Em(values.rspace)} if (values.rspace) node.style.paddingRight = CHTML.Em(values.rspace);
this.CHTML.L = values.lspace; this.CHTML.R = values.rspace;
} else { } else {
this.SUPER(arguments).CHTMLhandleSpace.apply(this,arguments); this.SUPER(arguments).CHTMLhandleSpace.apply(this,arguments);
} }
@ -1634,8 +1644,11 @@
// Add nulldelimiterspace around the fraction // Add nulldelimiterspace around the fraction
// (TeXBook pg 150 and Appendix G rule 15e) // (TeXBook pg 150 and Appendix G rule 15e)
// //
if (!this.texWithDelims && !this.useMMLspacing) if (!this.texWithDelims && !this.useMMLspacing) {
this.CHTML.L = this.CHTML.R = CHTML.TEX.nulldelimiterspace; var space = CHTML.TEX.nulldelimiterspace, BBOX = this.CHTML;
frac.style.padding = "0 "+CHTML.Em(space);
BBOX.l += space; BBOX.r += space; BBOX.w += 2*space;
}
this.CHTMLhandleSpace(node); this.CHTMLhandleSpace(node);
// //
// Return the completed fraction // Return the completed fraction
@ -1669,6 +1682,7 @@
bbox.h += q + 2*t; bbox.h += q + 2*t;
CHTML.combineBBoxes(BBOX,sbox,x,H-sbox.h,1); CHTML.combineBBoxes(BBOX,sbox,x,H-sbox.h,1);
CHTML.combineBBoxes(BBOX,bbox,x+sbox.w,0,1); CHTML.combineBBoxes(BBOX,bbox,x+sbox.w,0,1);
this.CHTMLhandleSpace(node);
return node; return node;
}, },
CHTMLaddRoot: function () {return 0} CHTMLaddRoot: function () {return 0}
@ -1793,7 +1807,7 @@
for (i = 0, m = CSPACE.length; i < m; i++) {CSPACE[i] = CHTML.length2em(CSPACE[i])} for (i = 0, m = CSPACE.length; i < m; i++) {CSPACE[i] = CHTML.length2em(CSPACE[i])}
for (i = 0, m = RSPACE.length; i < m; i++) {RSPACE[i] = CHTML.length2em(RSPACE[i])} for (i = 0, m = RSPACE.length; i < m; i++) {RSPACE[i] = CHTML.length2em(RSPACE[i])}
var table = HTML.Element("node"); var table = HTML.Element("span");
while (node.firstChild) table.appendChild(node.firstChild); while (node.firstChild) table.appendChild(node.firstChild);
node.appendChild(table); node.appendChild(table);
var H = 0, W = 0; var H = 0, W = 0;