Merge branch 'combine' of https://github.com/dpvc/MathJax

config/MMLorHTML.js

@@ -12,5 +12,5 @@
  *      http://www.apache.org/licenses/LICENSE-2.0
  */
 
-(function(c){var i="1.0";var g=MathJax.Hub.Insert({prefer:{MSIE:"MML",Firefox:"MML",Opera:"HTML",other:"HTML"}},(MathJax.Hub.config.MMLorHTML||{}));var e={Firefox:3,Opera:9.52,MSIE:6,Chrome:0.3,Safari:2,Konqueror:4};var h=(c.Browser.version==="0.0"||c.Browser.versionAtLeast(e[c.Browser]||0));var b;try{new ActiveXObject("MathPlayer.Factory.1");b=true}catch(d){b=false}var f=(c.Browser.isFirefox&&c.Browser.versionAtLeast("1.5"))||(c.Browser.isMSIE&&b)||(c.Browser.isOpera&&c.Browser.versionAtLeast("9.52"));var a=(g.prefer&&typeof(g.prefer)==="object"?g.prefer[MathJax.Hub.Browser]||g.prefer.other||"HTML":g.prefer);if(h||f){if(f&&(a==="MML"||!h)){c.config.jax.unshift("output/NativeMML")}else{c.config.jax.unshift("output/HTML-CSS")}}else{c.PreProcess.disabled=true;c.prepareScripts.disabled=true;MathJax.Message.Set("Your browser does not support MathJax",null,4000);c.Startup.signal.Post("MathJax not supported")}})(MathJax.Hub);MathJax.Ajax.loadComplete("[MathJax]/config/MMLorHTML.js");
+(function(c){var i="1.0.1";var g=MathJax.Hub.Insert({prefer:{MSIE:"MML",Firefox:"MML",Opera:"HTML",other:"HTML"}},(MathJax.Hub.config.MMLorHTML||{}));var e={Firefox:3,Opera:9.52,MSIE:6,Chrome:0.3,Safari:2,Konqueror:4};var h=(c.Browser.version==="0.0"||c.Browser.versionAtLeast(e[c.Browser]||0));var b;try{new ActiveXObject("MathPlayer.Factory.1");b=true}catch(d){b=false}var f=(c.Browser.isFirefox&&c.Browser.versionAtLeast("1.5"))||(c.Browser.isMSIE&&b)||(c.Browser.isOpera&&c.Browser.versionAtLeast("9.52"));var a=(g.prefer&&typeof(g.prefer)==="object"?g.prefer[MathJax.Hub.Browser]||g.prefer.other||"HTML":g.prefer);if(h||f){if(f&&(a==="MML"||!h)){if(MathJax.OutputJax.NativeMML){MathJax.OutputJax.NativeMML.Register("jax/mml")}else{c.config.jax.unshift("output/NativeMML")}}else{if(MathJax.OutputJax["HTML-CSS"]){MathJax.OutputJax["HTML-CSS"].Register("jax/mml")}else{c.config.jax.unshift("output/HTML-CSS")}}}else{c.PreProcess.disabled=true;c.prepareScripts.disabled=true;MathJax.Message.Set("Your browser does not support MathJax",null,4000);c.Startup.signal.Post("MathJax not supported")}})(MathJax.Hub);MathJax.Ajax.loadComplete("[MathJax]/config/MMLorHTML.js");
 

jax/output/HTML-CSS/config.js

@@ -12,5 +12,5 @@
  *      http://www.apache.org/licenses/LICENSE-2.0
  */
 
