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

Change CHTML-preview to FHTML-preview, and make it backward compatible.

Browse Source
This commit is contained in:
Davide P. Cervone 2015-08-05 17:53:27 -04:00
parent 425c9df6e9
commit 66cdd5fcab
15 changed files with 42 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
unpacked/config/AM_HTMLorMML-full.js
View File

@ -18,7 +18,7 @@
MathJax.Hub.Config({ MathJax.Hub.Config({
config: ["MMLorHTML.js"], config: ["MMLorHTML.js"],
extensions: ["asciimath2jax.js","MathEvents.js","MathZoom.js","MathMenu.js","toMathML.js","CHTML-preview.js"], extensions: ["asciimath2jax.js","MathEvents.js","MathZoom.js","MathMenu.js","toMathML.js","FHTML-preview.js"],
jax: ["input/AsciiMath","output/HTML-CSS","output/NativeMML","output/FastHTML"] jax: ["input/AsciiMath","output/HTML-CSS","output/NativeMML","output/FastHTML"]
}); });

2
unpacked/config/AM_HTMLorMML.js
View File

@ -18,7 +18,7 @@
MathJax.Hub.Config({ MathJax.Hub.Config({
config: ["MMLorHTML.js"], config: ["MMLorHTML.js"],
extensions: ["asciimath2jax.js","MathEvents.js","MathZoom.js","MathMenu.js","toMathML.js","CHTML-preview.js"], extensions: ["asciimath2jax.js","MathEvents.js","MathZoom.js","MathMenu.js","toMathML.js","FHTML-preview.js"],
jax: ["input/AsciiMath","output/HTML-CSS","output/NativeMML","output/FastHTML"] jax: ["input/AsciiMath","output/HTML-CSS","output/NativeMML","output/FastHTML"]
}); });

2
unpacked/config/Accessible-full.js
View File

