MathML: support space commands, fix math alphabets, cleanup.

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

1 files changed, 23 insertions, 17 deletions

diff --git a/docutils/test/functional/expected/math_output_mathml.html b/docutils/test/functional/expected/math_output_mathml.html
index a11c0ab66..62f4a9b32 100644
--- a/docutils/test/functional/expected/math_output_mathml.html
+++ b/docutils/test/functional/expected/math_output_mathml.html
@@ -15,7 +15,7 @@
 <p>Docutils supports inline math with the prefix or postfix <span class="docutils literal">:math:</span>
 role specificator, <math xmlns="http://www.w3.org/1998/Math/MathML">
   <mrow>
-    <mi>n</mi><mo>!</mo><mo>+</mo><mo>sin</mo><mo stretchy="false">(</mo>
+    <mi>n</mi><mo>!</mo><mo>+</mo><mi>sin</mi><mo>&ApplyFunction;</mo><mo stretchy="false">(</mo>
     <msubsup>
       <mi>x</mi><mi>n</mi><mn>2</mn>
     </msubsup>
@@ -52,7 +52,7 @@ role specificator, <math xmlns="http://www.w3.org/1998/Math/MathML">
             <mn>1</mn>
           </mrow>
           <mrow>
-            <mn>1</mn><mo>+</mo><mo>exp</mo>
+            <mn>1</mn><mo>+</mo><mi>exp</mi><mo>&ApplyFunction;</mo>
             <mrow>
               <mo>(</mo>
               <mfrac>
@@ -213,14 +213,14 @@ directives:</p>
             <mo>∂</mo><mi>t</mi>
           </mrow>
         </mfrac>
-        <mi mathvariant="normal">Ψ</mi><mo>=</mo>
+        <mi class="capital-greek">Ψ</mi><mo>=</mo>
         <mover>
           <mrow>
             <mi>H</mi>
           </mrow>
           <mo>^</mo>
         </mover>
-        <mi mathvariant="normal">Ψ</mi><mo>,</mo>
+        <mi class="capital-greek">Ψ</mi><mo>,</mo>
       </mtd>
     </mtr>
   </mtable>
@@ -228,7 +228,7 @@ directives:</p>
 </div>
 <p>with the <em>wave function</em> <math xmlns="http://www.w3.org/1998/Math/MathML">
   <mrow>
-    <mi mathvariant="normal">Ψ</mi>
+    <mi class="capital-greek">Ψ</mi>
   </mrow>
 </math>, describes how the quantum state of a
 physical system changes in time.</p>
@@ -382,10 +382,16 @@ physical system changes in time.</p>
           <mo>|</mo>
           <mfrac>
             <mrow>
-              <mi>ℱ</mi><mo>{</mo><mi>s</mi><mo stretchy="false">(</mo><mi>x</mi><mo stretchy="false">)</mo><mo>}</mo>
+              <mstyle mathvariant="script">
+                <mi>F</mi>
+              </mstyle>
+              <mo>{</mo><mi>s</mi><mo stretchy="false">(</mo><mi>x</mi><mo stretchy="false">)</mo><mo>}</mo>
             </mrow>
             <mrow>
-              <mi>ℱ</mi><mo>{</mo><mi>s</mi><mo stretchy="false">(</mo><mi>x</mi><mo stretchy="false">)</mo><mo>}</mo>
+              <mstyle mathvariant="script">
+                <mi>F</mi>
+              </mstyle>
+              <mo>{</mo><mi>s</mi><mo stretchy="false">(</mo><mi>x</mi><mo stretchy="false">)</mo><mo>}</mo>
               <msub>
                 <mo stretchy="false">|</mo>
                 <mrow>
@@ -402,7 +408,7 @@ physical system changes in time.</p>
           </mfrac>
           <mo>|</mo>
         </mrow>
-        <mo>=</mo><mtext>abs</mtext>
+        <mo>=</mo><mi mathvariant="normal">abs</mi>
         <mrow>
           <mo>(</mo>
           <mfrac>
@@ -418,9 +424,9 @@ physical system changes in time.</p>
               </munderover>
               <mi>s</mi><mo stretchy="false">(</mo><mi>x</mi><mo stretchy="false">)</mo>
               <msup>
-                <mtext>e</mtext>
+                <mi mathvariant="normal">e</mi>
                 <mrow>
-                  <mtext>i</mtext>
+                  <mi mathvariant="normal">i</mi>
                   <msub>
                     <mi>ω</mi>
                     <mrow>
@@ -430,7 +436,7 @@ physical system changes in time.</p>
                   <mi>x</mi>
                 </mrow>
               </msup>
-              <mtext>d</mtext>
+              <mi mathvariant="normal">d</mi>
               <mrow>
                 <mi>x</mi>
               </mrow>
@@ -445,7 +451,7 @@ physical system changes in time.</p>
                   <mo>∞</mo>
                 </mrow>
               </munderover>
-              <mi>s</mi><mo stretchy="false">(</mo><mi>x</mi><mo stretchy="false">)</mo><mtext>d</mtext>
+              <mi>s</mi><mo stretchy="false">(</mo><mi>x</mi><mo stretchy="false">)</mo><mi mathvariant="normal">d</mi>
               <mrow>
                 <mi>x</mi>
               </mrow>
@@ -470,7 +476,7 @@ physical system changes in time.</p>
         <msub>
           <mi>s</mi>
           <mrow>
-            <mtext>out</mtext>
+            <mi mathvariant="normal">out</mi>
           </mrow>
         </msub>
         <mo stretchy="false">(</mo><mi>x</mi><mo stretchy="false">)</mo>
@@ -480,7 +486,7 @@ physical system changes in time.</p>
         <msub>
           <mi>s</mi>
           <mrow>
-            <mtext>in</mtext>
+            <mi mathvariant="normal">in</mi>
           </mrow>
         </msub>
         <mo stretchy="false">(</mo><mi>x</mi><mo>'</mo><mo stretchy="false">)</mo><mo>*</mo>
@@ -498,14 +504,14 @@ physical system changes in time.</p>
         <msub>
           <mi>s</mi>
           <mrow>
-            <mtext>in</mtext>
+            <mi mathvariant="normal">in</mi>
           </mrow>
         </msub>
         <mo stretchy="false">(</mo><mi>x</mi><mo>'</mo><mo stretchy="false">)</mo>
         <msub>
           <mi>s</mi><mi>δ</mi>
         </msub>
-        <mo stretchy="false">(</mo><mi>x</mi><mo>-</mo><mi>x</mi><mo>'</mo><mo stretchy="false">)</mo><mtext>d</mtext><mi>x</mi><mo>'</mo>
+        <mo stretchy="false">(</mo><mi>x</mi><mo>-</mo><mi>x</mi><mo>'</mo><mo stretchy="false">)</mo><mi mathvariant="normal">d</mi><mi>x</mi><mo>'</mo>
       </mtd>
     </mtr>
   </mtable>
@@ -517,7 +523,7 @@ physical system changes in time.</p>
   <mtable class="align" displaystyle="true">
     <mtr>
       <mtd>
-        <mtext>sgn</mtext><mo stretchy="false">(</mo><mi>x</mi><mo stretchy="false">)</mo><mo>=</mo>
+        <mi mathvariant="normal">sgn</mi><mo stretchy="false">(</mo><mi>x</mi><mo stretchy="false">)</mo><mo>=</mo>
         <mrow>
           <mo>{</mo>
           <mtable>