-MathJax.OutputJax["HTML-CSS"]=MathJax.OutputJax({id:"HTML-CSS",version:"1.0.5",directory:MathJax.OutputJax.directory+"/HTML-CSS",extensionDir:MathJax.OutputJax.extensionDir+"/HTML-CSS",autoloadDir:MathJax.OutputJax.directory+"/HTML-CSS/autoload",fontDir:MathJax.OutputJax.directory+"/HTML-CSS/fonts",webfontDir:MathJax.OutputJax.fontDir+"/HTML-CSS",config:{scale:100,minScaleAdjust:50,availableFonts:["STIX","TeX"],preferredFont:"TeX",webFont:"TeX",imageFont:"TeX",showMathMenu:true,styles:{".MathJax_Display":{"text-align":"center",margin:"1em 0em"},".MathJax .merror":{"background-color":"#FFFF88",color:"#CC0000",border:"1px solid #CC0000",padding:"1px 3px","font-family":"serif","font-style":"normal","font-size":"90%"},".MathJax_Preview":{color:"#888888"},"#MathJax_Tooltip":{"background-color":"InfoBackground",color:"InfoText",border:"1px solid black","box-shadow":"2px 2px 5px #AAAAAA","-webkit-box-shadow":"2px 2px 5px #AAAAAA","-moz-box-shadow":"2px 2px 5px #AAAAAA",filter:"progid:DXImageTransform.Microsoft.dropshadow(OffX=2, OffY=2, Color='gray', Positive='true')",padding:"3px 4px"}}}});MathJax.OutputJax["HTML-CSS"].Register("jax/mml");(function(b,c){var a;a=b.Insert({minBrowserVersion:{Firefox:3,Opera:9.52,MSIE:6,Chrome:0.3,Safari:2,Konqueror:4},inlineMathDelimiters:["$","$"],displayMathDelimiters:["$$","$$"],multilineDisplay:true,minBrowserTranslate:function(f){var e=b.getJaxFor(f),l=["[Math]"],k;var h=document.createElement("span",{className:"MathJax_Preview"});var j=e.root.Get("displaystyle");if(e.inputJax.id==="TeX"){if(j){k=a.displayMathDelimiters;l=[k[0]+e.originalText+k[1]];if(a.multilineDisplay){l=l[0].split(/\n/)}}else{k=a.inlineMathDelimiters;l=[k[0]+e.originalText.replace(/^\s+/,"").replace(/\s+$/,"")+k[1]]}}for(var g=0,d=l.length;g<d;g++){h.appendChild(document.createTextNode(l[g]));if(g<d-1){h.appendChild(document.createElement("br"))}}f.parentNode.insertBefore(h,f)}},(b.config["HTML-CSS"]||{}));if(b.Browser.version!=="0.0"&&!b.Browser.versionAtLeast(a.minBrowserVersion[b.Browser]||0)){c.Translate=a.minBrowserTranslate;MathJax.Hub.Config({showProcessingMessages:false});MathJax.Message.Set("Your browser does not support MathJax",null,4000);b.Startup.signal.Post("MathJax not supported")}})(MathJax.Hub,MathJax.OutputJax["HTML-CSS"]);MathJax.OutputJax["HTML-CSS"].loadComplete("config.js");
+MathJax.OutputJax["HTML-CSS"]=MathJax.OutputJax({id:"HTML-CSS",version:"1.0.6",directory:MathJax.OutputJax.directory+"/HTML-CSS",extensionDir:MathJax.OutputJax.extensionDir+"/HTML-CSS",autoloadDir:MathJax.OutputJax.directory+"/HTML-CSS/autoload",fontDir:MathJax.OutputJax.directory+"/HTML-CSS/fonts",webfontDir:MathJax.OutputJax.fontDir+"/HTML-CSS",config:{scale:100,minScaleAdjust:50,availableFonts:["STIX","TeX"],preferredFont:"TeX",webFont:"TeX",imageFont:"TeX",showMathMenu:true,styles:{".MathJax_Display":{"text-align":"center",margin:"1em 0em"},".MathJax .merror":{"background-color":"#FFFF88",color:"#CC0000",border:"1px solid #CC0000",padding:"1px 3px","font-family":"serif","font-style":"normal","font-size":"90%"},".MathJax_Preview":{color:"#888888"},"#MathJax_Tooltip":{"background-color":"InfoBackground",color:"InfoText",border:"1px solid black","box-shadow":"2px 2px 5px #AAAAAA","-webkit-box-shadow":"2px 2px 5px #AAAAAA","-moz-box-shadow":"2px 2px 5px #AAAAAA",filter:"progid:DXImageTransform.Microsoft.dropshadow(OffX=2, OffY=2, Color='gray', Positive='true')",padding:"3px 4px"}}}});if(!MathJax.Hub.config.delayJaxRegistration){MathJax.OutputJax["HTML-CSS"].Register("jax/mml")}(function(b,c){var a;a=b.Insert({minBrowserVersion:{Firefox:3,Opera:9.52,MSIE:6,Chrome:0.3,Safari:2,Konqueror:4},inlineMathDelimiters:["$","$"],displayMathDelimiters:["$$","$$"],multilineDisplay:true,minBrowserTranslate:function(f){var e=b.getJaxFor(f),l=["[Math]"],k;var h=document.createElement("span",{className:"MathJax_Preview"});var j=e.root.Get("displaystyle");if(e.inputJax.id==="TeX"){if(j){k=a.displayMathDelimiters;l=[k[0]+e.originalText+k[1]];if(a.multilineDisplay){l=l[0].split(/\n/)}}else{k=a.inlineMathDelimiters;l=[k[0]+e.originalText.replace(/^\s+/,"").replace(/\s+$/,"")+k[1]]}}for(var g=0,d=l.length;g<d;g++){h.appendChild(document.createTextNode(l[g]));if(g<d-1){h.appendChild(document.createElement("br"))}}f.parentNode.insertBefore(h,f)}},(b.config["HTML-CSS"]||{}));if(b.Browser.version!=="0.0"&&!b.Browser.versionAtLeast(a.minBrowserVersion[b.Browser]||0)){c.Translate=a.minBrowserTranslate;MathJax.Hub.Config({showProcessingMessages:false});MathJax.Message.Set("Your browser does not support MathJax",null,4000);b.Startup.signal.Post("MathJax not supported")}})(MathJax.Hub,MathJax.OutputJax["HTML-CSS"]);MathJax.OutputJax["HTML-CSS"].loadComplete("config.js");
 

