suzanne.soy/scribble-mathjax
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Better handle mathvariant for unknown/invalid values or values not supported by generic fonts.

Browse Source
This commit is contained in:
Frédéric Wang 2013-02-06 18:10:33 +01:00
parent 07c5ee1121
commit 65c9b8234e
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
unpacked/jax/output/HTML-CSS/jax.js
View File

@ -1,3 +1,5 @@
/* -*- Mode: Javascript; indent-tabs-mode:nil; js-indent-level: 2 -*- */
/* vim: set ts=2 et sw=2 tw=80: */
/************************************************************* /*************************************************************
* *
* MathJax/jax/output/HTML-CSS/jax.js * MathJax/jax/output/HTML-CSS/jax.js
@ -322,15 +324,15 @@
} }
} else { } else {
MathJax.Message.Set("Can't find a valid font using ["+this.config.availableFonts.join(", ")+"]",null,3000); MathJax.Message.Set("Can't find a valid font using ["+this.config.availableFonts.join(", ")+"]",null,3000);
this.fontInUse = "generic";
this.FONTDATA = { this.FONTDATA = {
TeX_factor: 1, baselineskip: 1.2, lineH: .8, lineD: .2, ffLineH: .8, TeX_factor: 1, baselineskip: 1.2, lineH: .8, lineD: .2, ffLineH: .8,
FONTS: {}, VARIANT: {normal: {fonts:[]}}, RANGES: [], FONTS: {},
DELIMITERS: {}, RULECHAR: 0x2D, REMAP: {} VARIANT: {
"normal": {fonts:[]}, "-generic-variant": {fonts:[]},
"-largeOp": {fonts:[]}, "-smallOp": {fonts:[]}
}, RANGES: [], DELIMITERS: {}, RULECHAR: 0x2D, REMAP: {}
}; };
if (MathJax.InputJax.TeX && MathJax.InputJax.TeX.Definitions) {
MathJax.InputJax.TeX.Definitions.macros.overline[1] = "002D";
MathJax.InputJax.TeX.Definitions.macros.underline[1] = "002D";
}
HUB.Startup.signal.Post("HTML-CSS Jax - no valid font"); HUB.Startup.signal.Post("HTML-CSS Jax - no valid font");
} }
this.require.push(MathJax.OutputJax.extensionDir+"/MathEvents.js"); this.require.push(MathJax.OutputJax.extensionDir+"/MathEvents.js");
@ -1847,6 +1849,11 @@
"sans-serif-bold-italic":MML.VARIANT.BOLDSANSSERIF "sans-serif-bold-italic":MML.VARIANT.BOLDSANSSERIF
}[variant]||variant; }[variant]||variant;
} }
if (!(variant in HTMLCSS.FONTDATA.VARIANT)) {
// If the mathvariant value is invalid or not supported by this
// font, fallback to normal. See issue 363.
variant = "normal";
}
return HTMLCSS.FONTDATA.VARIANT[variant]; return HTMLCSS.FONTDATA.VARIANT[variant];
} }
},{ },{

7
unpacked/jax/output/SVG/jax.js
View File

@ -1,3 +1,5 @@
/* -*- Mode: Javascript; indent-tabs-mode:nil; js-indent-level: 2 -*- */
/* vim: set ts=2 et sw=2 tw=80: */
/************************************************************* /*************************************************************
* *
* MathJax/jax/output/SVG/jax.js * MathJax/jax/output/SVG/jax.js
@ -1208,6 +1210,11 @@
"sans-serif-bold-italic":MML.VARIANT.BOLDSANSSERIF "sans-serif-bold-italic":MML.VARIANT.BOLDSANSSERIF
}[variant]||variant; }[variant]||variant;
} }
if (!(variant in SVG.FONTDATA.VARIANT)) {
// If the mathvariant value is invalid or not supported by this
// font, fallback to normal. See issue 363.
variant = "normal";
}
return SVG.FONTDATA.VARIANT[variant]; return SVG.FONTDATA.VARIANT[variant];
}, },