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

Merge branch 'issue576' into develop. Issue #576.

Browse Source
This commit is contained in:
Davide P. Cervone 2014-02-22 08:33:41 -05:00
commit d553f18625
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
unpacked/extensions/MatchWebFonts.js
View File

@ -28,7 +28,7 @@
*/ */
(function (HUB,AJAX) { (function (HUB,AJAX) {
var VERSION = "2.3"; var VERSION = "2.3.1";
var CONFIG = MathJax.Hub.CombineConfig("MatchWebFonts",{ var CONFIG = MathJax.Hub.CombineConfig("MatchWebFonts",{
matchFor: { matchFor: {
@ -98,9 +98,10 @@
// //
// Remove markers // Remove markers
// //
scripts = scripts.concat(size); // some scripts have been moved to the size array
for (i = 0, m = scripts.length; i < m; i++) { for (i = 0, m = scripts.length; i < m; i++) {
script = scripts[i]; script = scripts[i];
if (script.parentNode && script.MathJax.elementJax) { if (script && script.parentNode && script.MathJax.elementJax) {
script.parentNode.removeChild(script.previousSibling); script.parentNode.removeChild(script.previousSibling);
} }
} }
@ -164,6 +165,7 @@
// //
// Remove markers // Remove markers
// //
scripts = scripts.concat(size); // some scripts have been moved to the size array
for (i = 0, m = scripts.length; i < m; i++) { for (i = 0, m = scripts.length; i < m; i++) {
script = scripts[i]; script = scripts[i];
if (script.parentNode && script.MathJax.elementJax) { if (script.parentNode && script.MathJax.elementJax) {
@ -303,7 +305,7 @@
}); });
}); });
HUB.Startup.signal.Post("MathWebFont Extension Ready"); HUB.Startup.signal.Post("MatchWebFonts Extension Ready");
AJAX.loadComplete("[MathJax]/extensions/MatchWebFonts.js"); AJAX.loadComplete("[MathJax]/extensions/MatchWebFonts.js");
})(MathJax.Hub,MathJax.Ajax); })(MathJax.Hub,MathJax.Ajax);

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

@ -469,6 +469,23 @@
// //
InitializeHTML: function () { InitializeHTML: function () {
this.PreloadWebFonts(); this.PreloadWebFonts();
this.getDefaultExEm();
//
// If the defaultEm size is zero, it might be that a web font hasn't
// arrived yet, so try to wait for it, but don't wait too long.
//
if (this.defaultEm) return;
var ready = MathJax.Callback();
AJAX.timer.start(AJAX,function (check) {
if (check.time(ready)) {HUB.signal.Post("HTML-CSS Jax - no default em size"); return}
HTMLCSS.getDefaultExEm();
if (HTMLCSS.defaultEm) {ready()} else {setTimeout(check,check.delay)}
},this.defaultEmDelay,this.defaultEmTimeout);
return ready;
},
defaultEmDelay: 100, // initial delay when checking for defaultEm
defaultEmTimeout: 1000, // when to stop looking for defaultEm
getDefaultExEm: function () {
// //
// Get the default sizes (need styles in place to do this) // Get the default sizes (need styles in place to do this)
// //