Merge branch 'issue826' into develop. Issue mathjax#826.

dpvc · Sep 1, 2014 · 210d336 · 210d336
2 parents e3cda76 + 3848ac3
commit 210d336
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/unpacked/jax/output/HTML-CSS/jax.js b/unpacked/jax/output/HTML-CSS/jax.js
@@ -2042,7 +2042,7 @@
         var text = this.data.join("").replace(/[\u2061-\u2064]/g,""); // remove invisibles
         if (remap) {text = remap(text,chars)}
         if (variant.fontInherit) {
-          var scale = Math.floor(100/HTMLCSS.scale+.5) + "%";
+          var scale = Math.floor(HTMLCSS.config.scale/HTMLCSS.scale+.5) + "%";
           HTMLCSS.addElement(span,"span",{style:{"font-size":scale}},[text]);
           if (variant.bold)   {span.lastChild.style.fontWeight = "bold"}
           if (variant.italic) {span.lastChild.style.fontStyle = "italic"}
@@ -2058,7 +2058,7 @@
         var text = this.toString().replace(/[\u2061-\u2064]/g,""); // remove invisibles
         if (remap) {text = remap(text,chars)}
         if (variant.fontInherit) {
-          var scale = Math.floor(100/HTMLCSS.scale+.5) + "%";
+          var scale = Math.floor(HTMLCSS.config.scale/HTMLCSS.scale+.5) + "%";
           HTMLCSS.addElement(span,"span",{style:{"font-size":scale}},[text]);
           if (variant.bold)   {span.lastChild.style.fontWeight = "bold"}
           if (variant.italic) {span.lastChild.style.fontStyle = "italic"}

diff --git a/unpacked/jax/output/SVG/jax.js b/unpacked/jax/output/SVG/jax.js
@@ -1528,7 +1528,7 @@
           variant = this.Get("mathvariant");
           if (variant === "monospace") {def["class"] = "MJX-monospace"}
             else if (variant.match(/sans-serif/)) {def["class"] = "MJX-sans-serif"}
-          svg.Add(BBOX.TEXT(scale,this.data.join(""),def)); svg.Clean();
+          svg.Add(BBOX.TEXT(scale*100/SVG.config.scale,this.data.join(""),def)); svg.Clean();
           this.SVGhandleColor(svg);
           this.SVGsaveData(svg);
           return svg;