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

Better layout for fractions (works in xhtml).

Browse Source
This commit is contained in:
Davide P. Cervone 2015-02-17 14:56:51 -05:00
parent e9ed0a1315
commit 8ea3a8329d
1 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -83,9 +83,14 @@
".MJXc-mo": {"margin": "0 .15em"}, ".MJXc-mo": {"margin": "0 .15em"},
".MJXc-mfrac": {"margin": "0 .125em", "vertical-align":".25em"}, ".MJXc-mfrac": {"margin": "0 .125em", "vertical-align":".25em",
".MJXc-denom": {"display": "inline-table!important", "width":"100%"}, "display": "inline-table!important", "text-align":"center"},
".MJXc-denom > *": {"display": "table-row!important"}, ".MJXc-mfrac > *": {"display": "table-row!important"},
".MJXc-num": {"line-height": 0},
".MJXc-num > *": {"line-height":"1.2", "width":"100%"},
".MJXc-num > * > *": {"display":"table!important", "width":"100%"},
".MJXc-mfrac-row": {"display":"table-row!important"},
".MJXc-mfrac-row > *": {"display":"table-cell!important","width":"100%"},
".MJXc-surd": {"vertical-align":"top"}, ".MJXc-surd": {"vertical-align":"top"},
".MJXc-surd > *": {"display":"block!important"}, ".MJXc-surd > *": {"display":"block!important"},
@ -418,7 +423,7 @@
TeX: { TeX: {
x_height: .430554 x_height: .430554
}, },
pxPerInch: 72, pxPerInch: 96,
em: 16, em: 16,
// ### FIXME: add more here // ### FIXME: add more here
@ -899,20 +904,27 @@
MML.mfrac.Augment({ MML.mfrac.Augment({
toCommonHTML: function (span) { toCommonHTML: function (span) {
span = this.CHTMLdefaultSpan(span,{ span = this.CHTMLdefaultSpan(span,{
childSpans:true, className:"MJXc-box", forceChild:true, noBBox:true childSpans:true, className:"MJXc-mfrac-cell", forceChild:true, noBBox:true
}); });
var values = this.getValues("linethickness","displaystyle"); var values = this.getValues("linethickness","displaystyle");
if (!values.displaystyle) { if (!values.displaystyle) {
if (this.data[0]) this.data[0].CHTMLhandleScriptlevel(span.firstChild); if (this.data[0]) this.data[0].CHTMLhandleScriptlevel(span.firstChild);
if (this.data[1]) this.data[1].CHTMLhandleScriptlevel(span.lastChild); if (this.data[1]) this.data[1].CHTMLhandleScriptlevel(span.lastChild);
} }
var denom = HTML.Element("span",{className:"MJXc-box",style:{"margin-top":"-.8em"}},[ var num = HTML.Element("span",{className:"MJXc-num"},[
["span",{className:"MJXc-denom"},[ // inline-table ["span",{}, // inline-block
["span",{},[["span",{className:"MJXc-rule"}]]],["span"] // spans are table-row [["span",{},[ // table, 100%
]] ["span",{className:"MJXc-mfrac-row"}], // numerator row, 100%
["span",{className:"MJXc-mfrac-row", style:"font-size:0"},
[["span",{},[["span",{className:"MJXc-rule"}]]]]] // division line
]]]
]
]); ]);
denom.firstChild.lastChild.appendChild(span.lastChild); num.firstChild.firstChild.firstChild.appendChild(span.firstChild);
span.appendChild(denom); var denom = HTML.Element("span",{className:"MJXc-mfrac-row"});
denom.appendChild(span.firstChild);
span.appendChild(num); span.appendChild(denom);
var nbox = this.CHTMLbboxFor(0), dbox = this.CHTMLbboxFor(1), bbox = this.CHTML; var nbox = this.CHTMLbboxFor(0), dbox = this.CHTMLbboxFor(1), bbox = this.CHTML;
bbox.w = Math.max(nbox.w,dbox.w) * .8; bbox.w = Math.max(nbox.w,dbox.w) * .8;
bbox.h = nbox.h+nbox.d + .1 + .25; bbox.h = nbox.h+nbox.d + .1 + .25;
@ -920,12 +932,11 @@
bbox.l = bbox.r = .125; bbox.l = bbox.r = .125;
values.linethickness = Math.max(0,CHTML.length2em(values.linethickness||"0",0)); values.linethickness = Math.max(0,CHTML.length2em(values.linethickness||"0",0));
if (values.linethickness) { if (values.linethickness) {
var rule = denom.firstChild.firstChild.firstChild; var rule = num.firstChild.firstChild.lastChild.lastChild.lastChild;
var t = CHTML.Em(values.linethickness); var t = CHTML.Em(values.linethickness);
rule.style.borderTop = (values.linethickness < .15 ? "1px" : t)+" solid"; rule.style.borderTop = (values.linethickness < .15 ? "1px" : t)+" solid";
rule.style.margin = t+" 0"; rule.style.margin = t+" 0";
t = values.linethickness; t = values.linethickness;
denom.style.marginTop = CHTML.Em(3*t-.9);
span.style.verticalAlign = CHTML.Em(1.5*t + .1); span.style.verticalAlign = CHTML.Em(1.5*t + .1);
bbox.h += 1.5*t - .1; bbox.d += 1.5*t; bbox.h += 1.5*t - .1; bbox.d += 1.5*t;
} }