#include "Buffer.h"
#include "BufferParams.h"
#include "BufferView.h"
+#include "CoordCache.h"
#include "Cursor.h"
#include "CutAndPaste.h"
#include "FuncRequest.h"
int InsetMathGrid::RowInfo::skipPixels(MetricsInfo const & mi) const
{
- return crskip_.inPixels(mi.base);
+ return mi.base.inPixels(crskip_);
}
for (idx_type i = 0; i < nargs(); ++i) {
if (cellinfo_[i].multi_ != CELL_PART_OF_MULTICOLUMN) {
Dimension dimc;
- cell(i).metrics(mi, dimc);
+ // the 'false' is to make sure that the cell is tall enough
+ cell(i).metrics(mi, dimc, false);
}
}
}
*/
dim.wid += leftMargin() + rightMargin();
- metricsMarkers2(mi, dim);
}
pi.pain.line(xx1, yy, xx2, yy, Color_foreground);
}
}
-
- drawMarkers2(pi, x, y);
}
{
rowinfo_.insert(rowinfo_.begin() + row + 1, RowInfo());
cells_.insert
- (cells_.begin() + (row + 1) * ncols(), ncols(), MathData());
+ (cells_.begin() + (row + 1) * ncols(), ncols(), MathData(buffer_));
cellinfo_.insert
(cellinfo_.begin() + (row + 1) * ncols(), ncols(), CellInfo());
}
void InsetMathGrid::copyRow(row_type row)
{
addRow(row);
- for (col_type col = 0; col < ncols(); ++col)
+ for (col_type col = 0; col < ncols(); ++col) {
cells_[(row + 1) * ncols() + col] = cells_[row * ncols() + col];
+ // copying the cell does not set the buffer
+ cells_[(row + 1) * ncols() + col].setBuffer(*buffer_);
+ }
}
= cellinfo_[row * nc + col];
}
swap(cells_, new_cells);
+ // copying cells loses the buffer reference
+ setBuffer(*buffer_);
swap(cellinfo_, new_cellinfo);
ColInfo inf;
void InsetMathGrid::copyCol(col_type col)
{
addCol(col+1);
- for (row_type row = 0; row < nrows(); ++row)
+ for (row_type row = 0; row < nrows(); ++row) {
cells_[row * ncols() + col + 1] = cells_[row * ncols() + col];
+ // copying the cell does not set the buffer
+ cells_[row * ncols() + col + 1].setBuffer(*buffer_);
+ }
}
LASSERT(cur.idx() > 0, return false);
--cur.idx();
}
- cur.pos() = cur.cell().x2pos(&cur.bv(), cur.x_target() - cur.cell().xo(cur.bv()));
+ // FIXME: this is only a workaround to avoid a crash if the inset
+ // in not in coord cache. The best would be to force a FitCursor
+ // operation.
+ CoordCache::Arrays const & arraysCache = cur.bv().coordCache().arrays();
+ if (arraysCache.has(&cur.cell()))
+ cur.pos() = cur.cell().x2pos(&cur.bv(), cur.x_target() - cur.cell().xo(cur.bv()));
+ else
+ cur.pos() = 0;
return true;
}
}
-bool InsetMathGrid::idxFirst(Cursor & cur) const
+idx_type InsetMathGrid::firstIdx() const
{
+ size_type idx = 0;
switch (v_align_) {
case 't':
- cur.idx() = 0;
+ //idx = 0;
break;
case 'b':
- cur.idx() = (nrows() - 1) * ncols();
+ idx = (nrows() - 1) * ncols();
break;
default:
- cur.idx() = ((nrows() - 1) / 2) * ncols();
+ idx = ((nrows() - 1) / 2) * ncols();
}
// If we are in a multicolumn cell, move to the "real" cell
- while (cellinfo_[cur.idx()].multi_ == CELL_PART_OF_MULTICOLUMN) {
- LASSERT(cur.idx() > 0, return false);
- --cur.idx();
+ while (cellinfo_[idx].multi_ == CELL_PART_OF_MULTICOLUMN) {
+ LASSERT(idx > 0, return 0);
+ --idx;
}
- cur.pos() = 0;
- return true;
+ return idx;
}
-bool InsetMathGrid::idxLast(Cursor & cur) const
+idx_type InsetMathGrid::lastIdx() const
{
+ size_type idx = 0;
switch (v_align_) {
case 't':
- cur.idx() = ncols() - 1;
+ idx = ncols() - 1;
break;
case 'b':
- cur.idx() = nargs() - 1;
+ idx = nargs() - 1;
break;
default:
- cur.idx() = ((nrows() - 1) / 2 + 1) * ncols() - 1;
+ idx = ((nrows() - 1) / 2 + 1) * ncols() - 1;
}
// If we are in a multicolumn cell, move to the "real" cell
- while (cellinfo_[cur.idx()].multi_ == CELL_PART_OF_MULTICOLUMN) {
- LASSERT(cur.idx() > 0, return false);
- --cur.idx();
+ while (cellinfo_[idx].multi_ == CELL_PART_OF_MULTICOLUMN) {
+ LASSERT(idx > 0, return false);
+ --idx;
}
- cur.pos() = cur.lastpos();
- return true;
+ return idx;
}
splitCell(cur);
break;
- case LFUN_CELL_BACKWARD:
- // See below.
- cur.selection(false);
- if (!idxPrev(cur)) {
- cmd = FuncRequest(LFUN_FINISHED_BACKWARD);
- cur.undispatched();
- }
- break;
-
- case LFUN_CELL_FORWARD:
- // Can't handle selection by additional 'shift' as this is
- // hard bound to LFUN_CELL_BACKWARD
- cur.selection(false);
- if (!idxNext(cur)) {
- cmd = FuncRequest(LFUN_FINISHED_FORWARD);
- cur.undispatched();
- }
- break;
-
case LFUN_NEWLINE_INSERT: {
cur.recordUndoInset();
row_type const r = cur.row();
}
case LFUN_LINE_BEGIN:
- case LFUN_WORD_BACKWARD:
- case LFUN_WORD_LEFT:
cur.screenUpdateFlags(Update::Decoration | Update::FitCursor);
// fall through
case LFUN_LINE_BEGIN_SELECT:
- case LFUN_WORD_BACKWARD_SELECT:
- case LFUN_WORD_LEFT_SELECT:
cur.selHandle(act == LFUN_WORD_BACKWARD_SELECT ||
act == LFUN_WORD_LEFT_SELECT ||
act == LFUN_LINE_BEGIN_SELECT);
}
break;
- case LFUN_WORD_FORWARD:
- case LFUN_WORD_RIGHT:
case LFUN_LINE_END:
cur.screenUpdateFlags(Update::Decoration | Update::FitCursor);
// fall through
- case LFUN_WORD_FORWARD_SELECT:
- case LFUN_WORD_RIGHT_SELECT:
case LFUN_LINE_END_SELECT:
cur.selHandle(act == LFUN_WORD_FORWARD_SELECT ||
act == LFUN_WORD_RIGHT_SELECT ||
// static
-char InsetMathGrid::colAlign(HullType type, col_type col)
+char InsetMathGrid::colAlign(HullType type, col_type col, BufferParams const & bp)
{
switch (type) {
case hullEqnArray:
return "rcl"[col % 3];
case hullMultline:
- case hullGather:
return 'c';
+ case hullGather:
+ if (!bp.is_math_indent)
+ return 'c';
+ else
+ return 'l';
case hullAlign:
case hullAlignAt: