Fix matrix output, at least a bit. A little more work needs to be done

here, though.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32548 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/mathed/InsetMathMatrix.cpp b/src/mathed/InsetMathMatrix.cpp
index b4cecfa6c3785871f3b86c3e0913d2b9de9921a9..0460a9443ffd2dc14e992f596ef5f1b10002dfe5 100644 (file)
--- a/src/mathed/InsetMathMatrix.cpp
+++ b/src/mathed/InsetMathMatrix.cpp
@@ -88,9 +88,24 @@ void InsetMathMatrix::mathematica(MathematicaStream & os) const
 }
 
 
+// FIXME XHTML
+// We need more information here, so we can output the correct
+// delimiters, which will not always be "[". To do this, we need
+// to make some changes to InsetMathMatrix, adding a member to 
+// record the type of delimiter, and then make the extractMatrices 
+// routine in MathExtern give us this information.
 void InsetMathMatrix::mathmlize(MathStream & os) const
 {
-       InsetMathGrid::mathmlize(os);
+       os << "<mo form='prefix' fence='true' stretchy='true' symmetric='true' lspace='thinmathspace'>[</mo>";
+       os << MTag("mtable");
+       for (row_type row = 0; row < nrows(); ++row) {
+               os << MTag("mtr");
+               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'>]</mo>";
 }
 
 

diff --git a/src/mathed/InsetMathMatrix.h b/src/mathed/InsetMathMatrix.h
index 570b39b0815f3ddaedfc0120524faca1f1b827ad..971c30129ed6c772782958554d42f7537165cb59 100644 (file)
--- a/src/mathed/InsetMathMatrix.h
+++ b/src/mathed/InsetMathMatrix.h
@@ -18,7 +18,7 @@
 namespace lyx {
 
 
-// "shortcut" for DelimInset("(",ArrayInset,")")
+// "shortcut" for DelimInset("(",ArrayInset,")") used by MathExtern
 
 class InsetMathMatrix : public InsetMathGrid {
 public: