mathjax-rails 2.5.1 → 2.6.1

data/vendor/mathjax/unpacked/jax/output/SVG/autoload/annotation-xml.js

@@ -25,7 +25,7 @@
  */
 
 MathJax.Hub.Register.StartupHook("SVG Jax Ready",function () {
-  var VERSION = "2.5.0";
+  var VERSION = "2.6.0";
   var MML = MathJax.ElementJax.mml,
       SVG = MathJax.OutputJax.SVG;
   var BBOX = SVG.BBOX;

data/vendor/mathjax/unpacked/jax/output/SVG/autoload/maction.js

@@ -25,7 +25,7 @@
  */
 
 MathJax.Hub.Register.StartupHook("SVG Jax Ready",function () {
-  var VERSION = "2.5.0";
+  var VERSION = "2.6.0";
   var MML = MathJax.ElementJax.mml,
       SVG = MathJax.OutputJax["SVG"];
   
@@ -49,6 +49,7 @@ MathJax.Hub.Register.StartupHook("SVG Jax Ready",function () {
       var selected = this.selected();
       if (selected.type == "null") {this.SVGsaveData(svg);return svg;}
       svg.Add(this.SVGdataStretched(this.Get("selection")-1,HW,D));
+      svg.removeable = false;
       this.SVGhandleHitBox(svg);
       this.SVGhandleSpace(svg);
       this.SVGhandleColor(svg);
@@ -56,10 +57,12 @@ MathJax.Hub.Register.StartupHook("SVG Jax Ready",function () {
       return svg;
     },
     SVGhandleHitBox: function (svg) {
-      var frame = SVG.addElement(svg.element,"rect",
+      var frame = SVG.Element("rect",
         {width:svg.w, height:svg.h+svg.d, y:-svg.d, fill:"none", "pointer-events":"all"});
+      svg.element.insertBefore(frame,svg.element.firstChild);
       var type = this.Get("actiontype");
-      if (this.SVGaction[type]) {this.SVGaction[type].call(this,svg,frame,this.Get("selection"))}
+      if (this.SVGaction[type])
+        {this.SVGaction[type].call(this,svg,svg.element,this.Get("selection"))}
     },
     SVGstretchH: MML.mbase.prototype.SVGstretchH,
     SVGstretchV: MML.mbase.prototype.SVGstretchV,

data/vendor/mathjax/unpacked/jax/output/SVG/autoload/menclose.js

@@ -25,7 +25,7 @@
  */
 
 MathJax.Hub.Register.StartupHook("SVG Jax Ready",function () {
-  var VERSION = "2.5.0";
+  var VERSION = "2.6.0";
   var MML = MathJax.ElementJax.mml,
       SVG = MathJax.OutputJax.SVG,
       BBOX = SVG.BBOX;

data/vendor/mathjax/unpacked/jax/output/SVG/autoload/mglyph.js

@@ -25,7 +25,7 @@
  */
 
 MathJax.Hub.Register.StartupHook("SVG Jax Ready",function () {
-  var VERSION = "2.5.0";
+  var VERSION = "2.6.0";
   var MML = MathJax.ElementJax.mml,
       SVG = MathJax.OutputJax.SVG,
       BBOX = SVG.BBOX,

data/vendor/mathjax/unpacked/jax/output/SVG/autoload/mmultiscripts.js

@@ -25,7 +25,7 @@
  */
 
 MathJax.Hub.Register.StartupHook("SVG Jax Ready",function () {
-  var VERSION = "2.5.0";
+  var VERSION = "2.6.0";
   var MML = MathJax.ElementJax.mml,
       SVG = MathJax.OutputJax.SVG;
   
@@ -100,14 +100,19 @@ MathJax.Hub.Register.StartupHook("SVG Jax Ready",function () {
       var sup, sub, BOX = [];
       var i = 1, m = this.data.length, W = 0;
       for (var k = 0; k < 4; k += 2) {
-        while (i < m && this.data[i].type !== "mprescripts") {
+        while (i < m && (this.data[i]||{}).type !== "mprescripts") {
+          var box = [null,null,null,null];
           for (var j = k; j < k+2; j++) {
-            if (this.data[i] && this.data[i].type !== "none") {
+            if (this.data[i] && this.data[i].type !== "none" && this.data[i].type !== "mprescripts") {
               if (!BOX[j]) {BOX[j] = SVG.BBOX.G()}
-              BOX[j].Add(this.data[i].toSVG().With({x:W}));
+              box[j] = this.data[i].toSVG();
             }
-            i++;
+            if ((this.data[i]||{}).type !== "mprescripts") i++;
           }
+          var isPre = (k === 2);
+          if (isPre) W += Math.max((box[k]||{w:0}).w,(box[k+1]||{w:0}).w);
+          if (box[k])   BOX[k].Add(box[k].With({x:W-(isPre?box[k].w:0)}));
+          if (box[k+1]) BOX[k+1].Add(box[k+1].With({x:W-(isPre?box[k+1].w:0)}));
           sub = BOX[k]||{w:0}; sup = BOX[k+1]||{w:0};
           sub.w = sup.w = W = Math.max(sub.w,sup.w);
         }

data/vendor/mathjax/unpacked/jax/output/SVG/autoload/ms.js

@@ -25,7 +25,7 @@
  */
 
 MathJax.Hub.Register.StartupHook("SVG Jax Ready",function () {
-  var VERSION = "2.5.0";
+  var VERSION = "2.6.0";
   var MML = MathJax.ElementJax.mml,
       SVG = MathJax.OutputJax.SVG;
   
@@ -33,17 +33,20 @@ MathJax.Hub.Register.StartupHook("SVG Jax Ready",function () {
     toSVG: function () {
       this.SVGgetStyles();
       var svg = this.SVG(); this.SVGhandleSpace(svg);
-      var values = this.getValues("lquote","rquote");
+      var values = this.getValues("lquote","rquote","mathvariant");
+      if (!this.hasValue("lquote") || values.lquote === '"') values.lquote = "\u201C";
+      if (!this.hasValue("rquote") || values.rquote === '"') values.rquote = "\u201D";
+      if (values.lquote === "\u201C" && values.mathvariant === "monospace") values.lquote = '"';
+      if (values.rquote === "\u201D" && values.mathvariant === "monospace") values.rquote = '"';
       var variant = this.SVGgetVariant(), scale = this.SVGgetScale();
-      var text = this.data.join("");  // FIXME:  handle mglyph?
-      svg.Add(this.SVGhandleVariant(variant,scale,values.lquote+text+values.rquote));
+      var text = values.lquote+this.data.join("")+values.rquote;  // FIXME:  handle mglyph?
+      svg.Add(this.SVGhandleVariant(variant,scale,text));
       svg.Clean();
       this.SVGhandleColor(svg);
       this.SVGsaveData(svg);
       return svg;
     }
   });
-  MML.ms.prototype.defaults.mathvariant = 'monospace';
   
   MathJax.Hub.Startup.signal.Post("SVG ms Ready");
   MathJax.Ajax.loadComplete(SVG.autoloadDir+"/ms.js");

data/vendor/mathjax/unpacked/jax/output/SVG/autoload/mtable.js

@@ -25,7 +25,7 @@
  */
 
 MathJax.Hub.Register.StartupHook("SVG Jax Ready",function () {
-  var VERSION = "2.5.0";
+  var VERSION = "2.6.0";
   var MML = MathJax.ElementJax.mml,
       SVG = MathJax.OutputJax.SVG,
       BBOX = SVG.BBOX;
@@ -205,9 +205,9 @@ MathJax.Hub.Register.StartupHook("SVG Jax Ready",function () {
 
         //  Get total width minus column spacing
         WW = SVG.length2em(values.width,mu);
-        for (i = 0, m = Math.min(J+1,CSPACE.length); i < m; i++) {WW -= CSPACE[i]}
+        for (i = 0, m = Math.min(J,CSPACE.length); i < m; i++) {WW -= CSPACE[i]}
         //  Determine individual column widths
-        WW /= J+1;
+        WW /= J;
         for (i = 0, m = Math.min(J+1,CWIDTH.length); i < m; i++) {W[i] = WW}
       } else {
         //
@@ -227,7 +227,7 @@ MathJax.Hub.Register.StartupHook("SVG Jax Ready",function () {
           if (WP > .98) {Wf = Wp/(Wt+Wp); WW = Wt + Wp} else {WW = Wt / (1-WP)}
         } else {
           WW = SVG.length2em(values.width,mu);
-          for (i = 0, m = Math.min(J+1,CSPACE.length); i < m; i++) {WW -= CSPACE[i]}
+          for (i = 0, m = Math.min(J,CSPACE.length); i < m; i++) {WW -= CSPACE[i]}
         }
         //  Determine the relative column widths
         for (i = 0, m = P.length; i < m; i++) {
@@ -331,17 +331,33 @@ MathJax.Hub.Register.StartupHook("SVG Jax Ready",function () {
         if (indent.indentshiftfirst !== MML.INDENTSHIFT.INDENTSHIFT) {indent.indentshift = indent.indentshiftfirst}
         if (indent.indentshift === "auto" || indent.indentshift === "") {indent.indentshift = "0"}
         var shift = SVG.length2em(indent.indentshift,mu,SVG.cwidth);
-        var labelshift = SVG.length2em(values.minlabelspacing,mu,SVG.cwidth);
-        if (this.displayIndent !== "0") {
-          var dIndent = SVG.length2em(this.displayIndent,mu,SVG.cwidth);
-          shift += (indent.indentAlign === MML.INDENTALIGN.RIGHT ? -dIndent: dIndent);
+        var labelspace = SVG.length2em(values.minlabelspacing,mu,SVG.cwidth);
+        var labelW = labelspace + C[LABEL].w, labelshift = 0, tw = svg.w;
+        var dIndent = SVG.length2em(this.displayIndent,mu,SVG.cwidth);
+        s = (CALIGN[LABEL] === MML.INDENTALIGN.RIGHT ? -1 : 1);
+        if (indent.indentalign === MML.INDENTALIGN.CENTER) {
+          var dx = (SVG.cwidth-tw)/2; shift += dIndent;
+          if (labelW + s*labelshift > dx + s*shift) {
+            indent.indentalign = CALIGN[LABEL];
+            shift = s*(labelW + s*labelshift); tw += labelW + Math.max(0,shift);
+          }
+        } else if (CALIGN[LABEL] === indent.indentalign) {
+          if (dIndent < 0) {labelshift = s*dIndent; dIndent = 0}
+          shift += s*dIndent; if (labelW > s*shift) shift = s*labelW; shift += labelshift;
+          tw += s*shift;
+        } else {
+          shift -= s*dIndent;
+          if (tw - s*shift + labelW > SVG.cwidth) {
+            shift = s*(tw + labelW - SVG.cwidth);
+            if (s*shift > 0) {tw = SVG.cwidth + s*shift; shift = 0}
+          }
         }
         var eqn = svg; svg = this.SVG();
-        svg.w = svg.r = SVG.cwidth; svg.hasIndent = true;
-        svg.Align(C[LABEL],CALIGN[LABEL],labelshift,0);
+        svg.hasIndent = true;
+        svg.w = svg.r = Math.max(tw,SVG.cwidth); 
+        svg.Align(C[LABEL],CALIGN[LABEL],0,0,labelshift);
         svg.Align(eqn,indent.indentalign,0,0,shift);
-        svg.tw += C[LABEL].w + shift +
-          (indent.indentalign === MML.INDENTALIGN.CENTER ? 8 : 4)*labelshift;
+        svg.tw = tw;
       }
       
       this.SVGsaveData(svg);

data/vendor/mathjax/unpacked/jax/output/SVG/autoload/multiline.js

@@ -25,7 +25,7 @@
  */
 
 MathJax.Hub.Register.StartupHook("SVG Jax Ready",function () {
-  var VERSION = "2.5.0";
+  var VERSION = "2.6.0";
   var MML = MathJax.ElementJax.mml,
       SVG = MathJax.OutputJax.SVG,
       BBOX = SVG.BBOX;

data/vendor/mathjax/unpacked/jax/output/SVG/config.js

@@ -27,7 +27,7 @@
 
 MathJax.OutputJax.SVG = MathJax.OutputJax({
   id: "SVG",
-  version: "2.5.0",
+  version: "2.6.1",
   directory: MathJax.OutputJax.directory + "/SVG",
   extensionDir: MathJax.OutputJax.extensionDir + "/SVG",
   autoloadDir: MathJax.OutputJax.directory + "/SVG/autoload",
@@ -36,7 +36,7 @@ MathJax.OutputJax.SVG = MathJax.OutputJax({
   config: {
     scale: 100, minScaleAdjust: 50, // global math scaling factor, and minimum adjusted scale factor
     font: "TeX",                    // currently the only font available
-    blacker: 10,                    // stroke-width to make fonts blacker
+    blacker: 1,                     // stroke-width to make fonts blacker
     mtextFontInherit: false,        // to make <mtext> be in page font rather than MathJax font
     undefinedFamily: "STIXGeneral,'Arial Unicode MS',serif",  // fonts to use for missing characters
 

data/vendor/mathjax/unpacked/jax/output/SVG/fonts/Asana-Math/fontdata-extra.js

@@ -20,7 +20,7 @@
  */
 
 (function (SVG) {
-  var VERSION = "2.5.0";
+  var VERSION = "2.6.0";
 
   var DELIMITERS = SVG.FONTDATA.DELIMITERS;
 

data/vendor/mathjax/unpacked/jax/output/SVG/fonts/Asana-Math/fontdata.js

@@ -21,7 +21,7 @@
 
 (function (SVG,MML,AJAX,HUB) {
 
-    var VERSION = "2.5.0";
+    var VERSION = "2.6.0";
 
   var ALPHABETS = "AsanaMathJax_Alphabets",
       ARROWS = "AsanaMathJax_Arrows",
@@ -460,6 +460,9 @@
           HW: [[885,MAIN], [1470,SIZE1], [2041,SIZE2], [2552,SIZE3], [2615,SIZE3,1.025]],
           stretch: {bot:[0x23A6,SYMBOLS], ext:[0x23A5,SYMBOLS]}
         },
+        0x2312: {alias: 0x23DC, dir:H},
+        0x2322: {alias: 0x23DC, dir:H},
+        0x2323: {alias: 0x23DD, dir:H},
         0x2329: {alias: 0x27E8, dir: V},
         0x232A: {alias: 0x27E9, dir: V},
         0x23AA:

data/vendor/mathjax/unpacked/jax/output/SVG/fonts/Gyre-Pagella/fontdata-extra.js

@@ -20,7 +20,7 @@
  */
 
 (function (SVG) {
-  var VERSION = "2.5.0";
+  var VERSION = "2.6.0";
 
   var DELIMITERS = SVG.FONTDATA.DELIMITERS;
 

data/vendor/mathjax/unpacked/jax/output/SVG/fonts/Gyre-Pagella/fontdata.js

@@ -21,7 +21,7 @@
 
 (function (SVG,MML,AJAX,HUB) {
 
-    var VERSION = "2.5.0";
+    var VERSION = "2.6.0";
 
   var ALPHABETS = "GyrePagellaMathJax_Alphabets",
       ARROWS = "GyrePagellaMathJax_Arrows",
@@ -539,6 +539,9 @@
           HW: [[820,MAIN], [980,SIZE1], [1172,SIZE2], [1402,SIZE3], [1678,SIZE4], [2009,SIZE5], [2408,SIZE6], [2612,SIZE6,1.085]],
           stretch: {bot:[0x23A6,SYMBOLS], ext:[0x23A5,SYMBOLS]}
         },
+        0x2312: {alias: 0x23DC, dir:H},
+        0x2322: {alias: 0x23DC, dir:H},
+        0x2323: {alias: 0x23DD, dir:H},
         0x2329:
         {
           dir: V,

data/vendor/mathjax/unpacked/jax/output/SVG/fonts/Gyre-Termes/fontdata-extra.js

@@ -20,7 +20,7 @@
  */
 
 (function (SVG) {
-  var VERSION = "2.5.0";
+  var VERSION = "2.6.0";
 
   var DELIMITERS = SVG.FONTDATA.DELIMITERS;
 

data/vendor/mathjax/unpacked/jax/output/SVG/fonts/Gyre-Termes/fontdata.js

@@ -21,7 +21,7 @@
 
 (function (SVG,MML,AJAX,HUB) {
 
-    var VERSION = "2.5.0";
+    var VERSION = "2.6.0";
 
   var ALPHABETS = "GyreTermesMathJax_Alphabets",
       ARROWS = "GyreTermesMathJax_Arrows",
@@ -539,6 +539,9 @@
           HW: [[818,MAIN], [979,SIZE1], [1171,SIZE2], [1402,SIZE3], [1678,SIZE4], [2011,SIZE5], [2410,SIZE6], [2780,SIZE6,1.154]],
           stretch: {bot:[0x23A6,SYMBOLS], ext:[0x23A5,SYMBOLS]}
         },
+        0x2312: {alias: 0x23DC, dir:H},
+        0x2322: {alias: 0x23DC, dir:H},
+        0x2323: {alias: 0x23DD, dir:H},
         0x2329:
         {
           dir: V,

data/vendor/mathjax/unpacked/jax/output/SVG/fonts/Latin-Modern/fontdata-extra.js

@@ -20,7 +20,7 @@
  */
 
 (function (SVG) {
-  var VERSION = "2.5.0";
+  var VERSION = "2.6.0";
 
   var DELIMITERS = SVG.FONTDATA.DELIMITERS;
 

data/vendor/mathjax/unpacked/jax/output/SVG/fonts/Latin-Modern/fontdata.js

@@ -21,7 +21,7 @@
 
 (function (SVG,MML,AJAX,HUB) {
 
-    var VERSION = "2.5.0";
+    var VERSION = "2.6.0";
 
   var ALPHABETS = "LatinModernMathJax_Alphabets",
       ARROWS = "LatinModernMathJax_Arrows",
@@ -536,6 +536,9 @@
           HW: [[1000,MAIN], [1100,SIZE1], [1200,SIZE2], [1450,SIZE3], [1800,SIZE4], [2100,SIZE5], [2400,SIZE6], [3000,SIZE7]],
           stretch: {bot:[0x23A6,SYMBOLS], ext:[0x23A5,SYMBOLS]}
         },
+        0x2312: {alias: 0x23DC, dir:H},
+        0x2322: {alias: 0x23DC, dir:H},
+        0x2323: {alias: 0x23DD, dir:H},
         0x2329:
         {
           dir: V,

data/vendor/mathjax/unpacked/jax/output/SVG/fonts/Neo-Euler/fontdata-extra.js

@@ -20,7 +20,7 @@
  */
 
 (function (SVG) {
-  var VERSION = "2.5.0";
+  var VERSION = "2.6.0";
 
   var DELIMITERS = SVG.FONTDATA.DELIMITERS;
 

data/vendor/mathjax/unpacked/jax/output/SVG/fonts/Neo-Euler/fontdata.js

@@ -21,7 +21,7 @@
 
 (function (SVG,MML,AJAX,HUB) {
 
-    var VERSION = "2.5.0";
+    var VERSION = "2.6.0";
 
   var ALPHABETS = "NeoEulerMathJax_Alphabets",
       ARROWS = "NeoEulerMathJax_Arrows",
@@ -398,6 +398,9 @@
           HW: [[980,MAIN], [1199,SIZE1], [1799,SIZE2], [1961,SIZE2,1.090], [2399,SIZE3], [2999,SIZE4]],
           stretch: {bot:[0x23A6,SYMBOLS], ext:[0x23A5,SYMBOLS]}
         },
+        0x2312: {alias: 0x23DC, dir:H},
+        0x2322: {alias: 0x23DC, dir:H},
+        0x2323: {alias: 0x23DD, dir:H},
         0x2329:
         {
           dir: V,

data/vendor/mathjax/unpacked/jax/output/SVG/fonts/STIX-Web/fontdata-extra.js

@@ -20,7 +20,7 @@
  */
 
 (function (SVG) {
-  var VERSION = "2.5.0";
+  var VERSION = "2.6.0";
 
   var DELIMITERS = SVG.FONTDATA.DELIMITERS;
 

data/vendor/mathjax/unpacked/jax/output/SVG/fonts/STIX-Web/fontdata.js

@@ -21,7 +21,7 @@
 
 (function (SVG,MML,AJAX,HUB) {
 
-    var VERSION = "2.5.0";
+    var VERSION = "2.6.0";
 
   var ALPHABETSBOLDITALIC = "STIXMathJax_Alphabets-bold-italic",
       ALPHABETSBOLD = "STIXMathJax_Alphabets-bold",
@@ -564,6 +564,9 @@
           HW: [[926,MAIN], [1230,SIZE1], [1350,SIZE1,1.098], [1845,SIZE2], [2460,SIZE3], [3075,SIZE4]],
           stretch: {bot:[0xE009,SIZE5], ext:[0xE00A,SIZE5]}
         },
+        0x2312: {alias: 0x23DC, dir:H},
+        0x2322: {alias: 0x23DC, dir:H},
+        0x2323: {alias: 0x23DD, dir:H},
         0x2329: {alias: 0x27E8, dir: V},
         0x232A: {alias: 0x27E9, dir: V},
         0x23AA: EXTRAV,

data/vendor/mathjax/unpacked/jax/output/SVG/fonts/TeX/fontdata-extra.js

@@ -25,7 +25,7 @@
  */
 
 (function (SVG) {
-  var VERSION = "2.5.0";
+  var VERSION = "2.6.0";
   
   var DELIMITERS = SVG.FONTDATA.DELIMITERS;
 

data/vendor/mathjax/unpacked/jax/output/SVG/fonts/TeX/fontdata.js

@@ -26,7 +26,7 @@
  */
 
 (function (SVG,MML,AJAX,HUB) {
-  var VERSION = "2.5.0";
+  var VERSION = "2.6.0";
   
   var MAIN   = "MathJax_Main",
       BOLD   = "MathJax_Main-bold",
@@ -565,6 +565,9 @@
         0x295F: EXTRAH, // rightwards harpoon with barb down from bar
         0x2960: EXTRAV, // up harpoon with barb left from bar
         0x2961: EXTRAV, // down harpoon with barb left from bar
+        0x2312: {alias: 0x23DC, dir:H}, // arc
+        0x2322: {alias: 0x23DC, dir:H}, // frown
+        0x2323: {alias: 0x23DD, dir:H}, // smile
         0x27F5: {alias: 0x2190, dir:H}, // long left arrow
         0x27F6: {alias: 0x2192, dir:H}, // long right arrow
         0x27F7: {alias: 0x2194, dir:H}, // long left-right arrow

data/vendor/mathjax/unpacked/jax/output/SVG/jax.js

@@ -34,6 +34,9 @@
   var XLINKNS = "http://www.w3.org/1999/xlink";
 
   SVG.Augment({
+    HFUZZ: 2,     // adjustments for height and depth of final svg element
+    DFUZZ: 2,     //   to get baselines right (fragile).
+    
     config: {
       styles: {
         ".MathJax_SVG": {
@@ -217,7 +220,9 @@
  	  className:"MathJax_SVG", 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
+	  onclick:EVENT.Click, ondblclick:EVENT.DblClick,
+          // Added for keyboard accessible menu.
+          onkeydown: EVENT.Keydown, tabIndex: HUB.getTabOrder(jax)
         });
 	if (HUB.Browser.noContextMenu) {
 	  span.ontouchstart = TOUCH.start;
@@ -477,19 +482,19 @@
     },
     
     Em: function (m) {
-      if (Math.abs(m) < .0006) {return "0em"}
+      if (Math.abs(m) < .0006) return "0";
       return m.toFixed(3).replace(/\.?0+$/,"") + "em";
     },
     Ex: function (m) {
-      m = Math.round(m / this.TeX.x_height * this.ex) / this.ex;  // try to use closest pixel size
-      if (Math.abs(m) < .0006) {return "0ex"}
+      m = m / this.TeX.x_height;
+      if (Math.abs(m) < .0006) return "0";
       return m.toFixed(3).replace(/\.?0+$/,"") + "ex";
     },
     Percent: function (m) {
       return (100*m).toFixed(1).replace(/\.?0+$/,"") + "%";
     },
     Fixed: function (m,n) {
-      if (Math.abs(m) < .0006) {return "0"}
+      if (Math.abs(m) < .0006) return "0";
       return m.toFixed(n||3).replace(/\.?0+$/,"");
     },
     length2em: function (length,mu,size) {
@@ -634,7 +639,7 @@
         }
       }
       if (text.length == 1 && font.skew && font.skew[n]) {svg.skew = font.skew[n]*1000}
-      if (svg.element.childNodes.length === 1) {
+      if (svg.element.childNodes.length === 1 && !svg.element.firstChild.getAttribute("x")) {
         svg.element = svg.element.firstChild;
         svg.removeable = false; svg.scale = scale;
       }
@@ -863,7 +868,10 @@
               else {svg.element.setAttribute("transform","translate("+Math.floor(svg.x)+","+Math.floor(svg.y)+")")}
           } else if (nodeName === "line" || nodeName === "polygon" ||
                      nodeName === "path" || nodeName === "a") {
-            svg.element.setAttribute("transform","translate("+Math.floor(svg.x)+","+Math.floor(svg.y)+")");
+            var transform = svg.element.getAttribute("transform") || "";
+            if (transform) transform = " "+transform;
+            transform = "translate("+Math.floor(svg.x)+","+Math.floor(svg.y)+")"+transform;
+            svg.element.setAttribute("transform",transform);
           } else {
             svg.element.setAttribute("x",Math.floor(svg.x/svg.scale));
             svg.element.setAttribute("y",Math.floor(svg.y/svg.scale));
@@ -1068,14 +1076,14 @@
 	var variant = this.SVGgetVariant();
         var svg = this.SVG(); this.SVGgetScale(svg);
         this.SVGhandleSpace(svg);
-	for (var i = 0, m = this.data.length; i < m; i++) {
+        for (var i = 0, m = this.data.length; i < m; i++) {
           if (this.data[i]) {
             var child = svg.Add(this.data[i].toSVG(variant,svg.scale),svg.w,0,true);
             if (child.skew) {svg.skew = child.skew}
           }
         }
         svg.Clean(); var text = this.data.join("");
-	if (svg.skew && text.length !== 1) {delete svg.skew}
+        if (svg.skew && text.length !== 1) {delete svg.skew}
         if (svg.r > svg.w && text.length === 1 && !variant.noIC)
           {svg.ic = svg.r - svg.w; svg.w = svg.r}
 	this.SVGhandleColor(svg);
@@ -1284,7 +1292,8 @@
 
       SVGgetVariant: function () {
 	var values = this.getValues("mathvariant","fontfamily","fontweight","fontstyle");
-	var variant = values.mathvariant; if (this.variantForm) {variant = "-TeX-variant"}
+	var variant = values.mathvariant;
+        if (this.variantForm) variant = "-"+SVG.fontInUse+"-variant";
         values.hasVariant = this.Get("mathvariant",true);  // null if not explicitly specified
         if (!values.hasVariant) {
           values.family = values.fontfamily;
@@ -1396,6 +1405,12 @@
       SVGlineBreaks: function () {return false}
       
     },{
+      SVGemptySVG: function () {
+        var svg = this.SVG();
+        svg.Clean();
+        this.SVGsaveData(svg);
+	return svg;
+      },
       SVGautoload: function () {
 	var file = SVG.autoloadDir+"/"+this.type+".js";
 	HUB.RestartAfter(AJAX.Require(file));
@@ -1456,7 +1471,7 @@
         //  Primes must come from another font
         //
         if (isScript && this.data.join("").match(/['`"\u00B4\u2032-\u2037\u2057]/))
-          {variant = SVG.FONTDATA.VARIANT["-TeX-variant"]}
+          {variant = SVG.FONTDATA.VARIANT["-"+SVG.fontInUse+"-variant"]}
         //
         //  Typeset contents
         //
@@ -1867,8 +1882,9 @@
       toSVG: function (HW,D) {
         this.SVGgetStyles();
 	var values = this.getValues("displaystyle","accent","accentunder","align");
-	if (!values.displaystyle && this.data[this.base] != null &&
-	    this.data[this.base].CoreMO().Get("movablelimits"))
+        var base = this.data[this.base];
+	if (!values.displaystyle && base != null &&
+	    (base.movablelimits || base.CoreMO().Get("movablelimits")))
 	      {return MML.msubsup.prototype.toSVG.call(this)}
         var svg = this.SVG(), scale = this.SVGgetScale(svg); this.SVGhandleSpace(svg);
 	var boxes = [], stretch = [], box, i, m, W = -SVG.BIGDIMEN, WW = W;
@@ -1894,8 +1910,8 @@
           if (boxes[i].w > WW) {WW = boxes[i].w}
         }}
         var t = SVG.TeX.rule_thickness * this.mscale;
-	var base = boxes[this.base] || {w:0, h:0, d:0, H:0, D:0, l:0, r:0, y:0, scale:scale};
 	var x, y, z1, z2, z3, dw, k, delta = 0;
+	base = boxes[this.base] || {w:0, h:0, d:0, H:0, D:0, l:0, r:0, y:0, scale:scale};
         if (base.ic) {delta = 1.3*base.ic + .05} // adjust faked IC to be more in line with expeted results
 	for (i = 0, m = this.data.length; i < m; i++) {
 	  if (this.data[i] != null) {
@@ -2063,30 +2079,33 @@
           //  Style the <svg> to get the right size and placement
           //
           var l = Math.max(-svg.l,0), r = Math.max(svg.r-svg.w,0);
-          var style = svg.element.style;
+          var style = svg.element.style, px = SVG.TeX.x_height/SVG.ex;
+          var H = (Math.ceil(svg.H/px)+1)*px+SVG.HFUZZ,  // round to pixels and add padding
+              D = (Math.ceil(svg.D/px)+1)*px+SVG.DFUZZ;
           svg.element.setAttribute("width",SVG.Ex(l+svg.w+r));
-          svg.element.setAttribute("height",SVG.Ex(svg.H+svg.D+2*SVG.em));
-          style.verticalAlign = SVG.Ex(-svg.D-2*SVG.em); // remove extra pixel added below plus padding from above
-          style.marginLeft = SVG.Ex(-l); style.marginRight = SVG.Ex(-r);
-          svg.element.setAttribute("viewBox",SVG.Fixed(-l,1)+" "+SVG.Fixed(-svg.H-SVG.em,1)+" "+
-                                             SVG.Fixed(l+svg.w+r,1)+" "+SVG.Fixed(svg.H+svg.D+2*SVG.em,1));
-          style.marginTop = style.marginBottom = "1px"; // 1px above and below to prevent lines from touching
+          svg.element.setAttribute("height",SVG.Ex(H+D));
+          style.verticalAlign = SVG.Ex(-D);
+          if (l) style.marginLeft = SVG.Ex(-l);
+          if (r) style.marginRight = SVG.Ex(-r);
+          svg.element.setAttribute("viewBox",SVG.Fixed(-l,1)+" "+SVG.Fixed(-H,1)+" "+
+                                             SVG.Fixed(l+svg.w+r,1)+" "+SVG.Fixed(H+D,1));
           //
           //  If there is extra height or depth, hide that
           //
-          if (svg.H > svg.h) {style.marginTop = SVG.Ex(svg.h-svg.H)}
-          if (svg.D > svg.d) {
-            style.marginBottom = SVG.Ex(svg.d-svg.D);
-            style.verticalAlign = SVG.Ex(-svg.d);
-          }
+	  if (svg.H > svg.h) style.marginTop = SVG.Ex(svg.h-H);
+	  if (svg.D > svg.d) {
+	    style.marginBottom = SVG.Ex(svg.d-D);
+	    style.verticalAlign = SVG.Ex(-svg.d);
+	  }
           //
           //  Add it to the MathJax span
           //
           var alttext = this.Get("alttext");
-          if (alttext && !svg.element.getAttribute("aria-label")) span.setAttribute("aria-label",alttext);
-          if (!svg.element.getAttribute("role")) span.setAttribute("role","math");
-//        span.setAttribute("tabindex",0);  // causes focus outline, so disable for now
-          span.appendChild(svg.element); svg.element = null;
+          if (alttext && !svg.element.getAttribute("aria-label")) svg.element.setAttribute("aria-label",alttext);
+          if (!svg.element.getAttribute("role")) svg.element.setAttribute("role","img");
+          svg.element.setAttribute("focusable","false");
+          span.appendChild(svg.element);
+          svg.element = null;
           //
           //  Handle indentalign and indentshift for single-line displays
           //
@@ -2105,7 +2124,7 @@
             if (shift) {
               HUB.Insert(style,({
                 left: {marginLeft: SVG.Ex(shift)},
-                right: {marginRight: SVG.Ex(-shift)},
+                right: {marginRight: SVG.Ex(-shift), marginLeft: SVG.Ex(Math.max(0,shift-(l+svg.w+r)))},
                 center: {marginLeft: SVG.Ex(shift), marginRight: SVG.Ex(-shift)}
               })[values.indentalign]);
             }
@@ -2133,6 +2152,14 @@
       }
     });
 
+    //
+    //  Make sure these don't generate output
+    //
+    MML.maligngroup.Augment({toSVG: MML.mbase.SVGemptySVG});
+    MML.malignmark.Augment({toSVG: MML.mbase.SVGemptySVG});
+    MML.mprescripts.Augment({toSVG: MML.mbase.SVGemptySVG});
+    MML.none.Augment({toSVG: MML.mbase.SVGemptySVG});
+
     //
     //  Loading isn't complete until the element jax is modified,
     //  but can't call loadComplete within the callback for "mml Jax Ready"