diff --git a/fonts/CommonHTML/TeX/otf/MathJax_AMS-Regular.otf b/fonts/CommonHTML/TeX/otf/MathJax_AMS-Regular.otf
new file mode 100644
index 000000000..62078a75d
Binary files /dev/null and b/fonts/CommonHTML/TeX/otf/MathJax_AMS-Regular.otf differ
diff --git a/fonts/CommonHTML/TeX/otf/MathJax_Caligraphic-Bold.otf b/fonts/CommonHTML/TeX/otf/MathJax_Caligraphic-Bold.otf
new file mode 100644
index 000000000..e26380deb
Binary files /dev/null and b/fonts/CommonHTML/TeX/otf/MathJax_Caligraphic-Bold.otf differ
diff --git a/fonts/CommonHTML/TeX/otf/MathJax_Caligraphic-Regular.otf b/fonts/CommonHTML/TeX/otf/MathJax_Caligraphic-Regular.otf
new file mode 100644
index 000000000..3fcf0c186
Binary files /dev/null and b/fonts/CommonHTML/TeX/otf/MathJax_Caligraphic-Regular.otf differ
diff --git a/fonts/CommonHTML/TeX/otf/MathJax_Fraktur-Bold.otf b/fonts/CommonHTML/TeX/otf/MathJax_Fraktur-Bold.otf
new file mode 100644
index 000000000..7ed0efe5c
Binary files /dev/null and b/fonts/CommonHTML/TeX/otf/MathJax_Fraktur-Bold.otf differ
diff --git a/fonts/CommonHTML/TeX/otf/MathJax_Fraktur-Regular.otf b/fonts/CommonHTML/TeX/otf/MathJax_Fraktur-Regular.otf
new file mode 100644
index 000000000..1d8e3e3ea
Binary files /dev/null and b/fonts/CommonHTML/TeX/otf/MathJax_Fraktur-Regular.otf differ
diff --git a/fonts/CommonHTML/TeX/otf/MathJax_Main-Bold.otf b/fonts/CommonHTML/TeX/otf/MathJax_Main-Bold.otf
new file mode 100644
index 000000000..01dd29031
Binary files /dev/null and b/fonts/CommonHTML/TeX/otf/MathJax_Main-Bold.otf differ
diff --git a/fonts/CommonHTML/TeX/otf/MathJax_Main-Italic.otf b/fonts/CommonHTML/TeX/otf/MathJax_Main-Italic.otf
new file mode 100644
index 000000000..6578ddf24
Binary files /dev/null and b/fonts/CommonHTML/TeX/otf/MathJax_Main-Italic.otf differ
diff --git a/fonts/CommonHTML/TeX/otf/MathJax_Main-Regular.otf b/fonts/CommonHTML/TeX/otf/MathJax_Main-Regular.otf
new file mode 100644
index 000000000..38e46c390
Binary files /dev/null and b/fonts/CommonHTML/TeX/otf/MathJax_Main-Regular.otf differ
diff --git a/fonts/CommonHTML/TeX/otf/MathJax_Math-BoldItalic.otf b/fonts/CommonHTML/TeX/otf/MathJax_Math-BoldItalic.otf
new file mode 100644
index 000000000..c0a12ee9c
Binary files /dev/null and b/fonts/CommonHTML/TeX/otf/MathJax_Math-BoldItalic.otf differ
diff --git a/fonts/CommonHTML/TeX/otf/MathJax_Math-Italic.otf b/fonts/CommonHTML/TeX/otf/MathJax_Math-Italic.otf
new file mode 100644
index 000000000..02dc35d6a
Binary files /dev/null and b/fonts/CommonHTML/TeX/otf/MathJax_Math-Italic.otf differ
diff --git a/fonts/CommonHTML/TeX/otf/MathJax_Math-Regular.otf b/fonts/CommonHTML/TeX/otf/MathJax_Math-Regular.otf
new file mode 100644
index 000000000..8f8cec49e
Binary files /dev/null and b/fonts/CommonHTML/TeX/otf/MathJax_Math-Regular.otf differ
diff --git a/fonts/CommonHTML/TeX/otf/MathJax_SansSerif-Bold.otf b/fonts/CommonHTML/TeX/otf/MathJax_SansSerif-Bold.otf
new file mode 100644
index 000000000..5cb180919
Binary files /dev/null and b/fonts/CommonHTML/TeX/otf/MathJax_SansSerif-Bold.otf differ
diff --git a/fonts/CommonHTML/TeX/otf/MathJax_SansSerif-Italic.otf b/fonts/CommonHTML/TeX/otf/MathJax_SansSerif-Italic.otf
new file mode 100644
index 000000000..ed0bafe2b
Binary files /dev/null and b/fonts/CommonHTML/TeX/otf/MathJax_SansSerif-Italic.otf differ
diff --git a/fonts/CommonHTML/TeX/otf/MathJax_SansSerif-Regular.otf b/fonts/CommonHTML/TeX/otf/MathJax_SansSerif-Regular.otf
new file mode 100644
index 000000000..739502be4
Binary files /dev/null and b/fonts/CommonHTML/TeX/otf/MathJax_SansSerif-Regular.otf differ
diff --git a/fonts/CommonHTML/TeX/otf/MathJax_Script-Regular.otf b/fonts/CommonHTML/TeX/otf/MathJax_Script-Regular.otf
new file mode 100644
index 000000000..48481f30c
Binary files /dev/null and b/fonts/CommonHTML/TeX/otf/MathJax_Script-Regular.otf differ
diff --git a/fonts/CommonHTML/TeX/otf/MathJax_Size1-Regular.otf b/fonts/CommonHTML/TeX/otf/MathJax_Size1-Regular.otf
new file mode 100644
index 000000000..3e6380cd1
Binary files /dev/null and b/fonts/CommonHTML/TeX/otf/MathJax_Size1-Regular.otf differ
diff --git a/fonts/CommonHTML/TeX/otf/MathJax_Size2-Regular.otf b/fonts/CommonHTML/TeX/otf/MathJax_Size2-Regular.otf
new file mode 100644
index 000000000..f87d4128c
Binary files /dev/null and b/fonts/CommonHTML/TeX/otf/MathJax_Size2-Regular.otf differ
diff --git a/fonts/CommonHTML/TeX/otf/MathJax_Size3-Regular.otf b/fonts/CommonHTML/TeX/otf/MathJax_Size3-Regular.otf
new file mode 100644
index 000000000..ea8581d38
Binary files /dev/null and b/fonts/CommonHTML/TeX/otf/MathJax_Size3-Regular.otf differ
diff --git a/fonts/CommonHTML/TeX/otf/MathJax_Size4-Regular.otf b/fonts/CommonHTML/TeX/otf/MathJax_Size4-Regular.otf
new file mode 100644
index 000000000..d6fe72cc4
Binary files /dev/null and b/fonts/CommonHTML/TeX/otf/MathJax_Size4-Regular.otf differ
diff --git a/fonts/CommonHTML/TeX/otf/MathJax_Typewriter-Regular.otf b/fonts/CommonHTML/TeX/otf/MathJax_Typewriter-Regular.otf
new file mode 100644
index 000000000..e93fb2f16
Binary files /dev/null and b/fonts/CommonHTML/TeX/otf/MathJax_Typewriter-Regular.otf differ
diff --git a/unpacked/jax/output/CommonHTML/config.js b/unpacked/jax/output/CommonHTML/config.js
index 35b78fe73..8fbc8e369 100644
--- a/unpacked/jax/output/CommonHTML/config.js
+++ b/unpacked/jax/output/CommonHTML/config.js
@@ -31,8 +31,8 @@ MathJax.OutputJax.CommonHTML = MathJax.OutputJax({
directory: MathJax.OutputJax.directory + "/CommonHTML",
extensionDir: MathJax.OutputJax.extensionDir + "/CommonHTML",
autoloadDir: MathJax.OutputJax.directory + "/CommonHTML/autoload",
- fontDir: MathJax.OutputJax.directory + "/CommonHTML/fonts",
- webfontDir: MathJax.OutputJax.fontDir + "/HTML-CSS",
+ fontDir: MathJax.OutputJax.directory + "/CommonHTML/fonts", // fontname added later
+ webfontDir: MathJax.OutputJax.fontDir + "/CommonHTML", // fontname added later
config: {
scale: 100, minScaleAdjust: 50, // global math scaling factor, and minimum adjusted scale factor
diff --git a/unpacked/jax/output/CommonHTML/fonts/TeX/fontdata.js b/unpacked/jax/output/CommonHTML/fonts/TeX/fontdata.js
index c23fe670b..c17d320b2 100644
--- a/unpacked/jax/output/CommonHTML/fonts/TeX/fontdata.js
+++ b/unpacked/jax/output/CommonHTML/fonts/TeX/fontdata.js
@@ -1589,23 +1589,55 @@
//
(function () {
var STYLES = CHTML.config.styles, FONTS = CHTML.FONTDATA.FONTS;
+ var DIR = AJAX.fileURL(CHTML.webfontDir);
var faces = [];
for (var name in FONTS) {if (FONTS.hasOwnProperty(name)) {
var font = FONTS[name]; if (typeof(font) !== "string") font = font.directory;
var names = font.split(/\//);
var suffix = names[0].toLowerCase().replace(/(?:igraphic|serif|writer|tur)$/,"")
+ "-" + names[1].replace(/[^A-Z]/g,"");
- var family = "MJX_TeX_"+suffix; FONTS[name].className = "MJXc-TeX-"+suffix;
- STYLES[".MJXc-TeX-"+suffix] = {"font-family":family};
- font = {"font-family":family}; name = name.replace(/-.*/,"");
- if (names[1] === "Regular") {font.src = "local('"+name+"'), local('"+name+"-Regular')"}
- else {font.src = "local('"+name+" "+names[1]+"'), local('"+name+"-"+names[1]+"')"}
+ var family = "MJXc_TeX_"+suffix, FAMILY = family;
+ FONTS[name].className = "MJXc-TeX-"+suffix;
+ //
+ // The local font, if found
+ //
+ font = {"font-family":family};
+ name = name.replace(/-.*/,"");
+ if (names[1] === "Regular") {
+ font.src = "local('"+name+"'), local('"+name+"-Regular')";
+ } else {
+ font.src = "local('"+name+" "+names[1]+"'), local('"+name+"-"+names[1]+"')";
+ }
faces.push(font);
+ //
+ // For Chrome, need to have separate font-weight and font-style versions
+ //
+ if (names[1] !== "Regular") {
+ font = {"font-family":family+"x", src:"local('"+name+"')"};
+ if (names[1].match(/Bold/)) font["font-weight"] = "bold";
+ if (names[1].match(/Italic/)) font["font-style"] = "italic";
+ FAMILY += ","+family+"x";
+ faces.push(font);
+ }
+ //
+ // The web font, if no local font found
+ // ### FIXME: add more formats to src
+ //
+ font = {
+ "font-family":family+"w",
+ src:"url('"+DIR+"/MathJax_"+names[0]+"-"+names[1]+".otf')"
+ };
+ faces.push(font);
+ //
+ // A class that looks for the local and web fonts
+ //
+ FAMILY += ","+family+"w";
+ STYLES[".MJXc-TeX-"+suffix] = {"font-family":FAMILY};
}}
if (faces.length) STYLES["@font-face"] = faces;
})();
- AJAX.loadComplete(CHTML.fontDir + "/TeX/fontdata.js");
+ AJAX.loadComplete(CHTML.fontDir + "/fontdata.js");
})(MathJax.OutputJax.CommonHTML,MathJax.ElementJax.mml,MathJax.Ajax);
diff --git a/unpacked/jax/output/CommonHTML/jax.js b/unpacked/jax/output/CommonHTML/jax.js
index 922e93ea8..8e91ca32b 100644
--- a/unpacked/jax/output/CommonHTML/jax.js
+++ b/unpacked/jax/output/CommonHTML/jax.js
@@ -140,7 +140,8 @@
if (!this.require) {this.require = []}
this.SUPER(arguments).Config.call(this); var settings = this.settings;
if (settings.scale) {this.config.scale = settings.scale}
- this.require.push(this.fontDir+"/TeX/fontdata.js");
+ this.fontDir += "/TeX"; this.webfontDir += "/TeX/otf";
+ this.require.push(this.fontDir+"/fontdata.js");
this.require.push(MathJax.OutputJax.extensionDir+"/MathEvents.js");
},