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)

This commit is contained in:
Davide P. Cervone 2011-01-01 16:40:16 -05:00
parent 58ce73bfd8
commit 9be0bfa9a7
3 changed files with 16 additions and 7 deletions

View File

@ -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;

View File

@ -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;

View File

@ -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) {