MathML: First part of fix to #407.

Partially fix #407 "Inline MathML role and block MathML
directive appear with reversed styles."

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

1 files changed, 25 insertions, 25 deletions

diff --git a/docutils/test/functional/expected/math_output_mathml.xhtml b/docutils/test/functional/expected/math_output_mathml.html
index e8ee00d56..f41bc99fe 100644
--- a/docutils/test/functional/expected/math_output_mathml.xhtml
+++ b/docutils/test/functional/expected/math_output_mathml.html
@@ -13,14 +13,14 @@
 <h1 class="title">Mathematics</h1>
 
 <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>(</mo><msubsup><mi>x</mi><mi>n</mi><mn>2</mn></msubsup><mo>)</mo></mrow></math> and <math xmlns="http://www.w3.org/1998/Math/MathML">
+role specificator, <math xmlns="http://www.w3.org/1998/Math/MathML" displaystyle="false">
+<mrow><mi>n</mi><mo>!</mo><mo>+</mo><mo>sin</mo><mo>(</mo><msubsup><mi>x</mi><mi>n</mi><mn>2</mn></msubsup><mo>)</mo></mrow></math> and <math xmlns="http://www.w3.org/1998/Math/MathML" displaystyle="false">
 <mrow><msub><mi>A</mi><mtext>c</mtext></msub><mo>=</mo><mfrac>
 <mrow><mi>π</mi></mrow>
 <mrow><mn>4</mn></mrow></mfrac><msup><mi>d</mi><mn>2</mn></msup></mrow></math>, as well as displayed math via the
 <cite>math</cite> directive:</p>
 <div>
-<math xmlns="http://www.w3.org/1998/Math/MathML" mode="display">
+<math xmlns="http://www.w3.org/1998/Math/MathML" display="block">
 <mtable>
 <mtr>
 <mtd><mi>f</mi><mo>(</mo><mi>ϵ</mi><mo>)</mo><mo>=</mo><mfrac>
@@ -32,7 +32,7 @@ role specificator, <math xmlns="http://www.w3.org/1998/Math/MathML">
 </div>
 <p>Content may start on the first line of the directive, e.g.</p>
 <div>
-<math xmlns="http://www.w3.org/1998/Math/MathML" mode="display">
+<math xmlns="http://www.w3.org/1998/Math/MathML" display="block">
 <mtable>
 <mtr>
 <mtd><mi>N</mi><mo>=</mo><mfrac>
@@ -43,7 +43,7 @@ role specificator, <math xmlns="http://www.w3.org/1998/Math/MathML">
 See <a class="reference internal" href="#eq-m">eq:M</a> and <a class="reference internal" href="#eq-schrodinger">eq:schrödinger</a> below.</p>
 <p>The determinant of the matrix</p>
 <div id="eq-m">
-<math xmlns="http://www.w3.org/1998/Math/MathML" mode="display">
+<math xmlns="http://www.w3.org/1998/Math/MathML" display="block">
 <mtable>
 <mtr>
 <mtd><mstyle mathvariant="bold">
@@ -57,13 +57,13 @@ See <a class="reference internal" href="#eq-m">eq:M</a> and <a class="reference
 <mtd><mi>c</mi></mtd>
 <mtd><mi>d</mi></mtd></mtr></mtable></mrow></mfenced></mtd></mtr></mtable></math>
 </div>
-<p>is <math xmlns="http://www.w3.org/1998/Math/MathML">
+<p>is <math xmlns="http://www.w3.org/1998/Math/MathML" displaystyle="false">
 <mrow><mo>|</mo><mstyle mathvariant="bold">
 <mrow><mi>M</mi></mrow></mstyle><mo>|</mo><mo>=</mo><mi>a</mi><mi>d</mi><mo>-</mo><mi>b</mi><mi>c</mi></mrow></math>.</p>
 <p>More than one display math block can be put in one math directive.
 For example, the following sum and integral with limits:</p>
 <div>
