www

commit d553f186251183e118ac544f66de27f95f39077b
parent e67c01ca0bd37462e874e06e12a46143b47693df
Author: Davide P. Cervone <dpvc@union.edu>
Date:   Sat, 22 Feb 2014 08:33:41 -0500

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

Diffstat:
M
unpacked/extensions/MatchWebFonts.js
 | 
8
+++++---
M
unpacked/jax/output/HTML-CSS/jax.js
 | 
17
+++++++++++++++++

2 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/unpacked/extensions/MatchWebFonts.js b/unpacked/extensions/MatchWebFonts.js
@@ -28,7 +28,7 @@
  */
 
 (function (HUB,AJAX) {
-  var VERSION = "2.3";
+  var VERSION = "2.3.1";
   
   var CONFIG = MathJax.Hub.CombineConfig("MatchWebFonts",{
     matchFor: {
@@ -98,9 +98,10 @@
         //
         //  Remove markers
         //
+        scripts = scripts.concat(size);  // some scripts have been moved to the size array
         for (i = 0, m = scripts.length; i < m; i++) {
           script = scripts[i];
-          if (script.parentNode && script.MathJax.elementJax) {
+          if (script && script.parentNode && script.MathJax.elementJax) {
             script.parentNode.removeChild(script.previousSibling);
           }
         }
@@ -164,6 +165,7 @@
         //
         //  Remove markers
         //
+        scripts = scripts.concat(size);  // some scripts have been moved to the size array
         for (i = 0, m = scripts.length; i < m; i++) {
           script = scripts[i];
           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");
 
 })(MathJax.Hub,MathJax.Ajax);
diff --git a/unpacked/jax/output/HTML-CSS/jax.js b/unpacked/jax/output/HTML-CSS/jax.js
@@ -469,6 +469,23 @@
     //
     InitializeHTML: function () {
       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)
       //