Merge pull request #1 from dpvc/plainsource-patch

Remove unneeded code, add missing support for zoom, and adjust CSS

unpacked/jax/output/PlainSource/config.js

@@ -29,15 +29,15 @@ MathJax.OutputJax.PlainSource = MathJax.OutputJax({
   extensionDir: MathJax.OutputJax.extensionDir + "/PlainSource",
 
   config: {
-    matchFontHeight: false,   // try to match math font height to surrounding font?
-    scale: 100,              // scaling factor for all math
-    minScaleAdjust: 50,      // minimum scaling to adjust to surrounding text
-                             //  (since the code for that is a bit delicate)
-
     styles: {
-      "div.MathJax_PlainSource": {
+      ".MathJax_PlainSource_Display": {
         "text-align": "center",
-        margin: ".75em 0px"
+        margin: ".75em 0px",
+        "white-space":"pre"
+      },
+      ".MathJax_PlainSource_Display > span": {
+        display: "inline-block",
+        "text-align": "left"
       }
     }
   }

unpacked/jax/output/PlainSource/jax.js

@@ -24,28 +24,15 @@
 
 
 (function(AJAX, HUB, HTML, PlainSource) {
-  var MML;
 
   var EVENT, TOUCH, HOVER; // filled in later
 
-
   PlainSource.Augment({
     settings: HUB.config.menuSettings,
 
-    hideProcessedMath: false, // use display:none until all math is processed
-
-    maxStretchyParts: 1000, // limit the number of parts allowed for
-    // stretchy operators. See issue 366.
-
     Config: function() {
-      if (!this.require) {
+      if (!this.require) this.require = [];
-        this.require = []
-      }
       this.SUPER(arguments).Config.call(this);
-      var settings = this.settings;
-      if (settings.scale) {
-        this.config.scale = settings.scale
-      }
       this.require.push(MathJax.OutputJax.extensionDir + "/MathEvents.js");
     },
 
@@ -61,7 +48,7 @@
       this.Mouseover = HOVER.Mouseover;
       this.Mouseout = HOVER.Mouseout;
       this.Mousemove = HOVER.Mousemove;
-
+      return AJAX.Styles(this.config.styles);
     },
 
     preTranslate: function(state) {
@@ -79,7 +66,7 @@
         //
         prev = script.previousSibling;
         if (prev && String(prev.className).match(/^MathJax_PlainSource(_Display)?( MathJax_Processing)?$/)) {
-          prev.parentNode.removeChild(prev)
+          prev.parentNode.removeChild(prev);
         }
         //
         //  Add the span, and a div if in display mode,
@@ -105,7 +92,7 @@
           // Added for keyboard accessible menu.
           onkeydown: EVENT.Keydown,
           tabIndex: "0"
-        });
+        },[["span"]]);
         if (HUB.Browser.noContextMenu) {
           span.ontouchstart = TOUCH.start;
           span.ontouchend = TOUCH.end;
@@ -116,8 +103,6 @@
           });
           div.appendChild(span);
         }
-        //
-        div.className += " MathJax_Processing";
         script.parentNode.insertBefore(div, script);
       }
     },
@@ -151,73 +136,38 @@
           }
         }
       }
-      span.innerHTML = source;
+      jax.PlainSource.source = source;
-
+      HTML.addText(span.firstChild,source);
-      //
-      //  Put it in place, and remove the processing marker
-      //
-      div.className = div.className.split(/ /)[0];
-      //
-      //  Check if we are hiding the math until more is processed
-      //
-      if (this.hideProcessedMath) {
-        //
-        //  Hide the math and don't let its preview be removed
-        //
-        div.className += " MathJax_Processed";
-        if (script.MathJax.preview) {
-          jax.PlainSource.preview = script.MathJax.preview;
-          delete script.MathJax.preview;
-        }
-      }
     },
 
-    postTranslate: function(state) {
+    postTranslate: function(state) {},
-      var scripts = state.jax[this.id];
-      if (!this.hideProcessedMath) return;
-      for (var i = 0, m = scripts.length; i < m; i++) {
-        var script = scripts[i];
-        if (script && script.MathJax.elementJax) {
-          //
-          //  Remove the processed marker
-          //
-          script.previousSibling.className = script.previousSibling.className.split(/ /)[0];
-          var data = script.MathJax.elementJax.PlainSource;
-          //
-          //  Remove the preview, if any
-          //
-          if (data.preview) {
-            data.preview.innerHTML = "";
-            script.MathJax.preview = data.preview;
-            delete data.preview;
-          }
-        }
-      }
-    },
 
     getJaxFromMath: function(math) {
-      if (math.parentNode.className === "MathJax_PlainSource_Display") {
+      if (math.parentNode.className === "MathJax_PlainSource_Display") math = math.parentNode;
-        math = math.parentNode
+      do {math = math.nextSibling} while (math && math.nodeName.toLowerCase() !== "script");
-      }
-      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) {
+        if (jax.PlainSource.display) span = span.parentNode;
-          span = span.parentNode
-        }
         span.parentNode.removeChild(span);
       }
       delete jax.PlainSource;
-    },
+    }
-
 
   });