-<math xmlns="http://www.w3.org/1998/Math/MathML" mode="display">
+<math xmlns="http://www.w3.org/1998/Math/MathML" display="block">
 <mtable>
 <mtr>
 <mtd><munderover><mo>∫</mo><mn>0</mn><mn>1</mn></munderover><msup><mi>x</mi><mi>n</mi></msup><mi>d</mi><mi>x</mi><mo>=</mo><mfrac>
@@ -71,7 +71,7 @@ For example, the following sum and integral with limits:</p>
 <mrow><mi>n</mi><mo>+</mo><mn>1</mn></mrow></mfrac></mtd></mtr></mtable></math>
 </div>
 <div>
-<math xmlns="http://www.w3.org/1998/Math/MathML" mode="display">
+<math xmlns="http://www.w3.org/1998/Math/MathML" display="block">
 <mtable>
 <mtr>
 <mtd><munderover><mo>∑</mo>
@@ -83,7 +83,7 @@ For example, the following sum and integral with limits:</p>
 directives:</p>
 <p>The Schrödinger equation</p>
 <div id="eq-schrodinger">
-<math xmlns="http://www.w3.org/1998/Math/MathML" mode="display">
+<math xmlns="http://www.w3.org/1998/Math/MathML" display="block">
 <mtable>
 <mtr>
 <mtd><mi>i</mi><mi>ℏ</mi><mfrac>
@@ -91,7 +91,7 @@ directives:</p>
 <mrow><mo>∂</mo><mi>t</mi></mrow></mfrac><mo>Ψ</mo><mo>=</mo><mover>
 <mrow><mi>H</mi></mrow><mo>^</mo></mover><mo>Ψ</mo><mo>,</mo></mtd></mtr></mtable></math>
 </div>
-<p>with the <em>wave function</em> <math xmlns="http://www.w3.org/1998/Math/MathML">
+<p>with the <em>wave function</em> <math xmlns="http://www.w3.org/1998/Math/MathML" displaystyle="false">
 <mrow><mo>Ψ</mo></mrow></math>, describes how the quantum state of a
 physical system changes in time.</p>
 <dl>
@@ -103,43 +103,43 @@ physical system changes in time.</p>
 <col style="width: 33%" />
 </colgroup>
 <tbody>
-<tr><td><p><math xmlns="http://www.w3.org/1998/Math/MathML">
+<tr><td><p><math xmlns="http://www.w3.org/1998/Math/MathML" displaystyle="false">
 <mrow><mover>
 <mrow><mi>a</mi></mrow><mo>´</mo></mover></mrow></math>      <span class="docutils literal">\acute{a}</span></p></td>
-<td><p><math xmlns="http://www.w3.org/1998/Math/MathML">
+<td><p><math xmlns="http://www.w3.org/1998/Math/MathML" displaystyle="false">
 <mrow><mover>
 <mrow><mi>t</mi></mrow><mo>˙</mo></mover></mrow></math>        <span class="docutils literal">\dot{t}</span></p></td>
-<td><p><math xmlns="http://www.w3.org/1998/Math/MathML">
+<td><p><math xmlns="http://www.w3.org/1998/Math/MathML" displaystyle="false">
 <mrow><mover>
 <mrow><mi>γ</mi></mrow><mo>^</mo></mover></mrow></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">
