Assure correct spacing of colored items in mathed

[lyx.git] / src / mathed / InsetMathMatrix.cpp

diff --git a/src/mathed/InsetMathMatrix.cpp b/src/mathed/InsetMathMatrix.cpp
index 852cd893a5244230ee5d754f9c7a89927061d296..bd43581ce0d6718dcb340f3ff37d3648f275dd49 100644 (file)
--- a/src/mathed/InsetMathMatrix.cpp
+++ b/src/mathed/InsetMathMatrix.cpp
@@ -20,7 +20,7 @@ using namespace std;
 
 namespace lyx {
 
-InsetMathMatrix::InsetMathMatrix(InsetMathGrid const & p, 
+InsetMathMatrix::InsetMathMatrix(InsetMathGrid const & p,
                        docstring const & left, docstring const & right)
        : InsetMathGrid(p), left_(left), right_(right)
 {}
@@ -92,28 +92,30 @@ void InsetMathMatrix::mathematica(MathematicaStream & os) const
 }
 
 
-void InsetMathMatrix::mathmlize(MathStream & os) const
+void InsetMathMatrix::mathmlize(MathStream & ms) const
 {
-       os << "<mo form='prefix' fence='true' stretchy='true' symmetric='true' lspace='thinmathspace'>"
-          << left_ << "</mo>";
-       os << MTag("mtable");
+       ms << "<" << from_ascii(ms.namespacedTag("mo")) << " form='prefix' fence='true' stretchy='true' symmetric='true' lspace='thinmathspace'>"
+          << convertDelimToXMLEscape(left_, ms.xmlMode())
+          << "</" << from_ascii(ms.namespacedTag("mo")) << ">"
+          << MTag("mtable");
        for (row_type row = 0; row < nrows(); ++row) {
-               os << MTag("mtr");
+               ms << MTag("mtr");
                for (col_type col = 0; col < ncols(); ++col) {
                        idx_type const i = index(row, col);
-                       if (cellinfo_[i].multi_ != CELL_PART_OF_MULTICOLUMN) {
+                       if (cellinfo(i).multi != CELL_PART_OF_MULTICOLUMN) {
                                col_type const cellcols = ncellcols(i);
                                ostringstream attr;
                                if (cellcols > 1)
                                        attr << "columnspan='" << cellcols << '\'';
-                               os << MTag("mtd", attr.str()) << cell(i) << ETag("mtd");
+                               ms << MTag("mtd", attr.str()) << cell(i) << ETag("mtd");
                        }
                }
-               os << ETag("mtr");
+               ms << ETag("mtr");
        }
-       os << ETag("mtable");
-       os << "<mo form='postfix' fence='true' stretchy='true' symmetric='true' lspace='thinmathspace'>"
-          << right_ << "</mo>";
+       ms << ETag("mtable")
+          << "<" << from_ascii(ms.namespacedTag("mo")) << " form='postfix' fence='true' stretchy='true' symmetric='true' lspace='thinmathspace'>"
+          << convertDelimToXMLEscape(right_, ms.xmlMode())
+          << "</" << from_ascii(ms.namespacedTag("mo")) << ">";
 }
 
 
@@ -123,18 +125,18 @@ void InsetMathMatrix::htmlize(HtmlStream & os) const
 
        // we do not print the delimiters but instead try to hack them
        string const rows = convert<string>(nrows());
-       string const lattrib = 
+       string const lattrib =
                        "class='ldelim' rowspan='" + rows + "'";
-       string const rattrib = 
+       string const rattrib =
                        "class='rdelim' rowspan='" + rows + "'";
-       
+
        for (row_type row = 0; row < nrows(); ++row) {
                os << MTag("tr") << '\n';
                if (row == 0)
                        os << MTag("td", lattrib) << ETag("td") << '\n';
                for (col_type col = 0; col < ncols(); ++col) {
                        idx_type const i = index(row, col);
-                       if (cellinfo_[i].multi_ != CELL_PART_OF_MULTICOLUMN) {
+                       if (cellinfo(i).multi != CELL_PART_OF_MULTICOLUMN) {
                                col_type const cellcols = ncellcols(i);
                                ostringstream attr;
                                if (cellcols > 1)