diff --git a/unpacked/jax/output/CommonHTML/autoload/mmultiscripts.js b/unpacked/jax/output/CommonHTML/autoload/mmultiscripts.js index c1477f2b6..a13026184 100644 --- a/unpacked/jax/output/CommonHTML/autoload/mmultiscripts.js +++ b/unpacked/jax/output/CommonHTML/autoload/mmultiscripts.js @@ -35,8 +35,8 @@ MathJax.Hub.Register.StartupHook("CommonHTML Jax Ready",function () { if (!stretch) { node = this.CHTMLcreateNode(node); this.CHTMLhandleStyle(node); - this.CHTMLhandleScale(node); this.CHTMLgetVariant(); + this.CHTMLhandleScale(node); } CHTML.BBOX.empty(this.CHTML); diff --git a/unpacked/jax/output/CommonHTML/autoload/ms.js b/unpacked/jax/output/CommonHTML/autoload/ms.js index 6bd344d3c..6216df664 100644 --- a/unpacked/jax/output/CommonHTML/autoload/ms.js +++ b/unpacked/jax/output/CommonHTML/autoload/ms.js @@ -37,8 +37,8 @@ MathJax.Hub.Register.StartupHook("CommonHTML Jax Ready",function () { // node = this.CHTMLcreateNode(node); this.CHTMLhandleStyle(node); - this.CHTMLhandleScale(node); this.CHTMLgetVariant(); + this.CHTMLhandleScale(node); CHTML.BBOX.empty(this.CHTML); // // Get the quotes to use diff --git a/unpacked/jax/output/CommonHTML/jax.js b/unpacked/jax/output/CommonHTML/jax.js index ccb6810c1..69c039a9a 100644 --- a/unpacked/jax/output/CommonHTML/jax.js +++ b/unpacked/jax/output/CommonHTML/jax.js @@ -1388,8 +1388,8 @@ if (!options) options = {}; node = this.CHTMLcreateNode(node); this.CHTML = CHTML.BBOX.empty(); this.CHTMLhandleStyle(node); - this.CHTMLhandleScale(node); if (this.isToken) this.CHTMLgetVariant(); + this.CHTMLhandleScale(node); var m = Math.max((options.minChildren||0),this.data.length); for (var i = 0; i < m; i++) this.CHTMLaddChild(node,i,options); if (!options.noBBox) this.CHTML.clean(); @@ -1545,6 +1545,9 @@ values.fontsize = this.removedStyles.fontSize; if (values.fontsize && !this.mathsize) values.mathsize = values.fontsize; if (values.mathsize !== 1) scale *= CHTML.length2em(values.mathsize,1,1); + var variant = this.CHTMLvariant; + if (variant && variant.style && variant.style["font-family"]) + scale *= (CHTML.config.scale/100)/CHTML.scale; this.CHTML.scale = scale; pscale = this.CHTML.rscale = scale/pscale; if (Math.abs(pscale-1) < .001) pscale = 1; if (node && pscale !== 1) node.style.fontSize = CHTML.Percent(pscale); @@ -1820,8 +1823,8 @@ toCommonHTML: function (node) { node = this.CHTMLcreateNode(node); this.CHTMLhandleStyle(node); - this.CHTMLhandleScale(node); this.CHTMLgetVariant(); + this.CHTMLhandleScale(node); CHTML.BBOX.empty(this.CHTML); var values = this.getValues("displaystyle","largeop");