patrick/KaTeX
1
0
Fork 0
mirror of https://github.com/Smaug123/KaTeX synced 2025-10-08 20:48:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Improve MathML for math operators with subscripts (#2596)

Browse Source 
* Improve MathML for math operators with subscripts

* Add TODO re: MathML spacing

Co-authored-by: Kevin Barabash <kevinb@khanacademy.org>
This commit is contained in:
Ron Kok
2020-12-18 15:14:12 -08:00
committed by GitHub
parent f87c08bb1c
commit ef09291288
3 changed files with 139 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/buildMathML.js
View File

@@ -244,6 +244,11 @@ export default function buildMathML(
): DomSpan {
const expression = buildExpression(tree, options);
// TODO: Make a pass thru the MathML similar to buildHTML.traverseNonSpaceNodes
// and add spacing nodes. This is necessary only adjacent to math operators
// like \sin or \lim or to subsup elements that contain math operators.
// MathML takes care of the other spacing issues.
// Wrap up the expression in an mrow so it is presented in the semantics
// tag correctly, unless it's a single <mrow> or <mtable>.
let wrapper;

9
src/functions/supsub.js
View File

@@ -260,14 +260,7 @@ defineFunctionBuilders({
}
}
let node = new mathMLTree.MathNode(nodeType, children);
if (group.base && (group.base.type === "op" ||
group.base.type === "operatorname")) {
node = new mathMLTree.MathNode("mo", [node]);
}
return node;
return new mathMLTree.MathNode(nodeType, children);
},
});

284
test/__snapshots__/mathml-spec.js.snap
View File

@@ -308,29 +308,27 @@ exports[`A MathML builder should output \\limsup_{x \\rightarrow \\infty} correc
<math xmlns="http://www.w3.org/1998/Math/MathML">
<semantics>
<mrow>
<mo>
<msub>
<mrow>
<mi mathvariant="normal">
lim sup
</mi>
<mo>
⁡
</mo>
</mrow>
<mrow>
<mi>
x
</mi>
<mo>
→
</mo>
<mi mathvariant="normal">
∞
</mi>
</mrow>
</msub>
</mo>
<msub>
<mrow>
<mi mathvariant="normal">
lim sup
</mi>
<mo>
⁡
</mo>
</mrow>
<mrow>
<mi>
x
</mi>
<mo>
→
</mo>
<mi mathvariant="normal">
∞
</mi>
</mrow>
</msub>
</mrow>
<annotation encoding="application/x-tex">
\\limsup_{x \\rightarrow \\infty}
@@ -345,29 +343,27 @@ exports[`A MathML builder should output \\limsup_{x \\rightarrow \\infty} in dis
>
<semantics>
<mrow>
<mo>
<munder>
<mrow>
<mi mathvariant="normal">
lim sup
</mi>
<mo>
⁡
</mo>
</mrow>
<mrow>
<mi>
x
</mi>
<mo>
→
</mo>
<mi mathvariant="normal">
∞
</mi>
</mrow>
</munder>
</mo>
<munder>
<mrow>
<mi mathvariant="normal">
lim sup
</mi>
<mo>
⁡
</mo>
</mrow>
<mrow>
<mi>
x
</mi>
<mo>
→
</mo>
<mi mathvariant="normal">
∞
</mi>
</mrow>
</munder>
</mrow>
<annotation encoding="application/x-tex">
\\limsup_{x \\rightarrow \\infty}
@@ -424,27 +420,25 @@ exports[`A MathML builder should render mathchoice as if there was nothing 1`] =
displaystyle="true"
>
<mrow>
<mo>
<munderover>
<mo>
∑
</mo>
<mrow>
<mi>
k
</mi>
<mo>
=
</mo>
<mn>
0
</mn>
</mrow>
<mi mathvariant="normal">
∞
<munderover>
<mo>
∑
</mo>
<mrow>
<mi>
k
</mi>
</munderover>
</mo>
<mo>
=
</mo>
<mn>
0
</mn>
</mrow>
<mi mathvariant="normal">
∞
</mi>
</munderover>
<msup>
<mi>
x
@@ -467,27 +461,25 @@ exports[`A MathML builder should render mathchoice as if there was nothing 2`] =
<math xmlns="http://www.w3.org/1998/Math/MathML">
<semantics>
<mrow>
<mo>
<msubsup>
<mo>
∑
</mo>
<mrow>
<mi>
k
</mi>
<mo>
=
</mo>
<mn>
0
</mn>
</mrow>
<mi mathvariant="normal">
∞
<msubsup>
<mo>
∑
</mo>
<mrow>
<mi>
k
</mi>
</msubsup>
</mo>
<mo>
=
</mo>
<mn>
0
</mn>
</mrow>
<mi mathvariant="normal">
∞
</mi>
</msubsup>
<msup>
<mi>
x
@@ -703,51 +695,45 @@ exports[`A MathML builder should use <msupsub> for integrals 1`] = `
<mstyle scriptlevel="0"
displaystyle="true"
>
<mo>
<msubsup>
<mo>
∫
</mo>
<mi>
a
</mi>
<mi>
b
</mi>
</msubsup>
</mo>
<msubsup>
<mo>
∫
</mo>
<mi>
a
</mi>
<mi>
b
</mi>
</msubsup>
<mo>
+
</mo>
<mo>
<msubsup>
<mo>
∯
</mo>
<mi>
a
</mi>
<mi>
b
</mi>
</msubsup>
</mo>
<msubsup>
<mo>
∯
</mo>
<mi>
a
</mi>
<mi>
b
</mi>
</msubsup>
<mo>
+
</mo>
<mo>
<msubsup>
<mo>
∰
</mo>
<mi>
a
</mi>
<mi>
b
</mi>
</msubsup>
</mo>
<msubsup>
<mo>
∰
</mo>
<mi>
a
</mi>
<mi>
b
</mi>
</msubsup>
</mstyle>
</mrow>
<annotation encoding="application/x-tex">
@@ -764,19 +750,17 @@ exports[`A MathML builder should use <msupsub> for regular operators 1`] = `
<mstyle scriptlevel="0"
displaystyle="false"
>
<mo>
<msubsup>
<mo>
∑
</mo>
<mi>
a
</mi>
<mi>
b
</mi>
</msubsup>
</mo>
<msubsup>
<mo>
∑
</mo>
<mi>
a
</mi>
<mi>
b
</mi>
</msubsup>
</mstyle>
</mrow>
<annotation encoding="application/x-tex">
@@ -793,19 +777,17 @@ exports[`A MathML builder should use <munderover> for large operators 1`] = `
<mstyle scriptlevel="0"
displaystyle="true"
>
<mo>
<munderover>
<mo>
∑
</mo>
<mi>
a
</mi>
<mi>
b
</mi>
</munderover>
</mo>
<munderover>
<mo>
∑
</mo>
<mi>
a
</mi>
<mi>
b
</mi>
</munderover>
</mstyle>
</mrow>
<annotation encoding="application/x-tex">