Merge branch 'issue1323' into develop. Issue #1323.
This commit is contained in:
commit
eb6f1c0123
|
@ -66,7 +66,7 @@ MathJax.Extension["MathML/content-mathml"] = (function(HUB) {
|
||||||
/* mathvariant to use with corresponding <ci> type attribute */
|
/* mathvariant to use with corresponding <ci> type attribute */
|
||||||
cistyles: {
|
cistyles: {
|
||||||
vector: 'bold-italic',
|
vector: 'bold-italic',
|
||||||
matrix: 'bold-upright'
|
matrix: 'bold-upright'
|
||||||
},
|
},
|
||||||
|
|
||||||
/* Symbol names to translate to characters
|
/* Symbol names to translate to characters
|
||||||
|
@ -208,7 +208,12 @@ MathJax.Extension["MathML/content-mathml"] = (function(HUB) {
|
||||||
if (CToP.tokens[contentMMLNode.nodeName]) {
|
if (CToP.tokens[contentMMLNode.nodeName]) {
|
||||||
CToP.tokens[contentMMLNode.nodeName](parentNode,contentMMLNode,precedence);
|
CToP.tokens[contentMMLNode.nodeName](parentNode,contentMMLNode,precedence);
|
||||||
} else if (contentMMLNode.childNodes.length === 0) {
|
} else if (contentMMLNode.childNodes.length === 0) {
|
||||||
CToP.appendToken(parentNode,'mi',contentMMLNode.nodeName);
|
var mml = CToP.MML[contentMMLNode.nodeName];
|
||||||
|
if (mml && mml.isa && mml.isa(CToP.mbase)) {
|
||||||
|
parentNode.appendChild(CToP.cloneNode(contentMMLNode));
|
||||||
|
} else {
|
||||||
|
CToP.appendToken(parentNode,'mi',contentMMLNode.nodeName);
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
var clonedChild = CToP.cloneNode(contentMMLNode);
|
var clonedChild = CToP.cloneNode(contentMMLNode);
|
||||||
parentNode.appendChild(clonedChild);
|
parentNode.appendChild(clonedChild);
|
||||||
|
@ -1712,6 +1717,8 @@ MathJax.Hub.Register.StartupHook("MathML Jax Ready",function () {
|
||||||
var MATHML = MathJax.InputJax.MathML;
|
var MATHML = MathJax.InputJax.MathML;
|
||||||
|
|
||||||
var CToP = MathJax.Extension["MathML/content-mathml"];
|
var CToP = MathJax.Extension["MathML/content-mathml"];
|
||||||
|
CToP.mbase = MathJax.ElementJax.mml.mbase;
|
||||||
|
CToP.MML = MathJax.ElementJax.mml;
|
||||||
|
|
||||||
MATHML.DOMfilterHooks.Add(function (data) {
|
MATHML.DOMfilterHooks.Add(function (data) {
|
||||||
data.math = CToP.transformElement(data.math);
|
data.math = CToP.transformElement(data.math);
|
||||||
|
|
Loading…
Reference in New Issue
Block a user