From 66cdd5fcabf99f42959c72fea329bf861acbfc7e Mon Sep 17 00:00:00 2001 From: "Davide P. Cervone" Date: Wed, 5 Aug 2015 17:53:27 -0400 Subject: [PATCH] Change CHTML-preview to FHTML-preview, and make it backward compatible. --- unpacked/config/AM_HTMLorMML-full.js | 2 +- unpacked/config/AM_HTMLorMML.js | 2 +- unpacked/config/Accessible-full.js | 2 +- unpacked/config/Accessible.js | 2 +- unpacked/config/MML_HTMLorMML-full.js | 2 +- unpacked/config/MML_HTMLorMML.js | 2 +- unpacked/config/TeX-AMS-MML_HTMLorMML-full.js | 2 +- unpacked/config/TeX-AMS-MML_HTMLorMML.js | 2 +- unpacked/config/TeX-AMS-MML_SVG-full.js | 2 +- unpacked/config/TeX-AMS-MML_SVG.js | 2 +- unpacked/config/TeX-AMS_HTML-full.js | 2 +- unpacked/config/TeX-AMS_HTML.js | 2 +- unpacked/config/TeX-MML-AM_HTMLorMML-full.js | 2 +- unpacked/config/TeX-MML-AM_HTMLorMML.js | 2 +- .../{CHTML-preview.js => FHTML-preview.js} | 51 ++++++++++--------- 15 files changed, 42 insertions(+), 37 deletions(-) rename unpacked/extensions/{CHTML-preview.js => FHTML-preview.js} (68%) diff --git a/unpacked/config/AM_HTMLorMML-full.js b/unpacked/config/AM_HTMLorMML-full.js index d9c3e1dc2..9e3ea52b4 100644 --- a/unpacked/config/AM_HTMLorMML-full.js +++ b/unpacked/config/AM_HTMLorMML-full.js @@ -18,7 +18,7 @@ MathJax.Hub.Config({ 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"] }); diff --git a/unpacked/config/AM_HTMLorMML.js b/unpacked/config/AM_HTMLorMML.js index aa7308ab0..214776f46 100644 --- a/unpacked/config/AM_HTMLorMML.js +++ b/unpacked/config/AM_HTMLorMML.js @@ -18,7 +18,7 @@ MathJax.Hub.Config({ 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"] }); diff --git a/unpacked/config/Accessible-full.js b/unpacked/config/Accessible-full.js index 7a2a86396..9263415cf 100644 --- a/unpacked/config/Accessible-full.js +++ b/unpacked/config/Accessible-full.js @@ -18,7 +18,7 @@ MathJax.Hub.Config({ 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"], menuSettings: { zoom: "Double-Click", diff --git a/unpacked/config/Accessible.js b/unpacked/config/Accessible.js index d640355e3..ff9d30087 100644 --- a/unpacked/config/Accessible.js +++ b/unpacked/config/Accessible.js @@ -18,7 +18,7 @@ MathJax.Hub.Config({ 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"], menuSettings: { zoom: "Double-Click", diff --git a/unpacked/config/MML_HTMLorMML-full.js b/unpacked/config/MML_HTMLorMML-full.js index 917227d2e..2ca128056 100644 --- a/unpacked/config/MML_HTMLorMML-full.js +++ b/unpacked/config/MML_HTMLorMML-full.js @@ -18,7 +18,7 @@ MathJax.Hub.Config({ 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"] }); diff --git a/unpacked/config/MML_HTMLorMML.js b/unpacked/config/MML_HTMLorMML.js index 2d8f00b94..7eddadd35 100644 --- a/unpacked/config/MML_HTMLorMML.js +++ b/unpacked/config/MML_HTMLorMML.js @@ -18,7 +18,7 @@ MathJax.Hub.Config({ 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"] }); diff --git a/unpacked/config/TeX-AMS-MML_HTMLorMML-full.js b/unpacked/config/TeX-AMS-MML_HTMLorMML-full.js index 94d8d8995..139910692 100644 --- a/unpacked/config/TeX-AMS-MML_HTMLorMML-full.js +++ b/unpacked/config/TeX-AMS-MML_HTMLorMML-full.js @@ -18,7 +18,7 @@ MathJax.Hub.Config({ 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"] }); diff --git a/unpacked/config/TeX-AMS-MML_HTMLorMML.js b/unpacked/config/TeX-AMS-MML_HTMLorMML.js index 21125280e..612bcb01c 100644 --- a/unpacked/config/TeX-AMS-MML_HTMLorMML.js +++ b/unpacked/config/TeX-AMS-MML_HTMLorMML.js @@ -18,7 +18,7 @@ MathJax.Hub.Config({ 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"] }); diff --git a/unpacked/config/TeX-AMS-MML_SVG-full.js b/unpacked/config/TeX-AMS-MML_SVG-full.js index 2d50e3dda..50d6b33c1 100644 --- a/unpacked/config/TeX-AMS-MML_SVG-full.js +++ b/unpacked/config/TeX-AMS-MML_SVG-full.js @@ -17,7 +17,7 @@ */ 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"] }); diff --git a/unpacked/config/TeX-AMS-MML_SVG.js b/unpacked/config/TeX-AMS-MML_SVG.js index c5080d17f..bcc56b3ac 100644 --- a/unpacked/config/TeX-AMS-MML_SVG.js +++ b/unpacked/config/TeX-AMS-MML_SVG.js @@ -17,7 +17,7 @@ */ 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"] }); diff --git a/unpacked/config/TeX-AMS_HTML-full.js b/unpacked/config/TeX-AMS_HTML-full.js index 51952ab70..467a53ee3 100644 --- a/unpacked/config/TeX-AMS_HTML-full.js +++ b/unpacked/config/TeX-AMS_HTML-full.js @@ -17,7 +17,7 @@ */ 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"] }); diff --git a/unpacked/config/TeX-AMS_HTML.js b/unpacked/config/TeX-AMS_HTML.js index 36be30915..1b75c4dde 100644 --- a/unpacked/config/TeX-AMS_HTML.js +++ b/unpacked/config/TeX-AMS_HTML.js @@ -17,7 +17,7 @@ */ 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"] }); diff --git a/unpacked/config/TeX-MML-AM_HTMLorMML-full.js b/unpacked/config/TeX-MML-AM_HTMLorMML-full.js index 68d69f87b..61bc258d0 100644 --- a/unpacked/config/TeX-MML-AM_HTMLorMML-full.js +++ b/unpacked/config/TeX-MML-AM_HTMLorMML-full.js @@ -18,7 +18,7 @@ MathJax.Hub.Config({ 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"] }); diff --git a/unpacked/config/TeX-MML-AM_HTMLorMML.js b/unpacked/config/TeX-MML-AM_HTMLorMML.js index e97f3890c..22ebd5295 100644 --- a/unpacked/config/TeX-MML-AM_HTMLorMML.js +++ b/unpacked/config/TeX-MML-AM_HTMLorMML.js @@ -18,7 +18,7 @@ MathJax.Hub.Config({ 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"] }); diff --git a/unpacked/extensions/CHTML-preview.js b/unpacked/extensions/FHTML-preview.js similarity index 68% rename from unpacked/extensions/CHTML-preview.js rename to unpacked/extensions/FHTML-preview.js index a52ba5cde..1a29afb55 100644 --- a/unpacked/extensions/CHTML-preview.js +++ b/unpacked/extensions/FHTML-preview.js @@ -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 * (or whatever the user has selected). * @@ -29,15 +29,16 @@ (function (HUB,HTML) { 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", // // Configuration for the chunking of the main output // 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}, color: "inherit!important", updateTime: 30, updateDelay: 6, @@ -49,18 +50,21 @@ // Ajust the chunking of the output jax // Config: function () { + if (HUB.config["CHTML-preview"]) + MathJax.Hub.Config({"FHTML-preview": HUB.config["CHTML-preview"]}); HUB.Config({ "HTML-CSS": this.config.Chunks, + CommonHTML: 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 config = this.config; - if (!config.disabled && SETTINGS.CHTMLpreview == null) - HUB.Config({menuSettings:{CHTMLpreview:true}}); + if (!config.disabled && SETTINGS.FHTMLpreview == null) + HUB.Config({menuSettings:{FHTMLpreview:true}}); 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; style = HUB.config.messageStyle; HUB.processUpdateTime = config.updateTime; @@ -82,32 +86,33 @@ // // 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) { - if (!SETTINGS.CHTMLpreview || SETTINGS.renderer === "CommonHTML") return; + if (!SETTINGS.FHTMLpreview || SETTINGS.renderer === "FastHTML") return; var preview = data.script.MathJax.preview || data.script.previousSibling; if (!preview || preview.className !== MathJax.Hub.config.preRemoveClass) { preview = HTML.Element("span",{className:MathJax.Hub.config.preRemoveClass}); data.script.parentNode.insertBefore(preview,data.script); data.script.MathJax.preview = preview; } - preview.innerHTML = ""; preview.style.color = "inherit"; + preview.innerHTML = ""; + preview.style.color = (msieColorBug ? "black" : "inherit"); return this.postFilter(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(); queue.Push( - ["Require",MathJax.Ajax,"[MathJax]/jax/output/CommonHTML/config.js"], - ["Require",MathJax.Ajax,"[MathJax]/jax/output/CommonHTML/jax.js"] + ["Require",MathJax.Ajax,"[MathJax]/jax/output/FastHTML/config.js"], + ["Require",MathJax.Ajax,"[MathJax]/jax/output/FastHTML/jax.js"] ); HUB.RestartAfter(queue.Push({})); } - data.math.root.toCommonHTML(preview); + data.math.root.toFastHTML(preview); }, // @@ -117,7 +122,7 @@ Register: function (name) { HUB.Register.StartupHook(name+" Jax Require",function () { 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 // - CHTMLpreview.Register("TeX"); - CHTMLpreview.Register("MathML"); - CHTMLpreview.Register("AsciiMath"); + FHTMLpreview.Register("TeX"); + FHTMLpreview.Register("MathML"); + 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.Ajax.loadComplete("[MathJax]/extensions/CHTML-preview.js"); +MathJax.Ajax.loadComplete("[MathJax]/extensions/FHTML-preview.js");