jax/output/NativeMML/config.js

@@ -12,5 +12,5 @@
  *      http://www.apache.org/licenses/LICENSE-2.0
  */
 
-MathJax.OutputJax.NativeMML=MathJax.OutputJax({id:"NativeMML",version:"1.0.2",directory:MathJax.OutputJax.directory+"/NativeMML",extensionDir:MathJax.OutputJax.extensionDir+"/NativeMML",config:{scale:100,showMathMenu:true,showMathMenuMSIE:true,styles:{"DIV.MathJax_MathML":{"text-align":"center",margin:".75em 0px"}}}});MathJax.OutputJax.NativeMML.Register("jax/mml");(function(b){if(b.isMSIE){var a=document.createElement("object");a.id="mathplayer";a.classid="clsid:32F66A20-7614-11D4-BD11-00104BD3F987";document.getElementsByTagName("head")[0].appendChild(a);document.namespaces.add("mjx","http://www.w3.org/1998/Math/MathML");document.namespaces.mjx.doImport("#mathplayer")}})(MathJax.Hub.Browser);MathJax.OutputJax.NativeMML.loadComplete("config.js");
+MathJax.OutputJax.NativeMML=MathJax.OutputJax({id:"NativeMML",version:"1.0.3",directory:MathJax.OutputJax.directory+"/NativeMML",extensionDir:MathJax.OutputJax.extensionDir+"/NativeMML",config:{scale:100,showMathMenu:true,showMathMenuMSIE:true,styles:{"DIV.MathJax_MathML":{"text-align":"center",margin:".75em 0px"}}}});if(!MathJax.Hub.config.delayJaxRegistration){MathJax.OutputJax.NativeMML.Register("jax/mml")}(function(b){if(b.isMSIE){var a=document.createElement("object");a.id="mathplayer";a.classid="clsid:32F66A20-7614-11D4-BD11-00104BD3F987";document.getElementsByTagName("head")[0].appendChild(a);document.namespaces.add("mjx","http://www.w3.org/1998/Math/MathML");document.namespaces.mjx.doImport("#mathplayer")}})(MathJax.Hub.Browser);MathJax.OutputJax.NativeMML.loadComplete("config.js");
 

unpacked/MathJax.js

