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

Another try at getting elements with text coming from multiple fonts to work properly.

Browse Source
This commit is contained in:
Davide P. Cervone 2012-02-02 16:12:36 -05:00
parent 0d2d066b37
commit 5694332a99
8 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/AM_HTMLorMML-full.js
View File

File diff suppressed because one or more lines are too long

2
config/Accessible-full.js
View File

File diff suppressed because one or more lines are too long

2
config/MML_HTMLorMML-full.js
View File

File diff suppressed because one or more lines are too long

2
config/TeX-AMS-MML_HTMLorMML-full.js
View File

File diff suppressed because one or more lines are too long

2
config/TeX-AMS_HTML-full.js
View File

File diff suppressed because one or more lines are too long

2
config/TeX-MML-AM_HTMLorMML-full.js
View File

File diff suppressed because one or more lines are too long

2
jax/output/HTML-CSS/jax.js
View File

File diff suppressed because one or more lines are too long

19
unpacked/jax/output/HTML-CSS/jax.js
View File

@ -1224,7 +1224,7 @@
},
handleVariant: function (span,variant,text) {
var newtext = "", n, c, font, VARIANT, SPAN, SPANV;
var newtext = "", n, c, font, VARIANT, SPAN = span;
if (text.length === 0) return;
if (!span.bbox) {
span.bbox = {
@ -1281,11 +1281,13 @@
i = 0; m = text.length; n = n.charCodeAt(0);
}
}
font = this.lookupChar(variant,n); c = font[n]; SPAN = span;
if ((variant !== SPANV || font.family !== span.style.fontFamily) && !c[5].img) {
if (newtext.length) {this.addText(span,newtext); newtext = ""}
if (span.style.fontFamily) {SPAN = this.addElement(span,"span",{isMathJax:true})}
this.handleFont(SPAN,font,SPAN !== span); SPANV = variant;
font = this.lookupChar(variant,n); c = font[n];
if (!this.checkFont(font,SPAN.style) && !c[5].img) {
if (newtext.length) {this.addText(SPAN,newtext); newtext = ""};
var addSpan = !!SPAN.style.fontFamily;
if (SPAN !== span) {addSpan = !this.checkFont(font,span.style); SPAN = span}
if (addSpan) {SPAN = this.addElement(span,"span",{isMathJax:true})}
this.handleFont(SPAN,font,SPAN !== span);
}
newtext = this.handleChar(SPAN,font,c,n,newtext);
if (c[0]/1000 > span.bbox.h) {span.bbox.h = c[0]/1000}
@ -1301,6 +1303,11 @@
}
if (text.length == 1 && font.skew && font.skew[n]) {span.bbox.skew = font.skew[n]}
},
checkFont: function (font,style) {
return (font.family.replace(/'/g,"") === style.fontFamily.replace(/'/g,"") &&
(font.style||"normal") === (style.fontStyle||"normal") &&
(font.weight||"normal") === (style.fontWeight||"normal"));
},
handleFont: function (span,font,force) {
span.style.fontFamily = font.family;