MathML: remove unrequired <mrow>s, support more commands.

Support additional commands from the AMS math-guide.

Remove <mrow>, if it is single child and the parent inferres an mrow
or if it has only one child element.

tex_number(): do not return trailing delimiter.

Use class "mathscr" instead of hard-codes font name for \mathscr.

git-svn-id: https://svn.code.sf.net/p/docutils/code/trunk@8756 929543f6-e4f2-0310-98a6-ba3bd3dd1d04

1 files changed, 31 insertions, 93 deletions

diff --git a/docutils/test/functional/expected/math_output_mathml.html b/docutils/test/functional/expected/math_output_mathml.html
index b5c8f7e31..11eb52fe4 100644
--- a/docutils/test/functional/expected/math_output_mathml.html
+++ b/docutils/test/functional/expected/math_output_mathml.html
@@ -33,12 +33,8 @@ role specificator, <math xmlns="http://www.w3.org/1998/Math/MathML">
   </msub>
   <mo>=</mo>
   <mfrac>
-    <mrow>
-      <mi>π</mi>
-    </mrow>
-    <mrow>
-      <mn>4</mn>
-    </mrow>
+    <mi>π</mi>
+    <mn>4</mn>
   </mfrac>
   <msup>
     <mi>d</mi>
@@ -57,9 +53,7 @@ role specificator, <math xmlns="http://www.w3.org/1998/Math/MathML">
         <mo stretchy="false">)</mo>
         <mo>=</mo>
         <mfrac>
-          <mrow>
-            <mn>1</mn>
-          </mrow>
+          <mn>1</mn>
           <mrow>
             <mn>1</mn>
             <mo>+</mo>
@@ -68,9 +62,7 @@ role specificator, <math xmlns="http://www.w3.org/1998/Math/MathML">
             <mrow>
               <mo>(</mo>
               <mfrac>
-                <mrow>
-                  <mi>ε</mi>
-                </mrow>
+                <mi>ε</mi>
                 <mrow>
                   <msub>
                     <mi>k</mi>
@@ -97,12 +89,8 @@ role specificator, <math xmlns="http://www.w3.org/1998/Math/MathML">
         <mi>N</mi>
         <mo>=</mo>
         <mfrac>
-          <mrow>
-            <mtext>number of apples</mtext>
-          </mrow>
-          <mrow>
-            <mn>7</mn>
-          </mrow>
+          <mtext>number of apples</mtext>
+          <mn>7</mn>
         </mfrac>
       </mtd>
     </mtr>
@@ -177,9 +165,7 @@ For example, the following sum and integral with limits:</p>
         <mi>x</mi>
         <mo>=</mo>
         <mfrac>
-          <mrow>
-            <mn>1</mn>
-          </mrow>
+          <mn>1</mn>
           <mrow>
             <mi>n</mi>
             <mo>+</mo>
@@ -216,9 +202,7 @@ For example, the following sum and integral with limits:</p>
             <mn>1</mn>
             <mo stretchy="false">)</mo>
           </mrow>
-          <mrow>
-            <mn>2</mn>
-          </mrow>
+          <mn>2</mn>
         </mfrac>
       </mtd>
     </mtr>
@@ -236,9 +220,7 @@ directives:</p>
         <mi>i</mi>
         <mi>ℏ</mi>
         <mfrac>
-          <mrow>
-            <mo>∂</mo>
-          </mrow>
+          <mo>∂</mo>
           <mrow>
             <mo>∂</mo>
             <mi>t</mi>
@@ -247,9 +229,7 @@ directives:</p>
         <mi class="capital-greek">Ψ</mi>
         <mo>=</mo>
         <mover accent="true">
-          <mrow>
-            <mi>H</mi>
-          </mrow>
+          <mi>H</mi>
           <mo>ˆ</mo>
         </mover>
         <mi class="capital-greek">Ψ</mi>
@@ -274,100 +254,76 @@ physical system changes in time.</p>
 <tbody>
 <tr><td><p><math xmlns="http://www.w3.org/1998/Math/MathML">
   <mover accent="true">
-    <mrow>
-      <mi>a</mi>
-    </mrow>
+    <mi>a</mi>
     <mo>´</mo>
   </mover>
 </math>      <span class="docutils literal">\acute{a}</span></p></td>
 <td><p><math xmlns="http://www.w3.org/1998/Math/MathML">
   <mover accent="true">
-    <mrow>
-      <mi>t</mi>
-    </mrow>
+    <mi>t</mi>
     <mo>˙</mo>
   </mover>
 </math>        <span class="docutils literal">\dot{t}</span></p></td>
 <td><p><math xmlns="http://www.w3.org/1998/Math/MathML">
   <mover accent="true">
-    <mrow>
-      <mi>γ</mi>
-    </mrow>
+    <mi>γ</mi>
     <mo>ˆ</mo>
   </mover>
 </math>   <span class="docutils literal"><span class="pre">\hat{\gamma}</span></span></p></td>
 </tr>
 <tr><td><p><math xmlns="http://www.w3.org/1998/Math/MathML">
   <mover accent="true">
