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

Move preProcess from base jax to OutputJax, since that is the only place it is used. Don't copy Translate and cousins for ElementJax. Properly handle the loader in InputJax (avoinds infinite lops if input jax fails to compile)

Browse Source
This commit is contained in:
Davide P. Cervone 2012-02-20 12:42:59 -05:00
parent 7ce521293c
commit 4fb5de2200
2 changed files with 37 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MathJax.js
View File

File diff suppressed because one or more lines are too long

59
unpacked/MathJax.js
View File

@ -366,7 +366,7 @@ MathJax.fileversion = "2.0";
}; };
// //
// An array of priorities hooks that are executed sequentially // An array of prioritized hooks that are executed sequentially
// with a given set of data. // with a given set of data.
// //
var HOOKS = MathJax.Object.Subclass({ var HOOKS = MathJax.Object.Subclass({
@ -590,6 +590,7 @@ MathJax.fileversion = "2.0";
BASE.Callback.ExecuteHooks = EXECUTEHOOKS; BASE.Callback.ExecuteHooks = EXECUTEHOOKS;
})("MathJax"); })("MathJax");
/**********************************************************/ /**********************************************************/
(function (BASENAME) { (function (BASENAME) {
@ -2033,17 +2034,8 @@ MathJax.Hub.Startup = {
cObject.Augment(null,cdef); cObject.Augment(null,cdef);
return this; return this;
}, },
preProcess: function (element) { Translate: function (script,state) {
var load, file = this.directory+"/"+this.JAXFILE; throw Error(this.directory+"/"+this.JAXFILE+" failed to define the Translate() method");
this.constructor.prototype.preProcess = function (element) {
if (!load.called) {return load}
throw Error(file+" failed to load properly");
}
load = AJAX.Require(file);
return load;
},
Translate: function (element) {
throw Error(this.directory+"/"+this.JAXFILE+" failed to redefine the Translate() method");
}, },
Register: function (mimetype) {}, Register: function (mimetype) {},
Config: function () { Config: function () {
@ -2067,13 +2059,17 @@ MathJax.Hub.Startup = {
[function (config,id) {return MathJax.Hub.Startup.loadArray(config.extensions,"extensions/"+id)},this.config||{},this.id], [function (config,id) {return MathJax.Hub.Startup.loadArray(config.extensions,"extensions/"+id)},this.config||{},this.id],
["Post",HUB.Startup.signal,this.id+" Jax Startup"], ["Post",HUB.Startup.signal,this.id+" Jax Startup"],
["Startup",this], ["Startup",this],
["Post",HUB.Startup.signal,this.id+" Jax Ready"], ["Post",HUB.Startup.signal,this.id+" Jax Ready"]
[function (THIS) {
THIS.preProcess = THIS.preTranslate;
THIS.Process = THIS.Translate;
THIS.postProcess = THIS.postTranslate;
},this.constructor.prototype]
); );
if (this.copyTranslate) {
queue.Push(
[function (THIS) {
THIS.preProcess = THIS.preTranslate;
THIS.Process = THIS.Translate;
THIS.postProcess = THIS.postTranslate;
},this.constructor.prototype]
);
}
return queue.Push(["loadComplete",AJAX,this.directory+"/"+file]); return queue.Push(["loadComplete",AJAX,this.directory+"/"+file]);
} }
} }
@ -2088,20 +2084,27 @@ MathJax.Hub.Startup = {
BASE.InputJax = JAX.Subclass({ BASE.InputJax = JAX.Subclass({
elementJax: "mml", // the element jax to load for this input jax elementJax: "mml", // the element jax to load for this input jax
Process: function (element) { copyTranslate: true,
var queue = CALLBACK.Queue(); Process: function (script,state) {
var queue = CALLBACK.Queue(), file;
// Load any needed element jax // Load any needed element jax
var jax = this.elementJax; if (!(jax instanceof Array)) {jax = [jax]} var jax = this.elementJax; if (!(jax instanceof Array)) {jax = [jax]}
for (var i = 0, m = jax.length; i < m; i++) { for (var i = 0, m = jax.length; i < m; i++) {
var file = BASE.ElementJax.directory+"/"+jax[i]+"/"+this.JAXFILE; file = BASE.ElementJax.directory+"/"+jax[i]+"/"+this.JAXFILE;
if (!this.require) {this.require = []} if (!this.require) {this.require = []}
else if (!(this.require instanceof Array)) {this.require = [this.require]}; else if (!(this.require instanceof Array)) {this.require = [this.require]};
this.require.push(file); // so Startup will wait for it to be loaded this.require.push(file); // so Startup will wait for it to be loaded
queue.Push(AJAX.Require(file)); queue.Push(AJAX.Require(file));
} }
// Load the input jax // Load the input jax
var load = queue.Push(AJAX.Require(this.directory+"/"+this.JAXFILE)); file = this.directory+"/"+this.JAXFILE;
if (!load.called) {this.constructor.prototype.Process = function () {return load}} var load = queue.Push(AJAX.Require(file));
if (!load.called) {
this.constructor.prototype.Process = function () {
if (!load.called) {return load}
throw Error(file+" failed to load properly");
}
}
// Load the associated output jax // Load the associated output jax
jax = HUB.outputJax["jax/"+jax[0]]; jax = HUB.outputJax["jax/"+jax[0]];
if (jax) {queue.Push(AJAX.Require(jax[0].directory+"/"+this.JAXFILE))} if (jax) {queue.Push(AJAX.Require(jax[0].directory+"/"+this.JAXFILE))}
@ -2125,6 +2128,16 @@ MathJax.Hub.Startup = {
/***********************************/ /***********************************/
BASE.OutputJax = JAX.Subclass({ BASE.OutputJax = JAX.Subclass({
copyTranslate: true,
preProcess: function (state) {
var load, file = this.directory+"/"+this.JAXFILE;
this.constructor.prototype.preProcess = function (state) {
if (!load.called) {return load}
throw Error(file+" failed to load properly");
}
load = AJAX.Require(file);
return load;
},
Register: function (mimetype) { Register: function (mimetype) {
var jax = HUB.outputJax; var jax = HUB.outputJax;
if (!jax[mimetype]) {jax[mimetype] = []} if (!jax[mimetype]) {jax[mimetype] = []}