www

commit 9be0bfa9a71fe14b30825101a313b1013b7f1b61
parent 58ce73bfd8e4dd5f0e02229b660f67ecea9cecea
Author: Davide P. Cervone <dpvc@union.edu>
Date:   Sat,  1 Jan 2011 16:40:16 -0500

Changes to make it possible to combine these into one large configuraiton file (In that case, MMLtoHTML should register the proper output jax, since both will be loaded)

Diffstat:
M
unpacked/config/MMLorHTML.js
 | 
11
++++++++---
M
unpacked/jax/output/HTML-CSS/config.js
 | 
6
++++--
M
unpacked/jax/output/NativeMML/config.js
 | 
6
++++--

3 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/unpacked/config/MMLorHTML.js b/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))
-      {HUB.config.jax.unshift("output/NativeMML")} else {HUB.config.jax.unshift("output/HTML-CSS")}
+    if (canUseMML && (prefer === "MML" || !canUseHTML)) {
+      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;
diff --git a/unpacked/jax/output/HTML-CSS/config.js b/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;
diff --git a/unpacked/jax/output/NativeMML/config.js b/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,7 +41,9 @@ MathJax.OutputJax.NativeMML = MathJax.OutputJax({
     }
   }
 });
-MathJax.OutputJax.NativeMML.Register("jax/mml");
+
+if (!MathJax.Hub.config.delayJaxRegistration)
+  MathJax.OutputJax.NativeMML.Register("jax/mml");
 
 (function (browser) {
   if (browser.isMSIE) {