+<tr><td><p><math xmlns="http://www.w3.org/1998/Math/MathML" displaystyle="false">
 <mrow><mover>
 <mrow><mi>a</mi></mrow><mo>`</mo></mover></mrow></math>      <span class="docutils literal">\grave{a}</span></p></td>
-<td><p><math xmlns="http://www.w3.org/1998/Math/MathML">
+<td><p><math xmlns="http://www.w3.org/1998/Math/MathML" displaystyle="false">
 <mrow><mover>
 <mrow><mi>t</mi></mrow><mo>¨</mo></mover></mrow></math>       <span class="docutils literal">\ddot{t}</span></p></td>
-<td><p><math xmlns="http://www.w3.org/1998/Math/MathML">
+<td><p><math xmlns="http://www.w3.org/1998/Math/MathML" displaystyle="false">
 <mrow><mover>
 <mrow><mi>α</mi></mrow><mo>˜</mo></mover></mrow></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">
+<tr><td><p><math xmlns="http://www.w3.org/1998/Math/MathML" displaystyle="false">
 <mrow><mover>
 <mrow><mi>x</mi></mrow><mo>˘</mo></mover></mrow></math>      <span class="docutils literal">\breve{x}</span></p></td>
-<td><p><math xmlns="http://www.w3.org/1998/Math/MathML">
+<td><p><math xmlns="http://www.w3.org/1998/Math/MathML" displaystyle="false">
 <mrow><mover>
 <mrow><mi>t</mi></mrow><mo>⃛</mo></mover></mrow></math>      <span class="docutils literal">\dddot{t}</span></p></td>
-<td><p><math xmlns="http://www.w3.org/1998/Math/MathML">
+<td><p><math xmlns="http://www.w3.org/1998/Math/MathML" displaystyle="false">
 <mrow><mover>
 <mrow><mi>ı</mi></mrow><mo>⃗</mo></mover></mrow></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">
+<tr><td><p><math xmlns="http://www.w3.org/1998/Math/MathML" displaystyle="false">
 <mrow><mover>
 <mrow><mi>a</mi></mrow><mo>ˇ</mo></mover></mrow></math>      <span class="docutils literal">\check{a}</span></p></td>
-<td><p><math xmlns="http://www.w3.org/1998/Math/MathML">
+<td><p><math xmlns="http://www.w3.org/1998/Math/MathML" displaystyle="false">
 <mrow><mover>
 <mrow><mi>a</mi></mrow><mo>¯</mo></mover></mrow></math>        <span class="docutils literal">\bar{a}</span></p></td>
-<td><p><math xmlns="http://www.w3.org/1998/Math/MathML">
+<td><p><math xmlns="http://www.w3.org/1998/Math/MathML" displaystyle="false">
 <mrow><mover>
 <mrow><mi>R</mi></mrow><mo>⃗</mo></mover></mrow></math>        <span class="docutils literal">\vec{R}</span></p></td>
 </tr>
@@ -151,7 +151,7 @@ physical system changes in time.</p>
 \widehat{xxx} -->
 <p>Modulation Transfer Function:</p>
 <div>
-<math xmlns="http://www.w3.org/1998/Math/MathML" mode="display">
+<math xmlns="http://www.w3.org/1998/Math/MathML" display="block">
 <mtable>
 <mtr>
 <mtd><mtext>MTF</mtext><mo>=</mo><mfenced open="|" close="|">
@@ -176,7 +176,7 @@ physical system changes in time.</p>
 <span class="docutils literal"><span class="pre">\begin{...}</span> <span class="pre">\end{...}</span></span> pair, the math code is wrapped in an <a class="reference external" href="ftp://ftp.ams.org/ams/doc/amsmath/short-math-guide.pdf">AMSmath</a>
 <span class="docutils literal">align</span> environment:</p>
 <div>
-<math xmlns="http://www.w3.org/1998/Math/MathML" mode="display">
+<math xmlns="http://www.w3.org/1998/Math/MathML" display="block">
 <mtable>
 <mtr>
 <mtd><msub><mi>s</mi>
@@ -190,7 +190,7 @@ physical system changes in time.</p>
 </div>
 <p>Cases (&quot;manually&quot;, with <span class="docutils literal">matrix</span> environment):</p>
 <div>
-<math xmlns="http://www.w3.org/1998/Math/MathML" mode="display">
+<math xmlns="http://www.w3.org/1998/Math/MathML" display="block">
 <mtable>
 <mtr>
 <mtd><mtext>sgn</mtext><mo>(</mo><mi>x</mi><mo>)</mo><mo>=</mo><mfenced open="{" close="">