@@ -29,7 +29,7 @@ if (document.getElementById && document.childNodes && document.createElement) {
 if (!window.MathJax) {window.MathJax= {}}
 if (!MathJax.Hub) {  // skip if already loaded
   
-MathJax.version = "1.0.8";
+MathJax.version = "1.0.9";
 
 /**********************************************************/
 
@@ -661,6 +661,16 @@ MathJax.version = "1.0.8";
       return callback;
     },
     
+    //
+    //  Used when files are combined in a preloading configuration file
+    //
+    Preloading: function () {
+      for (var i = 0, m = arguments.length; i < m; i++) {
+        var file = this.fileURL(arguments[i]);
+        if (!this.loading[file]) {this.loading[file] = {preloaded: true}}
+      }
+    },
+    
     //
     //  Code used to load the various types of files
     //  (JS for JavaScript, CSS for style sheets)
@@ -799,7 +809,7 @@ MathJax.version = "1.0.8";
     loadComplete: function (file) {
       file = this.fileURL(file);
       var loading = this.loading[file];
-      if (loading) {
+      if (loading && !loading.preloaded) {
         BASE.Message.Clear(loading.message);
         clearTimeout(loading.timeout);
 	if (loading.script) {
@@ -1361,9 +1371,9 @@ MathJax.Hub = {
         if (!script.MathJax || script.MathJax.state === STATE.PROCESSED) continue;
         if (!script.MathJax.elementJax || script.MathJax.state === STATE.UPDATE) {
           this.checkScriptSiblings(script);
-          result = inputJax[type].Translate(script);
+          result = inputJax[type].Process(script);
           if (typeof result === 'function') {
-            if (result.called) continue; // go back and call Translate() again
+            if (result.called) continue; // go back and call Process() again
             this.RestartAfter(result);
           }
           result.Attach(script,inputJax[type]);
@@ -1374,10 +1384,10 @@ MathJax.Hub = {
           throw Error("No output jax registered for "+jax.mimeType);
         }
         jax.outputJax = outputJax[jax.mimeType][0];
-        result = jax.outputJax.Translate(script);
+        result = jax.outputJax.Process(script);
         if (typeof result === 'function') {
           script.MathJax.state = STATE.UPDATE;
-          if (result.called) continue; // go back and call Translate() again
+          if (result.called) continue; // go back and call Process() again
           this.RestartAfter(result);
         }
         script.MathJax.state = STATE.PROCESSED;
@@ -1463,6 +1473,9 @@ MathJax.Hub.Startup = {
   //
   Config: function () {
     this.queue.Push(["Post",this.signal,"Begin Config"]);
+    //
+    //  Check for user cookie configuration
+    //
     var user = MathJax.HTML.Cookie.Get("user");
     if (user.URL || user.Config) {
       if (confirm(
@@ -1474,24 +1487,38 @@ MathJax.Hub.Startup = {
         if (user.Config) {MathJax.userConfig = new Function(user.Config)}
       } else {MathJax.HTML.Cookie.Set("user",{})}
     }
+    //
+    //  Run the configuration script, if any
+    //  Then load the config files specified in the parameters
+    //  If neither of the above, load the default configuration file
+    //
+    var loadDefault = true;
     if (this.script.match(/\S/)) {
       this.queue.Push(this.script+";\n1;");
-    } else if (this.params && this.params.config) {
+      loadDefault = false;
+    }
+    if (this.params && this.params.config) {
       var files = this.params.config.split(/,/);
       for (var i = 0, m = files.length; i < m; i++) {
         if (!files[i].match(/\.js$/)) {files[i] += ".js"}
         this.queue.Push(["Require",MathJax.Ajax,this.URL("config",files[i])]);
       }
-    } else {
+      loadDefault = false;
+    }
+    if (loadDefault) {
       this.queue.Push(["Require",MathJax.Ajax,this.URL("config","MathJax.js")]);
     }
-    return this.queue.Push(
+    //
+    //  Delay the startup, if requested,
+    //  then load the files in the configuration's config array
+    //
+    this.queue.Push(
       [function (config,onload) {
         if (config.delayStartupUntil.isCallback) {return config.delayStartupUntil}
         if (config.delayStartupUntil === "onload") {return onload}
         return function () {};
       }, MathJax.Hub.config, this.onload],
-      // use a function here since MathJax.Hub.config.config might change in MathJax.js above
+      // use a function here since MathJax.Hub.config.config might change in files loaded above
       [function (THIS) {return THIS.loadArray(MathJax.Hub.config.config,"config",null,true)},this],
       ["Post",this.signal,"End Config"]
     );
@@ -1652,11 +1679,12 @@ MathJax.Hub.Startup = {
       cObject.Augment(null,cdef);
       return this;
     },
-    Translate: function (element) {
+    Process: function (element) {
-      this.constructor.prototype.Translate = this.noTranslate;
+      var load = AJAX.Require(this.directory+"/"+this.JAXFILE);
-      return AJAX.Require(this.directory+"/"+this.JAXFILE);
+      if (!load.called) {this.constructor.prototype.Process = function (element) {return load}}
+      return load;
     },
-    noTranslate: function (element) {
+    Translate: function (element) {
       throw Error(this.directory+"/"+this.JAXFILE+" failed to redefine the Translate() method");
     },
     Register: function (mimetype) {},
@@ -1682,6 +1710,7 @@ MathJax.Hub.Startup = {
         queue.Push(["Post",HUB.Startup.signal,this.id+" Jax Startup"]);
         queue.Push(["Startup",this]);
         queue.Push(["Post",HUB.Startup.signal,this.id+" Jax Ready"]);
+        queue.Push([function (THIS) {THIS.Process = THIS.Translate},this.constructor.prototype]);
         return queue.Push(["loadComplete",AJAX,this.directory+"/"+file]);
       }
     }
@@ -1696,9 +1725,7 @@ MathJax.Hub.Startup = {
 
   BASE.InputJax = JAX.Subclass({
     elementJax: "mml",  // the element jax to load for this input jax
-    Translate: function (element) {
+    Process: function (element) {
-      // Make Translate produce an error message until the true one is loaded
-      this.constructor.prototype.Translate = this.noTranslate;
       var queue = CALLBACK.Queue();
       // Load any needed element jax
       var jax = this.elementJax; if (!(jax instanceof Array)) {jax = [jax]}
@@ -1710,7 +1737,8 @@ MathJax.Hub.Startup = {
         queue.Push(AJAX.Require(file));
       }
       // Load the input jax
-      queue.Push(AJAX.Require(this.directory+"/"+this.JAXFILE));
+      var load = queue.Push(AJAX.Require(this.directory+"/"+this.JAXFILE));
+      if (!load.called) {this.constructor.prototype.Process = function () {return load}}
       // Load the associated output jax
       jax = HUB.config.outputJax["jax/"+jax[0]];
       if (jax) {queue.Push(AJAX.Require(jax[0].directory+"/"+this.JAXFILE))}

unpacked/config/MMLorHTML.js

@@ -47,7 +47,7 @@
  */
 
 (function (HUB) {
-  var VERSION = "1.0";
+  var VERSION = "1.0.1";
   
   var CONFIG = MathJax.Hub.Insert({
     prefer: {MSIE:"MML", Firefox:"MML", Opera:"HTML", other:"HTML"}
@@ -76,8 +76,13 @@
                 CONFIG.prefer);
 
   if (canUseHTML || canUseMML) {
-    if (canUseMML && (prefer === "MML" || !canUseHTML))
+    if (canUseMML && (prefer === "MML" || !canUseHTML)) {
-      {HUB.config.jax.unshift("output/NativeMML")} else {HUB.config.jax.unshift("output/HTML-CSS")}
+      if (MathJax.OutputJax.NativeMML) {MathJax.OutputJax.NativeMML.Register("jax/mml")}
+        else {HUB.config.jax.unshift("output/NativeMML")}
+    } else {
+      if (MathJax.OutputJax["HTML-CSS"]) {MathJax.OutputJax["HTML-CSS"].Register("jax/mml")}
+        else {HUB.config.jax.unshift("output/HTML-CSS")}
+    }
   } else {
     HUB.PreProcess.disabled = true;
     HUB.prepareScripts.disabled = true;

unpacked/jax/output/HTML-CSS/config.js

@@ -24,7 +24,7 @@
 
 MathJax.OutputJax["HTML-CSS"] = MathJax.OutputJax({
   id: "HTML-CSS",
-  version: "1.0.5",
+  version: "1.0.6",
   directory: MathJax.OutputJax.directory + "/HTML-CSS",
   extensionDir: MathJax.OutputJax.extensionDir + "/HTML-CSS",
   autoloadDir: MathJax.OutputJax.directory + "/HTML-CSS/autoload",
@@ -70,7 +70,9 @@ MathJax.OutputJax["HTML-CSS"] = MathJax.OutputJax({
     
   }
 });
-MathJax.OutputJax["HTML-CSS"].Register("jax/mml");
+
+if (!MathJax.Hub.config.delayJaxRegistration)
+  {MathJax.OutputJax["HTML-CSS"].Register("jax/mml")}
 
 (function (HUB,HTMLCSS) {
   var CONFIG;

unpacked/jax/output/HTML-CSS/jax.js

@@ -2107,8 +2107,13 @@
     //  (it would call HTMLCSS's Require routine, asking for the mml jax again)
     //  so wait until after the mml jax has finished processing.
     //  
+    //  We also need to wait for the onload handler to run, since the loadComplete
+    //  will call Config and Startup, which need to modify the body.
+    //
+    MathJax.Hub.Register.StartupHook("onLoad",function () {
       setTimeout(MathJax.Callback(["loadComplete",HTMLCSS,"jax.js"]),0);
     });
+  });
 
   //
   //  Handle browser-specific setup

unpacked/jax/output/NativeMML/config.js

@@ -24,7 +24,7 @@
 
 MathJax.OutputJax.NativeMML = MathJax.OutputJax({
   id: "NativeMML",
-  version: "1.0.2",
+  version: "1.0.3",
   directory: MathJax.OutputJax.directory + "/NativeMML",
   extensionDir: MathJax.OutputJax.extensionDir + "/NativeMML",
   
@@ -41,6 +41,8 @@ MathJax.OutputJax.NativeMML = MathJax.OutputJax({
     }
   }
 });
+
+if (!MathJax.Hub.config.delayJaxRegistration)
   MathJax.OutputJax.NativeMML.Register("jax/mml");
 
 (function (browser) {