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

Simplify handling of new web fonts when selected by menu.

Browse Source
This commit is contained in:
Davide P. Cervone 2014-02-22 14:30:52 -05:00
parent 0d2dc7fe27
commit 4ea4816553
1 changed files with 31 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -350,27 +350,38 @@
maxStretchyParts: 1000, // limit the number of parts allowed for maxStretchyParts: 1000, // limit the number of parts allowed for
// stretchy operators. See issue 366. // stretchy operators. See issue 366.
fontName: {
TeXLocal: "TeX",
TeXWeb: ["","TeX"],
TeXImage: ["",""],
STIXLocal: ["STIX","STIX-Web"],
STIXWeb: "STIX-Web",
AsanaMathWeb: "Asana-Math",
GyrePagellaWeb: "Gyre-Pagella",
GyreTermesWeb: "Gyre-Termes",
LatinModernWeb: "Latin-Modern",
NeoEulerWeb: "Neo-Euler"
},
Config: function () { Config: function () {
if (!this.require) {this.require = []} if (!this.require) {this.require = []}
this.Font = FONTTEST(); this.Font = FONTTEST(); this.SUPER(arguments).Config.call(this);
this.SUPER(arguments).Config.call(this); var settings = this.settings; var settings = this.settings, config = this.config, font = settings.font;
if (this.adjustAvailableFonts) {this.adjustAvailableFonts(this.config.availableFonts)} if (this.adjustAvailableFonts) {this.adjustAvailableFonts(config.availableFonts)}
if (settings.scale) {this.config.scale = settings.scale} if (settings.scale) {config.scale = settings.scale}
if (settings.font && settings.font !== "Auto") { if (font && font !== "Auto" && this.fontName[font]) {
if (settings.font === "TeXLocal") {this.config.availableFonts = ["TeX"]; this.config.preferredFont = "TeX"; this.config.webFont = "TeX"} config.availableFonts = [];
else if (settings.font === "TeXWeb") {this.config.availableFonts = []; this.config.preferredFont = ""; this.config.webFont = "TeX"} if (this.fontName[font] instanceof Array) {
else if (settings.font === "TeXimage") {this.config.availableFonts = []; this.config.preferredFont = ""; this.config.webFont = ""} config.preferredFont = this.fontName[font][0];
else if (settings.font === "STIXlocal") {this.config.availableFonts = ["STIX"]; this.config.preferredFont = "STIX"; this.config.webFont = "STIX-Web"} config.webFont = this.fontName[font][1];
else if (settings.font === "STIXWeb") {this.config.availableFonts = []; this.config.preferredFont = ""; this.config.webFont = "STIX-Web"} } else {
else if (settings.font === "AsanaMathWeb") {this.config.availableFonts = []; this.config.preferredFont = ""; this.config.webFont = "Asana-Math"} config.preferredFont = config.webFont = this.fontName[font];
else if (settings.font === "GyrePagellaWeb") {this.config.availableFonts = []; this.config.preferredFont = ""; this.config.webFont = "Gyre-Pagella"}
else if (settings.font === "GyreTermesWeb") {this.config.availableFonts = []; this.config.preferredFont = ""; this.config.webFont = "Gyre-Termes"}
else if (settings.font === "LatinModernWeb") {this.config.availableFonts = []; this.config.preferredFont = ""; this.config.webFont = "Latin-Modern"}
else if (settings.font === "NeoEulerWeb") {this.config.availableFonts = []; this.config.preferredFont = ""; this.config.webFont = "Neo-Euler"}
} }
var font = this.Font.findFont(this.config.availableFonts,this.config.preferredFont); if (config.preferredFont) {config.availableFonts[0] = config.preferredFont}
if (!font && this.allowWebFonts) {font = this.config.webFont; if (font) {this.webFonts = true}} }
if (!font && this.config.imageFont) {font = this.config.imageFont; this.imgFonts = true} font = this.Font.findFont(config.availableFonts,config.preferredFont);
if (!font && this.allowWebFonts) {font = config.webFont; if (font) {this.webFonts = true}}
if (!font && this.config.imageFont) {font = config.imageFont; this.imgFonts = true}
if (font) { if (font) {
this.fontInUse = font; this.fontDir += "/" + font; this.webfontDir += "/" + font; this.fontInUse = font; this.fontDir += "/" + font; this.webfontDir += "/" + font;
this.require.push(this.fontDir+"/fontdata.js"); this.require.push(this.fontDir+"/fontdata.js");
@ -460,6 +471,8 @@
// Safari/Windows doesn't display Plane1, // Safari/Windows doesn't display Plane1,
// so disable STIX for these browsers. // so disable STIX for these browsers.
// //
// ### FIXME ### Do we need to disable the other web fonts for these?
//
for (var i = 0, m = fonts.length; i < m; i++) for (var i = 0, m = fonts.length; i < m; i++)
{if (fonts[i] === "STIX") {fonts.splice(i,1); m--; i--;}} {if (fonts[i] === "STIX") {fonts.splice(i,1); m--; i--;}}
if (this.config.preferredFont === "STIX") {this.config.preferredFont = fonts[0]} if (this.config.preferredFont === "STIX") {this.config.preferredFont = fonts[0]}