commit 562786da5ed9be85d4802238e8798c25914eb7c6 parent 8f20749a48ecdc2a273f7e704d6e8419010dd529 Author: Davide P. Cervone <dpvc@union.edu> Date: Fri, 17 Apr 2015 16:01:57 -0400 Update HTML-CSS fonts to be usable by CommonHTML, and remove the CommonHTML fonts. Update @font-face to include the new formats. Diffstat:
85 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/fonts/CommonHTML/TeX/otf/MathJax_AMS-Regular.otf b/fonts/CommonHTML/TeX/otf/MathJax_AMS-Regular.otf Binary files differ. diff --git a/fonts/CommonHTML/TeX/otf/MathJax_Caligraphic-Bold.otf b/fonts/CommonHTML/TeX/otf/MathJax_Caligraphic-Bold.otf Binary files differ. diff --git a/fonts/CommonHTML/TeX/otf/MathJax_Caligraphic-Regular.otf b/fonts/CommonHTML/TeX/otf/MathJax_Caligraphic-Regular.otf Binary files differ. diff --git a/fonts/CommonHTML/TeX/otf/MathJax_Fraktur-Bold.otf b/fonts/CommonHTML/TeX/otf/MathJax_Fraktur-Bold.otf Binary files differ. diff --git a/fonts/CommonHTML/TeX/otf/MathJax_Fraktur-Regular.otf b/fonts/CommonHTML/TeX/otf/MathJax_Fraktur-Regular.otf Binary files differ. diff --git a/fonts/CommonHTML/TeX/otf/MathJax_Main-Bold.otf b/fonts/CommonHTML/TeX/otf/MathJax_Main-Bold.otf Binary files differ. diff --git a/fonts/CommonHTML/TeX/otf/MathJax_Main-Italic.otf b/fonts/CommonHTML/TeX/otf/MathJax_Main-Italic.otf Binary files differ. diff --git a/fonts/CommonHTML/TeX/otf/MathJax_Main-Regular.otf b/fonts/CommonHTML/TeX/otf/MathJax_Main-Regular.otf Binary files differ. diff --git a/fonts/CommonHTML/TeX/otf/MathJax_Math-BoldItalic.otf b/fonts/CommonHTML/TeX/otf/MathJax_Math-BoldItalic.otf Binary files differ. diff --git a/fonts/CommonHTML/TeX/otf/MathJax_Math-Italic.otf b/fonts/CommonHTML/TeX/otf/MathJax_Math-Italic.otf Binary files differ. diff --git a/fonts/CommonHTML/TeX/otf/MathJax_Math-Regular.otf b/fonts/CommonHTML/TeX/otf/MathJax_Math-Regular.otf Binary files differ. diff --git a/fonts/CommonHTML/TeX/otf/MathJax_SansSerif-Bold.otf b/fonts/CommonHTML/TeX/otf/MathJax_SansSerif-Bold.otf Binary files differ. diff --git a/fonts/CommonHTML/TeX/otf/MathJax_SansSerif-Italic.otf b/fonts/CommonHTML/TeX/otf/MathJax_SansSerif-Italic.otf Binary files differ. diff --git a/fonts/CommonHTML/TeX/otf/MathJax_SansSerif-Regular.otf b/fonts/CommonHTML/TeX/otf/MathJax_SansSerif-Regular.otf Binary files differ. diff --git a/fonts/CommonHTML/TeX/otf/MathJax_Script-Regular.otf b/fonts/CommonHTML/TeX/otf/MathJax_Script-Regular.otf Binary files differ. diff --git a/fonts/CommonHTML/TeX/otf/MathJax_Size1-Regular.otf b/fonts/CommonHTML/TeX/otf/MathJax_Size1-Regular.otf Binary files differ. diff --git a/fonts/CommonHTML/TeX/otf/MathJax_Size2-Regular.otf b/fonts/CommonHTML/TeX/otf/MathJax_Size2-Regular.otf Binary files differ. diff --git a/fonts/CommonHTML/TeX/otf/MathJax_Size3-Regular.otf b/fonts/CommonHTML/TeX/otf/MathJax_Size3-Regular.otf Binary files differ. diff --git a/fonts/CommonHTML/TeX/otf/MathJax_Size4-Regular.otf b/fonts/CommonHTML/TeX/otf/MathJax_Size4-Regular.otf Binary files differ. diff --git a/fonts/CommonHTML/TeX/otf/MathJax_Typewriter-Regular.otf b/fonts/CommonHTML/TeX/otf/MathJax_Typewriter-Regular.otf Binary files differ. diff --git a/fonts/HTML-CSS/TeX/eot/MathJax_AMS-Regular.eot b/fonts/HTML-CSS/TeX/eot/MathJax_AMS-Regular.eot Binary files differ. diff --git a/fonts/HTML-CSS/TeX/eot/MathJax_Caligraphic-Bold.eot b/fonts/HTML-CSS/TeX/eot/MathJax_Caligraphic-Bold.eot Binary files differ. diff --git a/fonts/HTML-CSS/TeX/eot/MathJax_Caligraphic-Regular.eot b/fonts/HTML-CSS/TeX/eot/MathJax_Caligraphic-Regular.eot Binary files differ. diff --git a/fonts/HTML-CSS/TeX/eot/MathJax_Fraktur-Bold.eot b/fonts/HTML-CSS/TeX/eot/MathJax_Fraktur-Bold.eot Binary files differ. diff --git a/fonts/HTML-CSS/TeX/eot/MathJax_Fraktur-Regular.eot b/fonts/HTML-CSS/TeX/eot/MathJax_Fraktur-Regular.eot Binary files differ. diff --git a/fonts/HTML-CSS/TeX/eot/MathJax_Main-Bold.eot b/fonts/HTML-CSS/TeX/eot/MathJax_Main-Bold.eot Binary files differ. diff --git a/fonts/HTML-CSS/TeX/eot/MathJax_Main-Italic.eot b/fonts/HTML-CSS/TeX/eot/MathJax_Main-Italic.eot Binary files differ. diff --git a/fonts/HTML-CSS/TeX/eot/MathJax_Main-Regular.eot b/fonts/HTML-CSS/TeX/eot/MathJax_Main-Regular.eot Binary files differ. diff --git a/fonts/HTML-CSS/TeX/eot/MathJax_Math-BoldItalic.eot b/fonts/HTML-CSS/TeX/eot/MathJax_Math-BoldItalic.eot Binary files differ. diff --git a/fonts/HTML-CSS/TeX/eot/MathJax_Math-Italic.eot b/fonts/HTML-CSS/TeX/eot/MathJax_Math-Italic.eot Binary files differ. diff --git a/fonts/HTML-CSS/TeX/eot/MathJax_Math-Regular.eot b/fonts/HTML-CSS/TeX/eot/MathJax_Math-Regular.eot Binary files differ. diff --git a/fonts/HTML-CSS/TeX/eot/MathJax_SansSerif-Bold.eot b/fonts/HTML-CSS/TeX/eot/MathJax_SansSerif-Bold.eot Binary files differ. diff --git a/fonts/HTML-CSS/TeX/eot/MathJax_SansSerif-Italic.eot b/fonts/HTML-CSS/TeX/eot/MathJax_SansSerif-Italic.eot Binary files differ. diff --git a/fonts/HTML-CSS/TeX/eot/MathJax_SansSerif-Regular.eot b/fonts/HTML-CSS/TeX/eot/MathJax_SansSerif-Regular.eot Binary files differ. diff --git a/fonts/HTML-CSS/TeX/eot/MathJax_Script-Regular.eot b/fonts/HTML-CSS/TeX/eot/MathJax_Script-Regular.eot Binary files differ. diff --git a/fonts/HTML-CSS/TeX/eot/MathJax_Size1-Regular.eot b/fonts/HTML-CSS/TeX/eot/MathJax_Size1-Regular.eot Binary files differ. diff --git a/fonts/HTML-CSS/TeX/eot/MathJax_Size2-Regular.eot b/fonts/HTML-CSS/TeX/eot/MathJax_Size2-Regular.eot Binary files differ. diff --git a/fonts/HTML-CSS/TeX/eot/MathJax_Size3-Regular.eot b/fonts/HTML-CSS/TeX/eot/MathJax_Size3-Regular.eot Binary files differ. diff --git a/fonts/HTML-CSS/TeX/eot/MathJax_Size4-Regular.eot b/fonts/HTML-CSS/TeX/eot/MathJax_Size4-Regular.eot Binary files differ. diff --git a/fonts/HTML-CSS/TeX/eot/MathJax_Typewriter-Regular.eot b/fonts/HTML-CSS/TeX/eot/MathJax_Typewriter-Regular.eot Binary files differ. diff --git a/fonts/HTML-CSS/TeX/eot/MathJax_WinIE6-Regular.eot b/fonts/HTML-CSS/TeX/eot/MathJax_WinIE6-Regular.eot Binary files differ. diff --git a/fonts/HTML-CSS/TeX/otf/MathJax_AMS-Regular.otf b/fonts/HTML-CSS/TeX/otf/MathJax_AMS-Regular.otf Binary files differ. diff --git a/fonts/HTML-CSS/TeX/otf/MathJax_Caligraphic-Bold.otf b/fonts/HTML-CSS/TeX/otf/MathJax_Caligraphic-Bold.otf Binary files differ. diff --git a/fonts/HTML-CSS/TeX/otf/MathJax_Caligraphic-Regular.otf b/fonts/HTML-CSS/TeX/otf/MathJax_Caligraphic-Regular.otf Binary files differ. diff --git a/fonts/HTML-CSS/TeX/otf/MathJax_Fraktur-Bold.otf b/fonts/HTML-CSS/TeX/otf/MathJax_Fraktur-Bold.otf Binary files differ. diff --git a/fonts/HTML-CSS/TeX/otf/MathJax_Fraktur-Regular.otf b/fonts/HTML-CSS/TeX/otf/MathJax_Fraktur-Regular.otf Binary files differ. diff --git a/fonts/HTML-CSS/TeX/otf/MathJax_Main-Bold.otf b/fonts/HTML-CSS/TeX/otf/MathJax_Main-Bold.otf Binary files differ. diff --git a/fonts/HTML-CSS/TeX/otf/MathJax_Main-Italic.otf b/fonts/HTML-CSS/TeX/otf/MathJax_Main-Italic.otf Binary files differ. diff --git a/fonts/HTML-CSS/TeX/otf/MathJax_Main-Regular.otf b/fonts/HTML-CSS/TeX/otf/MathJax_Main-Regular.otf Binary files differ. diff --git a/fonts/HTML-CSS/TeX/otf/MathJax_Math-BoldItalic.otf b/fonts/HTML-CSS/TeX/otf/MathJax_Math-BoldItalic.otf Binary files differ. diff --git a/fonts/HTML-CSS/TeX/otf/MathJax_Math-Italic.otf b/fonts/HTML-CSS/TeX/otf/MathJax_Math-Italic.otf Binary files differ. diff --git a/fonts/HTML-CSS/TeX/otf/MathJax_Math-Regular.otf b/fonts/HTML-CSS/TeX/otf/MathJax_Math-Regular.otf Binary files differ. diff --git a/fonts/HTML-CSS/TeX/otf/MathJax_SansSerif-Bold.otf b/fonts/HTML-CSS/TeX/otf/MathJax_SansSerif-Bold.otf Binary files differ. diff --git a/fonts/HTML-CSS/TeX/otf/MathJax_SansSerif-Italic.otf b/fonts/HTML-CSS/TeX/otf/MathJax_SansSerif-Italic.otf Binary files differ. diff --git a/fonts/HTML-CSS/TeX/otf/MathJax_SansSerif-Regular.otf b/fonts/HTML-CSS/TeX/otf/MathJax_SansSerif-Regular.otf Binary files differ. diff --git a/fonts/HTML-CSS/TeX/otf/MathJax_Script-Regular.otf b/fonts/HTML-CSS/TeX/otf/MathJax_Script-Regular.otf Binary files differ. diff --git a/fonts/HTML-CSS/TeX/otf/MathJax_Size1-Regular.otf b/fonts/HTML-CSS/TeX/otf/MathJax_Size1-Regular.otf Binary files differ. diff --git a/fonts/HTML-CSS/TeX/otf/MathJax_Size2-Regular.otf b/fonts/HTML-CSS/TeX/otf/MathJax_Size2-Regular.otf Binary files differ. diff --git a/fonts/HTML-CSS/TeX/otf/MathJax_Size3-Regular.otf b/fonts/HTML-CSS/TeX/otf/MathJax_Size3-Regular.otf Binary files differ. diff --git a/fonts/HTML-CSS/TeX/otf/MathJax_Size4-Regular.otf b/fonts/HTML-CSS/TeX/otf/MathJax_Size4-Regular.otf Binary files differ. diff --git a/fonts/HTML-CSS/TeX/otf/MathJax_Typewriter-Regular.otf b/fonts/HTML-CSS/TeX/otf/MathJax_Typewriter-Regular.otf Binary files differ. diff --git a/fonts/HTML-CSS/TeX/otf/MathJax_WinChrome-Regular.otf b/fonts/HTML-CSS/TeX/otf/MathJax_WinChrome-Regular.otf Binary files differ. diff --git a/fonts/HTML-CSS/TeX/otf/MathJax_WinIE6-Regular.otf b/fonts/HTML-CSS/TeX/otf/MathJax_WinIE6-Regular.otf Binary files differ. diff --git a/fonts/HTML-CSS/TeX/woff/MathJax_AMS-Regular.woff b/fonts/HTML-CSS/TeX/woff/MathJax_AMS-Regular.woff Binary files differ. diff --git a/fonts/HTML-CSS/TeX/woff/MathJax_Caligraphic-Bold.woff b/fonts/HTML-CSS/TeX/woff/MathJax_Caligraphic-Bold.woff Binary files differ. diff --git a/fonts/HTML-CSS/TeX/woff/MathJax_Caligraphic-Regular.woff b/fonts/HTML-CSS/TeX/woff/MathJax_Caligraphic-Regular.woff Binary files differ. diff --git a/fonts/HTML-CSS/TeX/woff/MathJax_Fraktur-Bold.woff b/fonts/HTML-CSS/TeX/woff/MathJax_Fraktur-Bold.woff Binary files differ. diff --git a/fonts/HTML-CSS/TeX/woff/MathJax_Fraktur-Regular.woff b/fonts/HTML-CSS/TeX/woff/MathJax_Fraktur-Regular.woff Binary files differ. diff --git a/fonts/HTML-CSS/TeX/woff/MathJax_Main-Bold.woff b/fonts/HTML-CSS/TeX/woff/MathJax_Main-Bold.woff Binary files differ. diff --git a/fonts/HTML-CSS/TeX/woff/MathJax_Main-Italic.woff b/fonts/HTML-CSS/TeX/woff/MathJax_Main-Italic.woff Binary files differ. diff --git a/fonts/HTML-CSS/TeX/woff/MathJax_Main-Regular.woff b/fonts/HTML-CSS/TeX/woff/MathJax_Main-Regular.woff Binary files differ. diff --git a/fonts/HTML-CSS/TeX/woff/MathJax_Math-BoldItalic.woff b/fonts/HTML-CSS/TeX/woff/MathJax_Math-BoldItalic.woff Binary files differ. diff --git a/fonts/HTML-CSS/TeX/woff/MathJax_Math-Italic.woff b/fonts/HTML-CSS/TeX/woff/MathJax_Math-Italic.woff Binary files differ. diff --git a/fonts/HTML-CSS/TeX/woff/MathJax_Math-Regular.woff b/fonts/HTML-CSS/TeX/woff/MathJax_Math-Regular.woff Binary files differ. diff --git a/fonts/HTML-CSS/TeX/woff/MathJax_SansSerif-Bold.woff b/fonts/HTML-CSS/TeX/woff/MathJax_SansSerif-Bold.woff Binary files differ. diff --git a/fonts/HTML-CSS/TeX/woff/MathJax_SansSerif-Italic.woff b/fonts/HTML-CSS/TeX/woff/MathJax_SansSerif-Italic.woff Binary files differ. diff --git a/fonts/HTML-CSS/TeX/woff/MathJax_SansSerif-Regular.woff b/fonts/HTML-CSS/TeX/woff/MathJax_SansSerif-Regular.woff Binary files differ. diff --git a/fonts/HTML-CSS/TeX/woff/MathJax_Script-Regular.woff b/fonts/HTML-CSS/TeX/woff/MathJax_Script-Regular.woff Binary files differ. diff --git a/fonts/HTML-CSS/TeX/woff/MathJax_Size1-Regular.woff b/fonts/HTML-CSS/TeX/woff/MathJax_Size1-Regular.woff Binary files differ. diff --git a/fonts/HTML-CSS/TeX/woff/MathJax_Size2-Regular.woff b/fonts/HTML-CSS/TeX/woff/MathJax_Size2-Regular.woff Binary files differ. diff --git a/fonts/HTML-CSS/TeX/woff/MathJax_Size3-Regular.woff b/fonts/HTML-CSS/TeX/woff/MathJax_Size3-Regular.woff Binary files differ. diff --git a/fonts/HTML-CSS/TeX/woff/MathJax_Size4-Regular.woff b/fonts/HTML-CSS/TeX/woff/MathJax_Size4-Regular.woff Binary files differ. diff --git a/fonts/HTML-CSS/TeX/woff/MathJax_Typewriter-Regular.woff b/fonts/HTML-CSS/TeX/woff/MathJax_Typewriter-Regular.woff Binary files differ. diff --git a/unpacked/jax/output/CommonHTML/config.js b/unpacked/jax/output/CommonHTML/config.js @@ -32,7 +32,7 @@ MathJax.OutputJax.CommonHTML = MathJax.OutputJax({ extensionDir: MathJax.OutputJax.extensionDir + "/CommonHTML", autoloadDir: MathJax.OutputJax.directory + "/CommonHTML/autoload", fontDir: MathJax.OutputJax.directory + "/CommonHTML/fonts", // fontname added later - webfontDir: MathJax.OutputJax.fontDir + "/CommonHTML", // fontname added later + webfontDir: MathJax.OutputJax.fontDir + "/HTML-CSS", // fontname added later config: { matchFontHeight: true, // try to match math font height to surrounding font? diff --git a/unpacked/jax/output/CommonHTML/fonts/TeX/fontdata.js b/unpacked/jax/output/CommonHTML/fonts/TeX/fontdata.js @@ -1632,7 +1632,9 @@ }; (function () { var STYLES = CHTML.config.styles, FONTS = CHTML.FONTDATA.FONTS; - var DIR = AJAX.fileURL(CHTML.webfontDir+"/TeX/otf"); + var OTFDIR = AJAX.fileURL(CHTML.webfontDir+"/TeX/otf"), + EOTDIR = AJAX.fileURL(CHTML.webfontDir+"/TeX/eot"), + WOFFDIR = AJAX.fileURL(CHTML.webfontDir+"/TeX/woff"); var faces = []; for (var name in FONTS) {if (FONTS.hasOwnProperty(name)) { var family = CHTML.FONTDATA.familyName(name), FAMILY = family; @@ -1661,9 +1663,15 @@ } // // The web font, if no local font found - // ### FIXME: add more formats to src // - font = {"font-family":family+"w", src:"url('"+DIR+"/"+name+"-"+variant+".otf')"}; + font = {"font-family":family+"w", + src: [ +// "url('"+EOTDIR+"/"+name+"-"+variant+".eot?#iefix') format('embedded-opentype')", + "url('"+EOTDIR+"/"+name+"-"+variant+".eot') format('embedded-opentype')", + "url('"+WOFFDIR+"/"+name+"-"+variant+".woff') format('woff')", + "url('"+OTFDIR+"/"+name+"-"+variant+".otf') format('opentype')" + ].join(", ") + }; faces.push(font); // // A class that looks for the local and web fonts