From fc47ec0171393895af111cd8e0d25a5c4fc1e64c Mon Sep 17 00:00:00 2001
From: "Davide P. Cervone" <dpvc@union.edu>
Date: Sun, 21 Aug 2016 14:55:59 -0400
Subject: [PATCH] Properly scale elements with font-family specified.  Resolves
 issue #1594.

---
 unpacked/jax/output/CommonHTML/autoload/mmultiscripts.js | 2 +-
 unpacked/jax/output/CommonHTML/autoload/ms.js            | 2 +-
 unpacked/jax/output/CommonHTML/jax.js                    | 6 ++++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/unpacked/jax/output/CommonHTML/autoload/mmultiscripts.js b/unpacked/jax/output/CommonHTML/autoload/mmultiscripts.js
index 32f7d1cc9..338a59dc6 100644
--- a/unpacked/jax/output/CommonHTML/autoload/mmultiscripts.js
+++ b/unpacked/jax/output/CommonHTML/autoload/mmultiscripts.js
@@ -34,8 +34,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 2a276b7b6..c9c91371c 100644
--- a/unpacked/jax/output/CommonHTML/jax.js
+++ b/unpacked/jax/output/CommonHTML/jax.js
@@ -1386,8 +1386,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();
@@ -1543,6 +1543,8 @@
           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.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);
@@ -1817,8 +1819,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");