https://www.mediawiki.org/wiki/Special:Code/MediaWiki/113661
Revision: 113661
Author: brion
Date: 2012-03-12 20:41:43 +0000 (Mon, 12 Mar 2012)
Log Message:
-----------
tweaks to MathJax setup & customizations from mathjax-users list
Some fixes, cleanup, and modernization
Modified Paths:
--------------
trunk/extensions/Math/modules/MathJax/config/TeX-AMS-texvc_HTML.js
trunk/extensions/Math/modules/MathJax/extensions/TeX/texvc.js
trunk/extensions/Math/modules/MathJax/extensions/wiki2jax.js
Modified: trunk/extensions/Math/modules/MathJax/config/TeX-AMS-texvc_HTML.js
===================================================================
--- trunk/extensions/Math/modules/MathJax/config/TeX-AMS-texvc_HTML.js
2012-03-12 20:39:08 UTC (rev 113660)
+++ trunk/extensions/Math/modules/MathJax/config/TeX-AMS-texvc_HTML.js
2012-03-12 20:41:43 UTC (rev 113661)
@@ -1,6 +1,6 @@
MathJax.Hub.Config({
- extensions:
["wiki2jax.js","TeX/texvc.js","MathEvents.js","MathZoom.js","MathMenu.js","toMathML.js"],
+ extensions:
["wiki2jax.js","MathEvents.js","MathZoom.js","MathMenu.js","toMathML.js"],
jax: ["input/TeX","output/HTML-CSS"],
- TeX: {extensions:
["noErrors.js","noUndefined.js","AMSmath.js","AMSsymbols.js"]}
+ TeX: {extensions:
["noErrors.js","noUndefined.js","AMSmath.js","AMSsymbols.js","texvc.js"]}
});
MathJax.Ajax.loadComplete("[MathJax]/config/TeX-AMS-texvc_HTML.js");
Modified: trunk/extensions/Math/modules/MathJax/extensions/TeX/texvc.js
===================================================================
--- trunk/extensions/Math/modules/MathJax/extensions/TeX/texvc.js
2012-03-12 20:39:08 UTC (rev 113660)
+++ trunk/extensions/Math/modules/MathJax/extensions/TeX/texvc.js
2012-03-12 20:41:43 UTC (rev 113661)
@@ -113,16 +113,14 @@
},
macros: {
- sgn: ['NamedOp',0],
+ sgn: 'NamedFn',
textcolor: ['Macro','\\color{#1}',1],
- bold: ['Macro','{\\boldsymbol #1}',1] // boldsymbol
+ bold: ['Macro','\\boldsymbol'] // boldsymbol
}
});
});
-MathJax.Hub.Register.StartupHook("HTML-CSS Jax Ready",function () {
- MathJax.Hub.Startup.signal.Post("TeX texvc Ready");
-});
+MathJax.Hub.Startup.signal.Post("TeX texvc Ready");
MathJax.Ajax.loadComplete("[MathJax]/extensions/TeX/texvc.js");
Modified: trunk/extensions/Math/modules/MathJax/extensions/wiki2jax.js
===================================================================
--- trunk/extensions/Math/modules/MathJax/extensions/wiki2jax.js
2012-03-12 20:39:08 UTC (rev 113660)
+++ trunk/extensions/Math/modules/MathJax/extensions/wiki2jax.js
2012-03-12 20:41:43 UTC (rev 113661)
@@ -16,10 +16,9 @@
PreProcess: function (element) {
if (!this.configured) {
- MathJax.Hub.Insert(this.config,(MathJax.Hub.config.wiki2jax||{}));
+ this.config = MathJax.Hub.CombineConfig("wiki2jax", this.config);
if (this.config.Augment) {MathJax.Hub.Insert(this,this.config.Augment)}
- if (typeof(this.config.previewTeX) !== "undefined" &&
!this.config.previewTeX)
- {this.config.preview = "none"} // backward compatibility for
previewTeX parameter
+
this.previewClass = MathJax.Hub.config.preRemoveClass;
this.configured = true;
}
@@ -31,7 +30,7 @@
ConvertMath: function (node) {
var parent = node.parentNode,
- mode = parent.tagName === "DD" && parent.firstChild ===
parent.lastChild ? "; mode=display" : "",
+ mode = parent.tagName === "DD" && parent.childNodes.length === 1 ? ";
mode=display" : "",
tex;
if (node.nodeName == 'IMG') {
tex = node.alt;
@@ -46,6 +45,7 @@
if (parent.firstChild === node) tex = "\\displaystyle{"+tex+"}";
}
+ // @fixme auto-enable the 'color' extension and drop this
var i;
while ((i = tex.search(/\\color{/)) != -1) {
var braces = 0;
@@ -61,8 +61,7 @@
var script = document.createElement("script");
script.type = "math/tex" + mode;
- if (MathJax.Hub.Browser.isMSIE) {script.text = tex}
- else {script.appendChild(document.createTextNode(tex))}
+ MathJax.HTML.setScript(script, tex);
if (node.nextSibling) {parent.insertBefore(script,node.nextSibling)}
else {parent.appendChild(script)}
@@ -80,7 +79,7 @@
}
},
- filterTeX: function (tex) {return tex}
+ filterPreview: function (tex) {return tex}
};
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
