From 4d4db67ad0cf2714a6d39c8e7a603a25939cf225 Mon Sep 17 00:00:00 2001 From: "Davide P. Cervone" Date: Mon, 3 Mar 2014 18:33:12 -0500 Subject: [PATCH] Make testCollection properly mark STIX fonts as not having the style characters, and fix testing for STIX or MathJax at beginning of font names. --- unpacked/jax/output/HTML-CSS/jax.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/unpacked/jax/output/HTML-CSS/jax.js b/unpacked/jax/output/HTML-CSS/jax.js index c9d95f8be..8238d2fc9 100644 --- a/unpacked/jax/output/HTML-CSS/jax.js +++ b/unpacked/jax/output/HTML-CSS/jax.js @@ -74,6 +74,7 @@ var font = {testString: "() {} []"}; font.family = {TeX:"MathJax_Size1", STIX:"STIXSizeOneSym"}[name] || name.replace(/-(Math)?/,"")+"MathJax_Size1"; + if (name === "STIX") {font.noStyleChar = true} return this.testFont(font); }, @@ -92,7 +93,7 @@ // This should be removed when the web fonts are fixed. FIXME // var family = font.familyFixed || font.family; - if (!family.match(/$(STIX|MathJax)|'/)) { + if (!family.match(/^(STIX|MathJax)|'/)) { family = family.replace(/_/g," ").replace(/([a-z])([A-Z])/g,"$1 $2") + "','" + family + "-"; if (font.weight) {family += "Bold"}; if (font.style) {family += "Italic"} if (!font.weight && !font.style) {family += "Regular"}