Small fixes to math-output=HTML.

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

4 files changed, 17 insertions, 18 deletions

diff --git a/docutils/utils/math/math2html.py b/docutils/utils/math/math2html.py
index 4a425cea5..2d3149e9a 100644
--- a/docutils/utils/math/math2html.py
+++ b/docutils/utils/math/math2html.py
@@ -25,14 +25,6 @@
 
 import sys
 
-if sys.version_info < (2,4):
-  def reversed(sequence):
-    i = len(sequence)
-    while i > 0:
-        i = i - 1
-        yield sequence[i]
-
-
 class Trace(object):
   "A tracing class"
 
@@ -638,6 +630,9 @@ class FormulaConfig(object):
       u'\\int':u'∫', u'\\intop':u'∫', u'\\lim':u'lim', u'\\prod':u'∏', 
       u'\\smallint':u'∫', u'\\sum':u'∑', 
       }
+  # TODO: setting for simple enlarged vs. piecewise  symbols
+  for key in (u'\\int', u'\\intop', u'\\prod', u'\\sum'):
+    limitcommands[key] = '<span class="symbol">%s</span>' % limitcommands[key]
 
   misccommands = {
       u'\\limits':u'LimitPreviousCommand', u'\\newcommand':u'MacroDefinition', 
diff --git a/docutils/writers/html4css1/math.css b/docutils/writers/html4css1/math.css
index 4f43b37e0..e6eec6565 100644
--- a/docutils/writers/html4css1/math.css
+++ b/docutils/writers/html4css1/math.css
@@ -21,7 +21,7 @@
 /* Formulas */
 .formula {
 	text-align: center;
-	font-family: "DejaVu Serif", serif;
+	font-family: "Droid Serif", "DejaVu Serif", "STIX", serif;
 	margin: 1.2em 0;
 }
 span.formula {
@@ -113,9 +113,11 @@ span.root {
 	vertical-align: middle;
 }
 span.symbol {
+	line-height: 125%;
 	font-size: 125%;
 }
 span.bigsymbol {
+	line-height: 150%;
 	font-size: 150%;
 }
 span.largesymbol {
@@ -139,10 +141,10 @@ span.limits {
 }
 .limit {
 	display: table-row;
-	line-height: 95%;
+	line-height: 99%;
 }
 sup.limit, sub.limit {
-	line-height: 150%;
+	line-height: 100%;
 }
 span.symbolover {
 	display: inline-block;
diff --git a/test/functional/expected/math_output_html.html b/test/functional/expected/math_output_html.html
index b3777d6ed..09ee5cc1f 100644
--- a/test/functional/expected/math_output_html.html
+++ b/test/functional/expected/math_output_html.html
@@ -62,10 +62,10 @@ See <a class="reference internal" href="#eq-m">eq:M</a> and <a class="reference
 <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 class="formula">
-<span class="limits"><span class="limit">∫</span></span><span class="scripts"><sup class="script">1</sup><sub class="script">0</sub></span><i>x</i><sup><i>n</i></sup><i>dx</i> = <span class="fraction"><span class="ignored">(</span><span class="numerator">1</span><span class="ignored">)/(</span><span class="denominator"><i>n</i> + 1</span><span class="ignored">)</span></span>
+<span class="limits"><sup class="limit">1</sup><span class="limit"><span class="symbol">∫</span></span><sub class="limit">0</sub></span><i>x</i><sup><i>n</i></sup><i>dx</i> = <span class="fraction"><span class="ignored">(</span><span class="numerator">1</span><span class="ignored">)/(</span><span class="denominator"><i>n</i> + 1</span><span class="ignored">)</span></span>
 </div>
 <div class="formula">
-<span class="limits"><span class="limit">∑</span></span><span class="scripts"><sup class="script"><i>m</i></sup><sub class="script"><i>n</i> = 1</sub></span><i>n</i> = <span class="fraction"><span class="ignored">(</span><span class="numerator"><i>m</i>(<i>m</i> + 1)</span><span class="ignored">)/(</span><span class="denominator">2</span><span class="ignored">)</span></span>
+<span class="limits"><sup class="limit"><i>m</i></sup><span class="limit"><span class="symbol">∑</span></span><sub class="limit"><i>n</i> = 1</sub></span><i>n</i> = <span class="fraction"><span class="ignored">(</span><span class="numerator"><i>m</i>(<i>m</i> + 1)</span><span class="ignored">)/(</span><span class="denominator">2</span><span class="ignored">)</span></span>
 </div>
 <p>LaTeX-supported Unicode math symbols can be used in math roles and
 directives:</p>
@@ -121,7 +121,7 @@ physical system changes in time.</p>
 \widehat{xxx} -->
 <p>Modulation Transfer Function:</p>
 <div class="formula">
-<span class="text">MTF</span> = <span class="array"><span class="arrayrow"><span class="bracket align-left">|</span></span><span class="arrayrow"><span class="bracket align-left">|</span></span></span><span class="fraction"><span class="ignored">(</span><span class="numerator">ℱ{<i>s</i>(<i>x</i>)}</span><span class="ignored">)/(</span><span class="denominator">ℱ{<i>s</i>(<i>x</i>)}|<sub><i>ω</i><sub><i>x</i></sub> = 0</sub></span><span class="ignored">)</span></span><span class="array"><span class="arrayrow"><span class="bracket align-right">|</span></span><span class="arrayrow"><span class="bracket align-right">|</span></span></span> = <span class="mathrm"> abs</span><span class="array"><span class="arrayrow"><span class="bracket align-left">⎛</span></span><span class="arrayrow"><span class="bracket align-left">⎝</span></span></span><span class="fraction"><span class="ignored">(</span><span class="numerator"><span class="limits"><span class="limit">∫</span></span><span class="scripts"><sup class="script">∞</sup><sub class="script"> − ∞</sub></span><i>s</i>(<i>x</i>)<span class="mathrm">e</span><sup><span class="mathrm">i</span><i>ω</i><sub><i>x</i></sub><i>x</i></sup><span class="mathrm">d</span><i>x</i></span><span class="ignored">)/(</span><span class="denominator"><span class="limits"><span class="limit">∫</span></span><span class="scripts"><sup class="script">∞</sup><sub class="script"> − ∞</sub></span><i>s</i>(<i>x</i>)<span class="mathrm">d</span><i>x</i></span><span class="ignored">)</span></span><span class="array"><span class="arrayrow"><span class="bracket align-right">⎞</span></span><span class="arrayrow"><span class="bracket align-right">⎠</span></span></span>.
+<span class="text">MTF</span> = <span class="array"><span class="arrayrow"><span class="bracket align-left">|</span></span><span class="arrayrow"><span class="bracket align-left">|</span></span></span><span class="fraction"><span class="ignored">(</span><span class="numerator">ℱ{<i>s</i>(<i>x</i>)}</span><span class="ignored">)/(</span><span class="denominator">ℱ{<i>s</i>(<i>x</i>)}|<sub><i>ω</i><sub><i>x</i></sub> = 0</sub></span><span class="ignored">)</span></span><span class="array"><span class="arrayrow"><span class="bracket align-right">|</span></span><span class="arrayrow"><span class="bracket align-right">|</span></span></span> = <span class="mathrm"> abs</span><span class="array"><span class="arrayrow"><span class="bracket align-left">⎛</span></span><span class="arrayrow"><span class="bracket align-left">⎝</span></span></span><span class="fraction"><span class="ignored">(</span><span class="numerator"><span class="limits"><span class="limit"><span class="symbol">∫</span></span></span><span class="scripts"><sup class="script">∞</sup><sub class="script"> − ∞</sub></span><i>s</i>(<i>x</i>)<span class="mathrm">e</span><sup><span class="mathrm">i</span><i>ω</i><sub><i>x</i></sub><i>x</i></sup><span class="mathrm">d</span><i>x</i></span><span class="ignored">)/(</span><span class="denominator"><span class="limits"><span class="limit"><span class="symbol">∫</span></span></span><span class="scripts"><sup class="script">∞</sup><sub class="script"> − ∞</sub></span><i>s</i>(<i>x</i>)<span class="mathrm">d</span><i>x</i></span><span class="ignored">)</span></span><span class="array"><span class="arrayrow"><span class="bracket align-right">⎞</span></span><span class="arrayrow"><span class="bracket align-right">⎠</span></span></span>.
 </div>
 <p>Math split over two lines: If a double backslash is detected outside a
 <tt class="docutils literal"><span class="pre">\begin{...}</span> <span class="pre">\end{...}</span></tt> 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>
@@ -150,7 +150,7 @@ physical system changes in time.</p>
 
 </span>
 <span class="arraycell align-l">
- = <span class="limits"><span class="limit">∫</span></span><i>s</i><sub><span class="mathrm">in</span></sub>(<i>x</i>’)<i>s</i><sub><i>δ</i></sub>(<i>x</i> − <i>x</i>’)<span class="mathrm">d</span><i>x</i>’
+ = <span class="limits"><span class="limit"><span class="symbol">∫</span></span></span><i>s</i><sub><span class="mathrm">in</span></sub>(<i>x</i>’)<i>s</i><sub><i>δ</i></sub>(<i>x</i> − <i>x</i>’)<span class="mathrm">d</span><i>x</i>’
 </span>
 
 </span>
diff --git a/test/functional/input/data/math.css b/test/functional/input/data/math.css
index 4f43b37e0..e6eec6565 100644
--- a/test/functional/input/data/math.css
+++ b/test/functional/input/data/math.css
@@ -21,7 +21,7 @@
 /* Formulas */
 .formula {
 	text-align: center;
-	font-family: "DejaVu Serif", serif;
+	font-family: "Droid Serif", "DejaVu Serif", "STIX", serif;
 	margin: 1.2em 0;
 }
 span.formula {
@@ -113,9 +113,11 @@ span.root {
 	vertical-align: middle;
 }
 span.symbol {
+	line-height: 125%;
 	font-size: 125%;
 }
 span.bigsymbol {
+	line-height: 150%;
 	font-size: 150%;
 }
 span.largesymbol {
@@ -139,10 +141,10 @@ span.limits {
 }
 .limit {
 	display: table-row;
-	line-height: 95%;
+	line-height: 99%;
 }
 sup.limit, sub.limit {
-	line-height: 150%;
+	line-height: 100%;
 }
 span.symbolover {
 	display: inline-block;