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

This commit is contained in:
Davide P. Cervone 2014-09-01 14:08:15 -04:00
commit 210d336e90
2 changed files with 3 additions and 3 deletions

View File

@ -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"}

View File

@ -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;