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

Merge branch 'issue1211' into develop. Issue #1211.

Browse Source
This commit is contained in:
Davide P. Cervone 2015-07-23 08:06:54 -04:00
commit 414ae76423
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -103,7 +103,7 @@
// This should be removed when the web fonts are fixed. FIXME // This should be removed when the web fonts are fixed. FIXME
// //
var family = font.familyFixed || font.family; var family = font.familyFixed || font.family;
if (!family.match(/^(STIX|MathJax)|'/)) { if (!font.isWebFont && !family.match(/^(STIX|MathJax)|'/)) {
family = family.replace(/_/g," ").replace(/([a-z])([A-Z])/g,"$1 $2").replace(/ Jax/,"Jax") family = family.replace(/_/g," ").replace(/([a-z])([A-Z])/g,"$1 $2").replace(/ Jax/,"Jax")
+ "','" + family + "','" + family + "-"; + "','" + family + "','" + family + "-";
if (font.weight) {family += "Bold"}; if (font.style) {family += "Italic"} if (font.weight) {family += "Bold"}; if (font.style) {family += "Italic"}
@ -213,6 +213,7 @@
var type = HTMLCSS.allowWebFonts; var type = HTMLCSS.allowWebFonts;
var FONT = HTMLCSS.FONTDATA.FONTS[name]; var FONT = HTMLCSS.FONTDATA.FONTS[name];
if (HTMLCSS.msieFontCSSBug && !FONT.family.match(/-Web$/)) {FONT.family += "-Web"} if (HTMLCSS.msieFontCSSBug && !FONT.family.match(/-Web$/)) {FONT.family += "-Web"}
if (FONT.isWebFont) delete FONT.familyFixed;
var webfonts = HTMLCSS.webfontDir+"/"+type; var webfonts = HTMLCSS.webfontDir+"/"+type;
var dir = AJAX.fileURL(webfonts); var dir = AJAX.fileURL(webfonts);
var fullname = name.replace(/-b/,"-B").replace(/-i/,"-I").replace(/-Bold-/,"-Bold"); var fullname = name.replace(/-b/,"-B").replace(/-i/,"-I").replace(/-Bold-/,"-Bold");