-    <mrow>
-      <mi>a</mi>
-    </mrow>
+    <mi>a</mi>
     <mo>`</mo>
   </mover>
 </math>      <span class="docutils literal">\grave{a}</span></p></td>
 <td><p><math xmlns="http://www.w3.org/1998/Math/MathML">
   <mover accent="true">
-    <mrow>
-      <mi>t</mi>
-    </mrow>
+    <mi>t</mi>
     <mo>¨</mo>
   </mover>
 </math>       <span class="docutils literal">\ddot{t}</span></p></td>
 <td><p><math xmlns="http://www.w3.org/1998/Math/MathML">
   <mover accent="true">
-    <mrow>
-      <mi>α</mi>
-    </mrow>
+    <mi>α</mi>
     <mo>˜</mo>
   </mover>
 </math> <span class="docutils literal"><span class="pre">\tilde{\alpha}</span></span></p></td>
 </tr>
 <tr><td><p><math xmlns="http://www.w3.org/1998/Math/MathML">
   <mover accent="true">
-    <mrow>
-      <mi>x</mi>
-    </mrow>
+    <mi>x</mi>
     <mo>˘</mo>
   </mover>
 </math>      <span class="docutils literal">\breve{x}</span></p></td>
 <td><p><math xmlns="http://www.w3.org/1998/Math/MathML">
   <mover accent="true">
-    <mrow>
-      <mi>t</mi>
-    </mrow>
+    <mi>t</mi>
     <mo>⃛</mo>
   </mover>
 </math>      <span class="docutils literal">\dddot{t}</span></p></td>
 <td><p><math xmlns="http://www.w3.org/1998/Math/MathML">
   <mover accent="false">
-    <mrow>
-      <mi>ı</mi>
-    </mrow>
+    <mi>ı</mi>
     <mo>→</mo>
   </mover>
 </math>   <span class="docutils literal"><span class="pre">\vec{\imath}</span></span></p></td>
 </tr>
 <tr><td><p><math xmlns="http://www.w3.org/1998/Math/MathML">
   <mover accent="true">
-    <mrow>
-      <mi>a</mi>
-    </mrow>
+    <mi>a</mi>
     <mo>ˇ</mo>
   </mover>
 </math>      <span class="docutils literal">\check{a}</span></p></td>
 <td><p><math xmlns="http://www.w3.org/1998/Math/MathML">
   <mover accent="true">
-    <mrow>
-      <mi>a</mi>
-    </mrow>
+    <mi>a</mi>
     <mo>ˉ</mo>
   </mover>
 </math>        <span class="docutils literal">\bar{a}</span></p></td>
 <td><p><math xmlns="http://www.w3.org/1998/Math/MathML">
   <mover accent="false">
-    <mrow>
-      <mi>R</mi>
-    </mrow>
+    <mi>R</mi>
     <mo>→</mo>
   </mover>
 </math>        <span class="docutils literal">\vec{R}</span></p></td>
@@ -411,9 +367,7 @@ physical system changes in time.</p>
                 <mrow>
                   <msub>
                     <mi>ω</mi>
-                    <mrow>
-                      <mi>x</mi>
-                    </mrow>
+                    <mi>x</mi>
                   </msub>
                   <mo>=</mo>
                   <mn>0</mn>
@@ -435,9 +389,7 @@ physical system changes in time.</p>
                   <mo>−</mo>
                   <mo>∞</mo>
                 </mrow>
-                <mrow>
-                  <mo>∞</mo>
-                </mrow>
+                <mo>∞</mo>
               </munderover>
               <mi>s</mi>
               <mo stretchy="false">(</mo>
@@ -449,17 +401,13 @@ physical system changes in time.</p>
                   <mi mathvariant="normal">i</mi>
                   <msub>
                     <mi>ω</mi>
-                    <mrow>
-                      <mi>x</mi>
-                    </mrow>
+                    <mi>x</mi>
                   </msub>
                   <mi>x</mi>
                 </mrow>
               </msup>
               <mi mathvariant="normal">d</mi>
-              <mrow>
-                <mi>x</mi>
-              </mrow>
+              <mi>x</mi>
             </mrow>
             <mrow>
               <munderover>
@@ -468,18 +416,14 @@ physical system changes in time.</p>
                   <mo>−</mo>
                   <mo>∞</mo>
                 </mrow>
-                <mrow>
-                  <mo>∞</mo>
-                </mrow>
+                <mo>∞</mo>
               </munderover>
               <mi>s</mi>
               <mo stretchy="false">(</mo>
               <mi>x</mi>
               <mo stretchy="false">)</mo>
               <mi mathvariant="normal">d</mi>
-              <mrow>
-                <mi>x</mi>
-              </mrow>
+              <mi>x</mi>
             </mrow>
           </mfrac>
           <mo>)</mo>
@@ -500,9 +444,7 @@ physical system changes in time.</p>
       <mtd>
         <msub>
           <mi>s</mi>
-          <mrow>
-            <mi mathvariant="normal">out</mi>
-          </mrow>
+          <mi mathvariant="normal">out</mi>
         </msub>
         <mo stretchy="false">(</mo>
         <mi>x</mi>
@@ -512,9 +454,7 @@ physical system changes in time.</p>
         <mo>=</mo>
         <msub>
           <mi>s</mi>
-          <mrow>
-            <mi mathvariant="normal">in</mi>
-          </mrow>
+          <mi mathvariant="normal">in</mi>
         </msub>
         <mo stretchy="false">(</mo>
         <mi>x</mi>
@@ -541,9 +481,7 @@ physical system changes in time.</p>
         <mo>∫</mo>
         <msub>
           <mi>s</mi>
-          <mrow>
-            <mi mathvariant="normal">in</mi>
-          </mrow>
+          <mi mathvariant="normal">in</mi>
         </msub>
         <mo stretchy="false">(</mo>
         <mi>x</mi>