#include <config.h>
#include "InsetMathGrid.h"
-#include "MathArray.h"
+#include "MathData.h"
#include "MathParser.h"
#include "MathStream.h"
#include "BufferView.h"
#include "CutAndPaste.h"
#include "FuncStatus.h"
-#include "LColor.h"
+#include "Color.h"
#include "Cursor.h"
#include "debug.h"
#include "FuncRequest.h"
}
protected:
- InsetBase & inset() const { return inset_; }
+ Inset & inset() const { return inset_; }
InsetMathGrid & inset_;
};
}
-auto_ptr<InsetBase> InsetMathGrid::doClone() const
+auto_ptr<Inset> InsetMathGrid::doClone() const
{
- return auto_ptr<InsetBase>(new InsetMathGrid(*this));
+ return auto_ptr<Inset>(new InsetMathGrid(*this));
}
}
-void InsetMathGrid::vcrskip(LyXLength const & crskip, row_type row)
+void InsetMathGrid::vcrskip(Length const & crskip, row_type row)
{
rowinfo_[row].crskip_ = crskip;
}
-LyXLength InsetMathGrid::vcrskip(row_type row) const
+Length InsetMathGrid::vcrskip(row_type row) const
{
return rowinfo_[row].crskip_;
}
int asc = 0;
int desc = 0;
for (col_type col = 0; col < ncols(); ++col) {
- MathArray const & c = cell(index(row, col));
+ MathData const & c = cell(index(row, col));
asc = max(asc, c.ascent());
desc = max(desc, c.descent());
}
- i * hlinesep() - hlinesep()/2 - rowsep()/2;
pi.pain.line(x + lmargin + 1, yy,
x + dim_.width() - rmargin - 1, yy,
- LColor::foreground);
+ Color::foreground);
}
for (col_type col = 0; col <= ncols(); ++col)
- i * vlinesep() - vlinesep()/2 - colsep()/2;
pi.pain.line(xx, y - dim_.ascent() + 1,
xx, y + dim_.descent() - 1,
- LColor::foreground);
+ Color::foreground);
}
drawMarkers2(pi, x, y);
}
int asc = 0;
int desc = 0;
for (col_type col = 0; col < ncols(); ++col) {
- MathArray const & c = cell(index(row, col));
+ MathData const & c = cell(index(row, col));
asc = max(asc, c.ascent());
desc = max(desc, c.descent());
}
// make sure an upcoming '[' does not break anything
if (row + 1 < nrows()) {
- MathArray const & c = cell(index(row + 1, 0));
+ MathData const & c = cell(index(row + 1, 0));
if (c.size() && c.front()->getChar() == '[')
//eol += "[0pt]";
eol += "{}";
{
rowinfo_.insert(rowinfo_.begin() + row + 1, RowInfo());
cells_.insert
- (cells_.begin() + (row + 1) * ncols(), ncols(), MathArray());
+ (cells_.begin() + (row + 1) * ncols(), ncols(), MathData());
cellinfo_.insert
(cellinfo_.begin() + (row + 1) * ncols(), ncols(), CellInfo());
}
void InsetMathGrid::appendRow()
{
rowinfo_.push_back(RowInfo());
- //cells_.insert(cells_.end(), ncols(), MathArray());
+ //cells_.insert(cells_.end(), ncols(), MathData());
for (col_type col = 0; col < ncols(); ++col) {
cells_.push_back(cells_type::value_type());
cellinfo_.push_back(CellInfo());
{
if (cur.idx() == cur.lastidx())
return;
- MathArray ar = cur.cell();
+ MathData ar = cur.cell();
ar.erase(0, cur.pos());
cur.cell().erase(cur.pos(), cur.lastpos());
++cur.idx();