@ -18,7 +18,7 @@
MathJax.Hub.Config({ MathJax.Hub.Config({
config: ["MMLorHTML.js"], config: ["MMLorHTML.js"],
extensions: ["tex2jax.js","mml2jax.js","MathEvents.js","MathZoom.js","MathMenu.js","toMathML.js","TeX/noErrors.js","TeX/noUndefined.js","TeX/AMSmath.js","TeX/AMSsymbols.js","CHTML-preview.js"], extensions: ["tex2jax.js","mml2jax.js","MathEvents.js","MathZoom.js","MathMenu.js","toMathML.js","TeX/noErrors.js","TeX/noUndefined.js","TeX/AMSmath.js","TeX/AMSsymbols.js","FHTML-preview.js"],
jax: ["input/TeX","input/MathML","output/HTML-CSS","output/NativeMML","output/FastHTML"], jax: ["input/TeX","input/MathML","output/HTML-CSS","output/NativeMML","output/FastHTML"],
menuSettings: { menuSettings: {
zoom: "Double-Click", zoom: "Double-Click",

2
unpacked/config/Accessible.js
View File

@ -18,7 +18,7 @@
MathJax.Hub.Config({ MathJax.Hub.Config({
config: ["MMLorHTML.js"], config: ["MMLorHTML.js"],
extensions: ["tex2jax.js","mml2jax.js","MathEvents.js","MathZoom.js","MathMenu.js","toMathML.js","TeX/noErrors.js","TeX/noUndefined.js","TeX/AMSmath.js","TeX/AMSsymbols.js","CHTML-preview.js"], extensions: ["tex2jax.js","mml2jax.js","MathEvents.js","MathZoom.js","MathMenu.js","toMathML.js","TeX/noErrors.js","TeX/noUndefined.js","TeX/AMSmath.js","TeX/AMSsymbols.js","FHTML-preview.js"],
jax: ["input/TeX","input/MathML","output/HTML-CSS","output/NativeMML","output/FastHTML"], jax: ["input/TeX","input/MathML","output/HTML-CSS","output/NativeMML","output/FastHTML"],
menuSettings: { menuSettings: {
zoom: "Double-Click", zoom: "Double-Click",

2
unpacked/config/MML_HTMLorMML-full.js
View File

@ -18,7 +18,7 @@
MathJax.Hub.Config({ MathJax.Hub.Config({
config: ["MMLorHTML.js"], config: ["MMLorHTML.js"],
extensions: ["mml2jax.js","MathEvents.js","MathZoom.js","MathMenu.js","toMathML.js","CHTML-preview.js"], extensions: ["mml2jax.js","MathEvents.js","MathZoom.js","MathMenu.js","toMathML.js","FHTML-preview.js"],
jax: ["input/MathML","output/HTML-CSS","output/NativeMML","output/CommonHTML"] jax: ["input/MathML","output/HTML-CSS","output/NativeMML","output/CommonHTML"]
}); });

2
unpacked/config/MML_HTMLorMML.js
View File

@ -18,7 +18,7 @@
MathJax.Hub.Config({ MathJax.Hub.Config({
config: ["MMLorHTML.js"], config: ["MMLorHTML.js"],
extensions: ["mml2jax.js","MathEvents.js","MathZoom.js","MathMenu.js","toMathML.js","CHTML-preview.js"], extensions: ["mml2jax.js","MathEvents.js","MathZoom.js","MathMenu.js","toMathML.js","FHTML-preview.js"],
jax: ["input/MathML","output/HTML-CSS","output/NativeMML","output/FastHTML"] jax: ["input/MathML","output/HTML-CSS","output/NativeMML","output/FastHTML"]
}); });

2
unpacked/config/TeX-AMS-MML_HTMLorMML-full.js
View File

@ -18,7 +18,7 @@
MathJax.Hub.Config({ MathJax.Hub.Config({
config: ["MMLorHTML.js"], config: ["MMLorHTML.js"],
extensions: ["tex2jax.js","mml2jax.js","MathEvents.js","MathZoom.js","MathMenu.js","toMathML.js","TeX/noErrors.js","TeX/noUndefined.js","TeX/AMSmath.js","TeX/AMSsymbols.js","CHTML-preview.js"], extensions: ["tex2jax.js","mml2jax.js","MathEvents.js","MathZoom.js","MathMenu.js","toMathML.js","TeX/noErrors.js","TeX/noUndefined.js","TeX/AMSmath.js","TeX/AMSsymbols.js","FHTML-preview.js"],
jax: ["input/TeX","input/MathML","output/HTML-CSS","output/NativeMML","output/FastHTML"] jax: ["input/TeX","input/MathML","output/HTML-CSS","output/NativeMML","output/FastHTML"]
}); });

2
unpacked/config/TeX-AMS-MML_HTMLorMML.js
View File

@ -18,7 +18,7 @@
MathJax.Hub.Config({ MathJax.Hub.Config({
config: ["MMLorHTML.js"], config: ["MMLorHTML.js"],
extensions: ["tex2jax.js","mml2jax.js","MathEvents.js","MathZoom.js","MathMenu.js","toMathML.js","TeX/noErrors.js","TeX/noUndefined.js","TeX/AMSmath.js","TeX/AMSsymbols.js","CHTML-preview.js"], extensions: ["tex2jax.js","mml2jax.js","MathEvents.js","MathZoom.js","MathMenu.js","toMathML.js","TeX/noErrors.js","TeX/noUndefined.js","TeX/AMSmath.js","TeX/AMSsymbols.js","FHTML-preview.js"],
jax: ["input/TeX","input/MathML","output/HTML-CSS","output/NativeMML","output/FastHTML"] jax: ["input/TeX","input/MathML","output/HTML-CSS","output/NativeMML","output/FastHTML"]
}); });

2
unpacked/config/TeX-AMS-MML_SVG-full.js
View File

@ -17,7 +17,7 @@
*/ */
MathJax.Hub.Config({ MathJax.Hub.Config({
extensions: ["tex2jax.js","mml2jax.js","MathEvents.js","MathZoom.js","MathMenu.js","toMathML.js","TeX/noErrors.js","TeX/noUndefined.js","TeX/AMSmath.js","TeX/AMSsymbols.js","CHTML-preview.js"], extensions: ["tex2jax.js","mml2jax.js","MathEvents.js","MathZoom.js","MathMenu.js","toMathML.js","TeX/noErrors.js","TeX/noUndefined.js","TeX/AMSmath.js","TeX/AMSsymbols.js","FHTML-preview.js"],
jax: ["input/TeX","input/MathML","output/SVG","output/FastHTML"] jax: ["input/TeX","input/MathML","output/SVG","output/FastHTML"]
}); });

2
unpacked/config/TeX-AMS-MML_SVG.js
View File

@ -17,7 +17,7 @@
*/ */
MathJax.Hub.Config({ MathJax.Hub.Config({
extensions: ["tex2jax.js","mml2jax.js","MathEvents.js","MathZoom.js","MathMenu.js","toMathML.js","TeX/noErrors.js","TeX/noUndefined.js","TeX/AMSmath.js","TeX/AMSsymbols.js","CHTML-preview.js"], extensions: ["tex2jax.js","mml2jax.js","MathEvents.js","MathZoom.js","MathMenu.js","toMathML.js","TeX/noErrors.js","TeX/noUndefined.js","TeX/AMSmath.js","TeX/AMSsymbols.js","FHTML-preview.js"],
jax: ["input/TeX","input/MathML","output/SVG","output/FastHTML"] jax: ["input/TeX","input/MathML","output/SVG","output/FastHTML"]
}); });

2
unpacked/config/TeX-AMS_HTML-full.js
View File

@ -17,7 +17,7 @@
*/ */
MathJax.Hub.Config({ MathJax.Hub.Config({
extensions: ["tex2jax.js","MathEvents.js","MathZoom.js","MathMenu.js","toMathML.js","TeX/noErrors.js","TeX/noUndefined.js","TeX/AMSmath.js","TeX/AMSsymbols.js","CHTML-preview.js"], extensions: ["tex2jax.js","MathEvents.js","MathZoom.js","MathMenu.js","toMathML.js","TeX/noErrors.js","TeX/noUndefined.js","TeX/AMSmath.js","TeX/AMSsymbols.js","FHTML-preview.js"],
jax: ["input/TeX","output/HTML-CSS","output/FastHTML"] jax: ["input/TeX","output/HTML-CSS","output/FastHTML"]
}); });

2
unpacked/config/TeX-AMS_HTML.js
View File

@ -17,7 +17,7 @@
*/ */
MathJax.Hub.Config({ MathJax.Hub.Config({
extensions: ["tex2jax.js","MathEvents.js","MathZoom.js","MathMenu.js","toMathML.js","TeX/noErrors.js","TeX/noUndefined.js","TeX/AMSmath.js","TeX/AMSsymbols.js","CHTML-preview.js"], extensions: ["tex2jax.js","MathEvents.js","MathZoom.js","MathMenu.js","toMathML.js","TeX/noErrors.js","TeX/noUndefined.js","TeX/AMSmath.js","TeX/AMSsymbols.js","FHTML-preview.js"],
jax: ["input/TeX","output/HTML-CSS","output/FastHTML"] jax: ["input/TeX","output/HTML-CSS","output/FastHTML"]
}); });

2
unpacked/config/TeX-MML-AM_HTMLorMML-full.js
View File

@ -18,7 +18,7 @@
MathJax.Hub.Config({ MathJax.Hub.Config({
config: ["MMLorHTML.js"], config: ["MMLorHTML.js"],
extensions: ["tex2jax.js","mml2jax.js","asciimath2jax.js","MathEvents.js","MathZoom.js","MathMenu.js","toMathML.js","TeX/noErrors.js","TeX/noUndefined.js","TeX/AMSmath.js","TeX/AMSsymbols.js","CHTML-preview.js"], extensions: ["tex2jax.js","mml2jax.js","asciimath2jax.js","MathEvents.js","MathZoom.js","MathMenu.js","toMathML.js","TeX/noErrors.js","TeX/noUndefined.js","TeX/AMSmath.js","TeX/AMSsymbols.js","FHTML-preview.js"],
jax: ["input/TeX","input/MathML","input/AsciiMath","output/HTML-CSS","output/NativeMML","output/FastHTML"] jax: ["input/TeX","input/MathML","input/AsciiMath","output/HTML-CSS","output/NativeMML","output/FastHTML"]
}); });

2
unpacked/config/TeX-MML-AM_HTMLorMML.js
View File

@ -18,7 +18,7 @@
MathJax.Hub.Config({ MathJax.Hub.Config({
config: ["MMLorHTML.js"], config: ["MMLorHTML.js"],
extensions: ["tex2jax.js","mml2jax.js","asciimath2jax.js","MathEvents.js","MathZoom.js","MathMenu.js","toMathML.js","TeX/noErrors.js","TeX/noUndefined.js","TeX/AMSmath.js","TeX/AMSsymbols.js","CHTML-preview.js"], extensions: ["tex2jax.js","mml2jax.js","asciimath2jax.js","MathEvents.js","MathZoom.js","MathMenu.js","toMathML.js","TeX/noErrors.js","TeX/noUndefined.js","TeX/AMSmath.js","TeX/AMSsymbols.js","FHTML-preview.js"],
jax: ["input/TeX","input/MathML","input/AsciiMath","output/HTML-CSS","output/NativeMML","output/FastHTML"] jax: ["input/TeX","input/MathML","input/AsciiMath","output/HTML-CSS","output/NativeMML","output/FastHTML"]
}); });

51
unpacked/extensions/CHTML-preview.js → unpacked/extensions/FHTML-preview.js
View File

@ -3,9 +3,9 @@
/************************************************************* /*************************************************************
* *
* MathJax/extensions/CHTML-preview.js * MathJax/extensions/FHTML-preview.js
* *
* Implements a fast preview using the Common-HTML output jax * Implements a fast preview using the FastHTML output jax
* and then a slower update to the more accurate HTML-CSS output * and then a slower update to the more accurate HTML-CSS output
* (or whatever the user has selected). * (or whatever the user has selected).
* *
@ -29,15 +29,16 @@
(function (HUB,HTML) { (function (HUB,HTML) {
var SETTINGS = HUB.config.menuSettings; var SETTINGS = HUB.config.menuSettings;
var msieColorBug = MathJax.Hub.Browser.isMSIE && (document.documentMode||0) < 8;
var CHTMLpreview = MathJax.Extension["CHTML-preview"] = { var FHTMLpreview = MathJax.Extension["FHTML-preview"] = {
version: "2.5.0", version: "2.5.0",
// //
// Configuration for the chunking of the main output // Configuration for the chunking of the main output
// after the previews have been created, and other configuration. // after the previews have been created, and other configuration.
// //
config: HUB.CombineConfig("CHTML-preview",{ config: HUB.CombineConfig("FHTML-preview",{
Chunks: {EqnChunk: 10000, EqnChunkFactor: 1, EqnChunkDelay: 0}, Chunks: {EqnChunk: 10000, EqnChunkFactor: 1, EqnChunkDelay: 0},
color: "inherit!important", color: "inherit!important",
updateTime: 30, updateDelay: 6, updateTime: 30, updateDelay: 6,
@ -49,18 +50,21 @@
// Ajust the chunking of the output jax // Ajust the chunking of the output jax
// //
Config: function () { Config: function () {
if (HUB.config["CHTML-preview"])
MathJax.Hub.Config({"FHTML-preview": HUB.config["CHTML-preview"]});
HUB.Config({ HUB.Config({
"HTML-CSS": this.config.Chunks, "HTML-CSS": this.config.Chunks,
CommonHTML: this.config.Chunks,
SVG: this.config.Chunks SVG: this.config.Chunks
}); });
MathJax.Ajax.Styles({".MathJax_Preview .MJXc-math":{color:this.config.color}}); MathJax.Ajax.Styles({".MathJax_Preview .MJXf-math":{color:this.config.color}});
var update, delay, style, done, saved; var update, delay, style, done, saved;
var config = this.config; var config = this.config;
if (!config.disabled && SETTINGS.CHTMLpreview == null) if (!config.disabled && SETTINGS.FHTMLpreview == null)
HUB.Config({menuSettings:{CHTMLpreview:true}}); HUB.Config({menuSettings:{FHTMLpreview:true}});
HUB.Register.MessageHook("Begin Math Output",function () { HUB.Register.MessageHook("Begin Math Output",function () {
if (!done && SETTINGS.CHTMLpreview && SETTINGS.renderer !== "CommonHTML") { if (!done && SETTINGS.FHTMLpreview && SETTINGS.renderer !== "FastHTML") {
update = HUB.processUpdateTime; delay = HUB.processUpdateDelay; update = HUB.processUpdateTime; delay = HUB.processUpdateDelay;
style = HUB.config.messageStyle; style = HUB.config.messageStyle;
HUB.processUpdateTime = config.updateTime; HUB.processUpdateTime = config.updateTime;
@ -82,32 +86,33 @@
// //
// Insert a preview span, if there isn't one already, // Insert a preview span, if there isn't one already,
// and call the CommonHTML output jax to create the preview // and call the FastHTML output jax to create the preview
// //
Preview: function (data) { Preview: function (data) {
if (!SETTINGS.CHTMLpreview || SETTINGS.renderer === "CommonHTML") return; if (!SETTINGS.FHTMLpreview || SETTINGS.renderer === "FastHTML") return;
var preview = data.script.MathJax.preview || data.script.previousSibling; var preview = data.script.MathJax.preview || data.script.previousSibling;
if (!preview || preview.className !== MathJax.Hub.config.preRemoveClass) { if (!preview || preview.className !== MathJax.Hub.config.preRemoveClass) {
preview = HTML.Element("span",{className:MathJax.Hub.config.preRemoveClass}); preview = HTML.Element("span",{className:MathJax.Hub.config.preRemoveClass});
data.script.parentNode.insertBefore(preview,data.script); data.script.parentNode.insertBefore(preview,data.script);
data.script.MathJax.preview = preview; data.script.MathJax.preview = preview;
} }
preview.innerHTML = ""; preview.style.color = "inherit"; preview.innerHTML = "";
preview.style.color = (msieColorBug ? "black" : "inherit");
return this.postFilter(preview,data); return this.postFilter(preview,data);
}, },
postFilter: function (preview,data) { postFilter: function (preview,data) {
// //
// Load the CommonHTML jax if it is not already loaded // Load the FastHTML jax if it is not already loaded
// //
if (!data.math.root.toCommonHTML) { if (!data.math.root.toFastHTML) {
var queue = MathJax.Callback.Queue(); var queue = MathJax.Callback.Queue();
queue.Push( queue.Push(
["Require",MathJax.Ajax,"[MathJax]/jax/output/CommonHTML/config.js"], ["Require",MathJax.Ajax,"[MathJax]/jax/output/FastHTML/config.js"],
["Require",MathJax.Ajax,"[MathJax]/jax/output/CommonHTML/jax.js"] ["Require",MathJax.Ajax,"[MathJax]/jax/output/FastHTML/jax.js"]
); );
HUB.RestartAfter(queue.Push({})); HUB.RestartAfter(queue.Push({}));
} }
data.math.root.toCommonHTML(preview); data.math.root.toFastHTML(preview);
}, },
// //
@ -117,7 +122,7 @@
Register: function (name) { Register: function (name) {
HUB.Register.StartupHook(name+" Jax Require",function () { HUB.Register.StartupHook(name+" Jax Require",function () {
var jax = MathJax.InputJax[name]; var jax = MathJax.InputJax[name];
jax.postfilterHooks.Add(["Preview",MathJax.Extension["CHTML-preview"]],50); jax.postfilterHooks.Add(["Preview",MathJax.Extension["FHTML-preview"]],50);
}); });
} }
} }
@ -125,15 +130,15 @@
// //
// Hook into each input jax // Hook into each input jax
// //
CHTMLpreview.Register("TeX"); FHTMLpreview.Register("TeX");
CHTMLpreview.Register("MathML"); FHTMLpreview.Register("MathML");
CHTMLpreview.Register("AsciiMath"); FHTMLpreview.Register("AsciiMath");
HUB.Register.StartupHook("End Config",["Config",CHTMLpreview]); HUB.Register.StartupHook("End Config",["Config",FHTMLpreview]);
HUB.Startup.signal.Post("CHTML-preview Ready"); HUB.Startup.signal.Post("FHTML-preview Ready");
})(MathJax.Hub,MathJax.HTML); })(MathJax.Hub,MathJax.HTML);
MathJax.Ajax.loadComplete("[MathJax]/extensions/CHTML-preview.js"); MathJax.Ajax.loadComplete("[MathJax]/extensions/FHTML-preview.js");