commit b3f1a8afa6eced7276735a7dc1655354d7f6f094
parent 53bf45396fdfa53befaa8a25d2339f040b023080
Author: Davide P. Cervone <dpvc@union.edu>
Date: Tue, 29 Dec 2015 08:49:48 -0500
Merge pull request #1329 from pkra/pkra-jax
New PlainSource output jax by pkra
Diffstat:
3 files changed, 240 insertions(+), 4 deletions(-)
diff --git a/unpacked/extensions/MathMenu.js b/unpacked/extensions/MathMenu.js
@@ -42,7 +42,7 @@
[["MathMenu",id]].concat([].slice.call(arguments,1))
);
};
-
+
var isPC = HUB.Browser.isPC, isMSIE = HUB.Browser.isMSIE, isIE9 = ((document.documentMode||0) > 8);
var ROUND = (isPC ? null : "5px");
@@ -591,7 +591,7 @@
}
return -1;
}),
-
+
saveCookie: function () {HTML.Cookie.Set("menu",this.cookie)},
getCookie: function () {this.cookie = HTML.Cookie.Get("menu")}
@@ -1015,7 +1015,7 @@
*/
MENU.ITEM.RULE = MENU.ITEM.Subclass({
role: "separator",
-
+
Attributes: function(def) {
def = HUB.Insert({"aria-orientation": "vertical"}, def);
def = this.SUPER(arguments).Attributes.call(this, def);
@@ -1520,6 +1520,7 @@
ITEM.RADIO("Fast HTML", "renderer", {action: MENU.Renderer, value:"PreviewHTML"}),
ITEM.RADIO("MathML", "renderer", {action: MENU.Renderer, value:"NativeMML"}),
ITEM.RADIO("SVG", "renderer", {action: MENU.Renderer}),
+ ITEM.RADIO("PlainSource","renderer", {action: MENU.Renderer, value:"PlainSource"}),
ITEM.RULE(),
ITEM.CHECKBOX("Fast Preview", "FastPreview"),
ITEM.CHECKBOX("Assistive MathML", "assistiveMML", {hidden:!CONFIG.showAssistiveMML})
@@ -1613,7 +1614,7 @@
MENU.cookie.showAssistiveMML = CONFIG.showAssistiveMML = show; MENU.saveCookie();
MENU.menu.Find("Math Settings","Math Renderer","Assistive MathML").hidden = !show;
};
-
+
MathJax.Hub.Register.StartupHook("HTML-CSS Jax Ready",function () {
if (!MathJax.OutputJax["HTML-CSS"].config.imageFont)
{MENU.menu.Find("Math Settings","Font Preference","TeX (image)").disabled = true}
diff --git a/unpacked/jax/output/PlainSource/config.js b/unpacked/jax/output/PlainSource/config.js
@@ -0,0 +1,49 @@
+/*************************************************************
+ *
+ * MathJax/jax/output/PlainSource/config.js
+ *
+ * Initializes the PlainSource OutputJax (the main definition is in
+ * MathJax/jax/input/PlainSource/jax.js, which is loaded when needed).
+ *
+ * ---------------------------------------------------------------------
+ *
+ * Copyright (c) 2015 The MathJax Consortium
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+MathJax.OutputJax.PlainSource = MathJax.OutputJax({
+ id: "PlainSource",
+ version: "2.6.0-beta",
+ directory: MathJax.OutputJax.directory + "/PlainSource",
+ extensionDir: MathJax.OutputJax.extensionDir + "/PlainSource",
+
+ config: {
+ styles: {
+ ".MathJax_PlainSource_Display": {
+ "text-align": "center",
+ margin: ".75em 0px",
+ "white-space":"pre"
+ },
+ ".MathJax_PlainSource_Display > span": {
+ display: "inline-block",
+ "text-align": "left"
+ }
+ }
+ }
+});
+
+if (!MathJax.Hub.config.delayJaxRegistration)
+ MathJax.OutputJax.PlainSource.Register("jax/mml");
+
+MathJax.OutputJax.PlainSource.loadComplete("config.js");
diff --git a/unpacked/jax/output/PlainSource/jax.js b/unpacked/jax/output/PlainSource/jax.js
@@ -0,0 +1,186 @@
+/*************************************************************
+ *
+ * MathJax/jax/output/PlainSource/jax.js
+ *
+ * Implements the PlainSource OutputJax that displays whatever
+ * source there was, for assistive technology users who prefer this.
+ *
+ * ---------------------------------------------------------------------
+ *
+ * Copyright (c) 2015 The MathJax Consortium
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+(function(AJAX, HUB, HTML, PlainSource) {
+
+ var EVENT, TOUCH, HOVER; // filled in later
+
+ PlainSource.Augment({
+ settings: HUB.config.menuSettings,
+
+ Config: function() {
+ if (!this.require) this.require = [];
+ this.SUPER(arguments).Config.call(this);
+ this.require.push(MathJax.OutputJax.extensionDir + "/MathEvents.js");
+ },
+
+ Startup: function() {
+ //
+ // Set up event handling
+ //
+ EVENT = MathJax.Extension.MathEvents.Event;
+ TOUCH = MathJax.Extension.MathEvents.Touch;
+ HOVER = MathJax.Extension.MathEvents.Hover;
+ this.ContextMenu = EVENT.ContextMenu;
+ this.Mousedown = EVENT.AltContextMenu;
+ this.Mouseover = HOVER.Mouseover;
+ this.Mouseout = HOVER.Mouseout;
+ this.Mousemove = HOVER.Mousemove;
+ return AJAX.Styles(this.config.styles);
+ },
+
+ preTranslate: function(state) {
+ var scripts = state.jax[this.id],
+ i, m = scripts.length,
+ script, prev, span, div, jax;
+ //
+ // Loop through the scripts
+ //
+ for (i = 0; i < m; i++) {
+ script = scripts[i];
+ if (!script.parentNode) continue;
+ //
+ // Remove any existing output
+ //
+ prev = script.previousSibling;
+ if (prev && String(prev.className).match(/^MathJax_PlainSource(_Display)?( MathJax_Processing)?$/)) {
+ prev.parentNode.removeChild(prev);
+ }
+ //
+ // Add the span, and a div if in display mode,
+ // then set the role and mark it as being processed
+ //
+ jax = script.MathJax.elementJax;
+ if (!jax) continue;
+ jax.PlainSource = {
+ display: (jax.root.Get("display") === "block")
+ }
+ span = div = HTML.Element("span", {
+ className: "MathJax_PlainSource",
+ id: jax.inputID + "-Frame",
+ isMathJax: true,
+ jaxID: this.id,
+ oncontextmenu: EVENT.Menu,
+ onmousedown: EVENT.Mousedown,
+ onmouseover: EVENT.Mouseover,
+ onmouseout: EVENT.Mouseout,
+ onmousemove: EVENT.Mousemove,
+ onclick: EVENT.Click,
+ ondblclick: EVENT.DblClick,
+ // Added for keyboard accessible menu.
+ onkeydown: EVENT.Keydown,
+ tabIndex: "0"
+ },[["span"]]);
+ if (HUB.Browser.noContextMenu) {
+ span.ontouchstart = TOUCH.start;
+ span.ontouchend = TOUCH.end;
+ }
+ if (jax.PlainSource.display) {
+ div = HTML.Element("div", {
+ className: "MathJax_PlainSource_Display"
+ });
+ div.appendChild(span);
+ }
+ script.parentNode.insertBefore(div, script);
+ }
+ },
+
+ Translate: function(script, state) {
+ if (!script.parentNode) return;
+
+ //
+ // Get the data about the math
+ //
+ var jax = script.MathJax.elementJax,
+ math = jax.root,
+ span = document.getElementById(jax.inputID + "-Frame"),
+ div = (jax.PlainSource.display ? span.parentNode : span);
+ //
+ // Typeset the math
+ //
+ this.initPlainSource(math, span);
+ var source = jax.originalText;
+ if (jax.inputJax === "MathML") {
+ if ((jax.root.data[0].data.length > 0) && (jax.root.data[0].data[0].type === "semantics")) {
+ var annotations = jax.root.data[0].data[0].data;
+ for (var a = 0; a < annotations.length; a++){
+ if (annotations[a].attr.encoding === "application/x-tex"){
+ source = jax.root.data[0].data[0].data[a].data[0].data[0];
+ break;
+ }
+ if (annotations[a].attr.encoding === "text/x-asciimath") {
+ source = jax.root.data[0].data[0].data[a].data[0].data[0];
+ }
+ }
+ }
+ }
+ jax.PlainSource.source = source;
+ HTML.addText(span.firstChild,source);
+ },
+
+ postTranslate: function(state) {},
+
+ getJaxFromMath: function(math) {
+ if (math.parentNode.className === "MathJax_PlainSource_Display") math = math.parentNode;
+ do {math = math.nextSibling} while (math && math.nodeName.toLowerCase() !== "script");
+ return HUB.getJaxFor(math);
+ },
+
+ Zoom: function (jax,span,math,Mw,Mh) {
+ var pad = Math.round(span.parentNode.offsetWidth / 2);
+ span.style.whiteSpace = "pre";
+ HTML.addText(span,jax.PlainSource.source);
+ var mW = math.offsetWidth, mH = math.offsetHeight,
+ zW = span.offsetWidth, zH = span.offsetHeight;
+ var Y = -Math.round((zH+mH)/2) - (jax.PlainSource.display ? 0 : pad);
+ return {mW:mW, mH:mH, zW:zW, zH:zH, Y:Y};
+ },
+
+ initPlainSource: function(math, span) {},
+
+ Remove: function(jax) {
+ var span = document.getElementById(jax.inputID + "-Frame");
+ if (span) {
+ if (jax.PlainSource.display) span = span.parentNode;
+ span.parentNode.removeChild(span);
+ }
+ delete jax.PlainSource;
+ }
+
+ });
+
+ MathJax.Hub.Register.StartupHook("mml Jax Ready", function() {
+ MathJax.Hub.Register.StartupHook("onLoad", function() {
+ setTimeout(MathJax.Callback(["loadComplete", PlainSource, "jax.js"]), 0);
+ });
+ });
+
+ MathJax.Hub.Register.StartupHook("End Cookie", function() {
+ if (HUB.config.menuSettings.zoom !== "None") {
+ AJAX.Require("[MathJax]/extensions/MathZoom.js")
+ }
+ });
+
+})(MathJax.Ajax, MathJax.Hub, MathJax.HTML, MathJax.OutputJax.PlainSource);
