1 files changed, 64 insertions, 36 deletions

diff --git a/WebCore/css/mathml.css b/WebCore/css/mathml.css
index e725d8c..b56a24b 100644
--- a/WebCore/css/mathml.css
+++ b/WebCore/css/mathml.css
@@ -1,91 +1,116 @@
 @namespace "http://www.w3.org/1998/Math/MathML";
 
-/* approved */
 math {
     font-family: Symbol, STIXGeneral, "Times New Roman";
     display: inline-block;
     padding: 0px;
     margin: 0px;
-    text-indent: 0;
-    font-size: 1.1em;
     vertical-align: baseline;
+    line-height: 1.0;
 }
+
 math[display="block"] {
-    font-family: "New Times Roman"
     display: block;
     text-align: center;
     page-break-inside: avoid;
+    margin-bottom: 1em;
+}
+
+math > * {
+    vertical-align: baseline;
+}
+
+mrow, mfenced {
+    display: inline-block;
+    white-space: nowrap;
+    vertical-align: middle;
+}
+
+mrow > mo, mfenced > mo, math > mo
+{
+    vertical-align: middle;
+}
+
+mi, mtext {
+    font-style: italic;
+    padding-right: 0.1em;
+}
+
+mi + mrow {
+    margin-left: 0.1em;
 }
 
 mfrac {
+    display: inline-block;
     vertical-align: middle;
 }
 
 msub, msup {
-   display: inline-block;
+    display: inline-block;
+    vertical-align: baseline;
 }
 
 msub > * + * {
-   vertical-align: sub;
-   font-size: 0.75em;
-   line-height: 0.75em;
+    vertical-align: sub;
+    font-size: 0.75em;
 }
 
 msup > * + * {
-   vertical-align: super;
-   font-size: 0.75em;
-   line-height: 0.75em;
+    vertical-align: super;
+    font-size: 0.75em;
+}
+
+msubsup {
+    display: inline-block;
+    vertical-align: baseline;
 }
 
 msubsup > * {
     margin: 0px;
     padding: 0px;
-    vertical-align: middle;
 }
 
 msubsup > * + * {
-   font-size: 0.75em;
-   line-height: 0.75em;
+    font-size: 0.75em;
 }
 
-munderover {
-    vertical-align: middle;
+munder, mover, munderover {
+    display: inline-block;
+    vertical-align: baseline;
 }
 
 munderover > * + *, mover > * + *, munder > * + * {
-   font-size: 0.75em;
-   line-height: 0.5625em;
+    font-size: 0.75em;
 }
 
-mrow {
-    line-height: 1em;
-    white-space: nowrap;
-    vertical-align: middle;
+mover > mi {
+    text-align: center;
 }
 
-mfenced > * {
-    vertical-align: middle;
+mo, mn, mi, mtext {
+    padding: 0px;
+    margin: 0px;
+}
+
+mo {
+    display: inline-block;
 }
 
-mo, mn, mi {
-   line-height: 0.75em;
-   padding: 0px;
-   margin: 0px;
+mo {
+    padding-left: 0.05em;
+    padding-right: 0.05em;
 }
 
 mo[mathsize="small"], mn[mathsize="small"], mi[mathsize="small"] {
-   font-size: 0.75em;
-   line-height: 0.5625em;
+    font-size: 0.75em;
 }
 
 mo[mathsize="normal"],mn[mathsize="normal"],mi[mathsize="normal"] {
-   font-size: 1em;
-   line-height: 0.75em;
+    font-size: 1em;
 }
 
 mo[mathsize="big"], mn[mathsize="big"], mi[mathsize="big"] {
-   line-height: 1.2em;
-   font-size: 1.5em;
+    font-size: 1.5em;
 }
  
 annotation, annotation-xml {
@@ -100,25 +125,25 @@ merror {
 }
 
 msqrt {
+    display: inline-block;
     padding-top: 0.2em;
     padding-left: 0.75em;
 }
 
 mroot {
+    display: inline-block;
     padding-top: 0.2em;
     padding-left: 0.2em;
 }
 
 mroot > * + * {
     font-size: 0.75em;
-    line-height: 0.75em;
     vertical-align: top;
     padding-right: 0.3em;
 }
 
 mtable {
     display: inline-table;
-    line-height: 1.5em;
     text-align: center;
     vertical-align: middle;
 }
@@ -168,3 +193,6 @@ mtable[columnlines="dashed"] > mtr > mtd + mtd {
     border-left: dashed thin;
 }
 
+mspace[linebreak="newline"] {
+    display: block;
+}