Add \makeat switches to babel settings if necessary.

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

diff --git a/src/mathed/InsetMathMatrix.cpp b/src/mathed/InsetMathMatrix.cpp
index 7b73d3803e43b4e5dd714f43b59dd239b3c7b1b5..4d309d13e88dba668401e28dd6b23e4562f17149 100644 (file)
--- a/src/mathed/InsetMathMatrix.cpp
+++ b/src/mathed/InsetMathMatrix.cpp
@@ -12,9 +12,11 @@
 
 #include "InsetMathMatrix.h"
 #include "MathData.h"
-#include "MathExtern.h"
 #include "MathStream.h"
 
+#include "support/convert.h"
+
+using namespace std;
 
 namespace lyx {
 
@@ -90,25 +92,45 @@ void InsetMathMatrix::mathematica(MathematicaStream & os) const
 }
 
 
-docstring InsetMathMatrix::mathmlize(MathStream & os) const
+void InsetMathMatrix::mathmlize(MathStream & os) const
 {
        os << "<mo form='prefix' fence='true' stretchy='true' symmetric='true' lspace='thinmathspace'>"
           << left_ << "</mo>";
        os << MTag("mtable");
-       docstring rv;
        for (row_type row = 0; row < nrows(); ++row) {
                os << MTag("mtr");
-               for (col_type col = 0; col < ncols(); ++col) {
-                       os << MTag("mtd");
-                       rv += lyx::mathmlize(cell(index(row, col)), os);
-                       os << ETag("mtd");
-               }
+               for (col_type col = 0; col < ncols(); ++col)
+                       os << MTag("mtd") << cell(index(row, col)) << ETag("mtd");
                os << ETag("mtr");
        }
        os << ETag("mtable");
        os << "<mo form='postfix' fence='true' stretchy='true' symmetric='true' lspace='thinmathspace'>"
           << right_ << "</mo>";
-       return rv;
+}
+
+
+void InsetMathMatrix::htmlize(HtmlStream & os) const
+{
+       os << MTag("table", "class='matrix'") << '\n';
+
+       // we do not print the delimiters but instead try to hack them
+       string const rows = convert<string>(nrows());
+       string const lattrib = 
+                       "class='ldelim' rowspan='" + rows + "'";
+       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)
+                       os << MTag("td") << cell(index(row, col)) << ETag("td") << '\n';
+               if (row == 0)
+                       os << MTag("td", rattrib) << ETag("td") << '\n';
+               os << ETag("tr") << '\n';
+       }
+       os << ETag("table") << '\n';
 }