Skip to content

Properly scale elements with font-family specified. #1594 #1595

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 24, 2016
Merged

Properly scale elements with font-family specified. #1594 #1595

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fc47ec0
Properly scale elements with font-family specified. Resolves issue #…
dpvc Aug 21, 2016
aba0f46
Take the global scaling factor into account.
dpvc Aug 21, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion unpacked/jax/output/CommonHTML/autoload/mmultiscripts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion unpacked/jax/output/CommonHTML/autoload/ms.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 5 additions & 2 deletions unpacked/jax/output/CommonHTML/jax.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -1543,6 +1543,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);
Expand Down Expand Up @@ -1817,8 +1820,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");
Expand Down