Merge branch 'v2.1-latest' into develop
This commit is contained in:
commit
c9f18c7cdb
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
@ -5,7 +5,7 @@ GitHub repository at
|
|||
|
||||
The HTML versions are now available at
|
||||
|
||||
http://mathjax.readthedocs.org/en/latest/
|
||||
http://docs.mathjax.org/
|
||||
|
||||
where it is possible for you to submit corrections and modifications
|
||||
directly to the documentation on line.
|
||||
|
|
|
@ -17,7 +17,7 @@ GitHub repository at
|
|||
The HTML versions are now available at
|
||||
</p>
|
||||
<p style="text-indent:3em">
|
||||
<a href="http://mathjax.readthedocs.org/en/latest/">http://mathjax.readthedocs.org/en/latest/</a>
|
||||
<a href="http://docs.mathjax.org/">http://docs.mathjax.org/</a>
|
||||
</p>
|
||||
<p>
|
||||
where it is possible for you to submit corrections and modifications
|
||||
|
|
|
@ -5,7 +5,7 @@ GitHub repository at
|
|||
|
||||
The HTML versions are now available at
|
||||
|
||||
http://mathjax.readthedocs.org/en/latest/
|
||||
http://docs.mathjax.org/
|
||||
|
||||
where it is possible for you to submit corrections and modifications
|
||||
directly to the documentation on line.
|
||||
|
|
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
@ -2315,7 +2315,7 @@ MathJax.Hub.Startup = {
|
|||
var scripts = (document.documentElement || document).getElementsByTagName("script");
|
||||
var namePattern = new RegExp("(^|/)"+BASENAME+"\\.js(\\?.*)?$");
|
||||
for (var i = scripts.length-1; i >= 0; i--) {
|
||||
if (scripts[i].src.match(namePattern)) {
|
||||
if ((scripts[i].src||"").match(namePattern)) {
|
||||
STARTUP.script = scripts[i].innerHTML;
|
||||
if (RegExp.$2) {
|
||||
var params = RegExp.$2.substr(1).split(/\&/);
|
||||
|
@ -2334,7 +2334,8 @@ MathJax.Hub.Startup = {
|
|||
isMac: (navigator.platform.substr(0,3) === "Mac"),
|
||||
isPC: (navigator.platform.substr(0,3) === "Win"),
|
||||
isMSIE: (window.ActiveXObject != null && window.clipboardData != null),
|
||||
isFirefox: (window.netscape != null && document.ATTRIBUTE_NODE != null && !window.opera),
|
||||
isFirefox: ((window.netscape != null || window.mozPaintCount != null) &&
|
||||
document.ATTRIBUTE_NODE != null && !window.opera),
|
||||
isSafari: (navigator.userAgent.match(/ (Apple)?WebKit\//) != null &&
|
||||
(!window.chrome || window.chrome.loadTimes == null)),
|
||||
isChrome: (window.chrome != null && window.chrome.loadTimes != null),
|
||||
|
|
|
@ -279,14 +279,19 @@ MathJax.Hub.Register.StartupHook("HTML-CSS Jax Ready",function () {
|
|||
|
||||
MathJax.Hub.Browser.Select({
|
||||
MSIE: function (browser) {
|
||||
MML.menclose.Augment({HTMLpx: function (n,d) {return (n*HTMLCSS.em+(d||0))+"px"}});
|
||||
HTMLCSS.useVML = true;
|
||||
if (!document.namespaces[vmlns]) {
|
||||
if (document.documentMode && document.documentMode >= 8) {
|
||||
document.namespaces.add(vmlns,VMLNS,"#default#VML");
|
||||
} else {
|
||||
document.namespaces.add(vmlns,VMLNS);
|
||||
document.createStyleSheet().addRule(vmlns+"\\: *","{behavior: url(#default#VML)}");
|
||||
//
|
||||
// IE8 and below doesn't have SVG, so use VML
|
||||
//
|
||||
if ((document.documentMode||0) < 9) {
|
||||
MML.menclose.Augment({HTMLpx: function (n,d) {return (n*HTMLCSS.em+(d||0))+"px"}});
|
||||
HTMLCSS.useVML = true;
|
||||
if (!document.namespaces[vmlns]) {
|
||||
if (document.documentMode && document.documentMode === 8) {
|
||||
document.namespaces.add(vmlns,VMLNS,"#default#VML");
|
||||
} else {
|
||||
document.namespaces.add(vmlns,VMLNS);
|
||||
document.createStyleSheet().addRule(vmlns+"\\: *","{behavior: url(#default#VML)}");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -292,8 +292,9 @@
|
|||
|
||||
hideProcessedMath: true, // use display:none until all math is processed
|
||||
|
||||
Font: null, // created by Config() below
|
||||
Font: null, // created by Config() below
|
||||
webFontDefault: "MathJax_Blank",
|
||||
allowWebFonts: "otf", // assume browser can use OTF web fonts
|
||||
|
||||
Config: function () {
|
||||
if (!this.require) {this.require = []}
|
||||
|
|
Loading…
Reference in New Issue
Block a user