Update SVG handling for v2.6 (fix up <text> element attributes, and don't need to set role any more

Author: dpvc

lib/mj-page.js

@@ -280,11 +280,6 @@ function ConfigureMathJax() {
                 div = HTML.Element("div",{className:"MathJax_SVG_Display"});
                 div.appendChild(span);
               }
-              //
-              //  Mark math for screen readers
-              //    (screen readers don't know about role="math" yet, so use "textbox" instead)
-              //
-              div.setAttribute("role","textbox"); div.setAttribute("aria-readonly","true");
               div.className += " MathJax_SVG_Processing";
               script.parentNode.insertBefore(div,script);
               //
@@ -313,11 +308,13 @@ function ConfigureMathJax() {
         SVG.BBOX.TEXT.Augment({
           Init: function (scale,text,def) {
             if (!def) {def = {}}; def.stroke = "none";
+            if (def["font-style"] === "") delete def["font-style"];
+            if (def["font-weight"] === "") delete def["font-weight"];
             this.SUPER(arguments).Init.call(this,def);
             SVG.addText(this.element,text);
             var bbox = {width: text.length * 8.5, height: 18, y: -12};
             scale *= 1000/SVG.em;
-            this.element.setAttribute("style","font-family: monospace");
+            this.element.setAttribute("font-family","monospace");
             this.element.setAttribute("transform","scale("+scale+") matrix(1 0 0 -1 0 0)");
             this.w = this.r = bbox.width*scale; this.l = 0;
             this.h = this.H = -bbox.y*scale;
@@ -599,11 +596,6 @@ function AdjustSVG() {
       nodes[i].removeAttribute("href");
     }
     //
-    //  Fix incorrect roles
-    //
-    nodes = document.querySelectorAll(".MathJax_SVG[role=textbox], .MathJax_SVG_Display[role=textbox]");
-    for (i = nodes.length-1; i >= 0; i--) nodes[i].setAttribute("role","math");
-    //
     //  Fix a problem with jsdom not setting width and height CSS.
     //
     nodes = document.querySelectorAll(".MathJax_SVG > span > span");

lib/mj-single.js

@@ -275,11 +275,6 @@ function ConfigureMathJax() {
                 div = HTML.Element("div",{className:"MathJax_SVG_Display"});
                 div.appendChild(span);
               }
-              //
-              //  Mark math for screen readers
-              //    (screen readers don't know about role="math" yet, so use "textbox" instead)
-              //
-              div.setAttribute("role","textbox"); div.setAttribute("aria-readonly","true");
               div.className += " MathJax_SVG_Processing";
               script.parentNode.insertBefore(div,script);
               //
@@ -308,11 +303,13 @@ function ConfigureMathJax() {
         SVG.BBOX.TEXT.Augment({
           Init: function (scale,text,def) {
             if (!def) {def = {}}; def.stroke = "none";
+            if (def["font-style"] === "") delete def["font-style"];
+            if (def["font-weight"] === "") delete def["font-weight"];
             this.SUPER(arguments).Init.call(this,def);
             SVG.addText(this.element,text);
             var bbox = {width: text.length * 8.5, height: 18, y: -12};
             scale *= 1000/SVG.em;
-            this.element.setAttribute("style","font-family: monospace");
+            this.element.setAttribute("font-family","monospace");
             this.element.setAttribute("transform","scale("+scale+") matrix(1 0 0 -1 0 0)");
             this.w = this.r = bbox.width*scale; this.l = 0;
             this.h = this.H = -bbox.y*scale;