namespace lyx {
-InsetMathMatrix::InsetMathMatrix(InsetMathGrid const & p,
+InsetMathMatrix::InsetMathMatrix(InsetMathGrid const & p,
docstring const & left, docstring const & right)
: InsetMathGrid(p), left_(left), right_(right)
{}
void InsetMathMatrix::mathmlize(MathStream & os) const
{
os << "<mo form='prefix' fence='true' stretchy='true' symmetric='true' lspace='thinmathspace'>"
- << left_ << "</mo>";
- os << MTag("mtable");
+ << convertDelimToXMLEscape(left_)
+ << "</mo>"
+ << 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");
+ for (col_type col = 0; col < ncols(); ++col) {
+ idx_type const i = index(row, col);
+ 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");
+ }
+ }
os << ETag("mtr");
}
os << ETag("mtable");
os << "<mo form='postfix' fence='true' stretchy='true' symmetric='true' lspace='thinmathspace'>"
- << right_ << "</mo>";
+ << convertDelimToXMLEscape(right_)
+ << "</mo>";
}
// 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)
- os << MTag("td") << cell(index(row, col)) << 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) {
+ col_type const cellcols = ncellcols(i);
+ ostringstream attr;
+ if (cellcols > 1)
+ attr << "colspan='" << cellcols
+ << '\'';
+ os << MTag("td", attr.str()) << cell(i)
+ << ETag("td") << '\n';
+ }
+ }
if (row == 0)
os << MTag("td", rattrib) << ETag("td") << '\n';
os << ETag("tr") << '\n';