if (old_format)
return;
- lex.nextToken();
+ lex.next();
string token = lex.getString();
while (lex.isOK() && (token != "\\end_inset")) {
- lex.nextToken();
+ lex.next();
token = lex.getString();
}
if (token != "\\end_inset") {
++cell;
Dimension dim;
MetricsInfo m = mi;
- m.base.textwidth =
- tabular.column_info[j].p_width.inPixels(mi.base.textwidth);
+ LyXLength p_width = tabular.column_info[j].p_width;
+ if (!p_width.zero()) {
+ m.base.textwidth = p_width.inPixels(mi.base.textwidth);
+ }
tabular.getCellInset(cell).metrics(m, dim);
maxAsc = max(maxAsc, dim.asc);
maxDesc = max(maxDesc, dim.des);
for (int i = 0; i < tabular.rows(); ++i) {
int nx = x;
idx = tabular.getCellNumber(i, 0);
- if (y + tabular.getDescentOfRow(i) <= 0 &&
- y - tabular.getAscentOfRow(i) < pi.pain.paperHeight())
- {
- y += tabular.getDescentOfRow(i) +
- tabular.getAscentOfRow(i + 1) +
- tabular.getAdditionalHeight(i + 1);
+ if (y + tabular.getDescentOfRow(i) <= 0
+ && y - tabular.getAscentOfRow(i) < pi.pain.paperHeight()) {
+ y += tabular.getDescentOfRow(i)
+ + tabular.getAscentOfRow(i + 1)
+ + tabular.getAdditionalHeight(i + 1);
continue;
}
for (int j = 0; j < tabular.columns(); ++j) {
{
lyxerr << "InsetTabular::edit: " << this << endl;
finishUndo();
- int cell;
+ cur.selection() = false;
+ cur.push(*this);
if (left) {
if (isRightToLeft(cur))
- cell = tabular.getLastCellInRow(0);
+ cur.idx() = tabular.getLastCellInRow(0);
else
- cell = 0;
+ cur.idx() = 0;
+ cur.par() = 0;
+ cur.pos() = 0;
} else {
if (isRightToLeft(cur))
- cell = tabular.getFirstCellInRow(tabular.rows()-1);
+ cur.idx() = tabular.getFirstCellInRow(tabular.rows() - 1);
else
- cell = tabular.getNumberOfCells() - 1;
+ cur.idx() = tabular.getNumberOfCells() - 1;
+ cur.par() = 0;
+ cur.pos() = cur.lastpos(); // FIXME crude guess
}
- cur.selection() = false;
// this accesses the position cache before it is initialized
//resetPos(cur);
//cur.bv().fitCursor();
- cur.push(*this);
- cur.idx() = cell;
}
cur.selection() = false;
cur.push(const_cast<InsetTabular&>(*this));
return setPos(cur, x, y);
- //int xx = cursorx_ - xo() + tabular.getBeginningOfTextInCell(actcell);
+ //int xx = cursorx_ - xo() + tabular.getBeginningOfTextInCell(cur.idx());
}
break;
case LFUN_MOUSE_MOTION:
- if (cmd.button() != mouse_button::button1)
- break;
- // ignore motions deeper nested than the real anchor
- if (bvcur.selection() && bvcur.anchor_.size() < cur.size())
- break;
- setPos(cur, cmd.x, cmd.y);
- bvcur.setCursor(cur);
- bvcur.selection() = true;
lyxerr << "# InsetTabular::MouseMotion\n" << bvcur << endl;
+ if (cmd.button() == mouse_button::button1) {
+ // only accept motions to places not deeper nested than the real anchor
+ if (bvcur.anchor_.hasPart(cur)) {
+ setPos(cur, cmd.x, cmd.y);
+ bvcur.setCursor(cur);
+ bvcur.selection() = true;
+ }
+ }
break;
case LFUN_MOUSE_RELEASE:
case LFUN_NEXT: {
//if (hasSelection())
// cur.selection() = false;
- int actcell = cur.idx();
- int actcol = tabular.column_of_cell(actcell);
- int column = actcol;
- if (cur.bv().top_y() + cur.bv().painter().paperHeight()
- < yo() + tabular.getHeightOfTabular())
- {
- cur.bv().scrollDocView(
- cur.bv().top_y() + cur.bv().painter().paperHeight());
- cur.idx() = tabular.getCellBelow(first_visible_cell) + column;
+ int const col = tabular.column_of_cell(cur.idx());
+ int const t = cur.bv().top_y() + cur.bv().painter().paperHeight();
+ if (t < yo() + tabular.getHeightOfTabular()) {
+ cur.bv().scrollDocView(t);
+ cur.idx() = tabular.getCellBelow(first_visible_cell) + col;
} else {
- cur.idx() = tabular.getFirstCellInRow(tabular.rows() - 1) + column;
+ cur.idx() = tabular.getFirstCellInRow(tabular.rows() - 1) + col;
}
+ cur.par() = 0;
+ cur.pos() = 0;
resetPos(cur);
break;
}
case LFUN_PRIOR: {
//if (hasSelection())
// cur.selection() = false;
- int column = tabular.column_of_cell(cur.idx());
+ int const col = tabular.column_of_cell(cur.idx());
+ int const t = cur.bv().top_y() + cur.bv().painter().paperHeight();
if (yo() < 0) {
- cur.bv().scrollDocView(
- cur.bv().top_y() - cur.bv().painter().paperHeight());
+ cur.bv().scrollDocView(t);
if (yo() > 0)
- cur.idx() = column;
+ cur.idx() = col;
else
- cur.idx() = tabular.getCellBelow(first_visible_cell) + column;
+ cur.idx() = tabular.getCellBelow(first_visible_cell) + col;
} else {
- cur.idx() = column;
+ cur.idx() = col;
}
+ cur.par() = cur.lastpar();
+ cur.pos() = cur.lastpos();
resetPos(cur);
break;
}
{
switch (cmd.action) {
case LFUN_TABULAR_FEATURE: {
- int actcell = cur.idx();
int action = LyXTabular::LAST_ACTION;
int i = 0;
for (; tabularFeature[i].action != LyXTabular::LAST_ACTION; ++i) {
return true;
case LyXTabular::MULTICOLUMN:
- status.setOnOff(tabular.isMultiColumn(actcell));
+ status.setOnOff(tabular.isMultiColumn(cur.idx()));
break;
case LyXTabular::M_TOGGLE_LINE_TOP:
flag = false;
case LyXTabular::TOGGLE_LINE_TOP:
- status.setOnOff(tabular.topLine(actcell, flag));
+ status.setOnOff(tabular.topLine(cur.idx(), flag));
break;
case LyXTabular::M_TOGGLE_LINE_BOTTOM:
flag = false;
case LyXTabular::TOGGLE_LINE_BOTTOM:
- status.setOnOff(tabular.bottomLine(actcell, flag));
+ status.setOnOff(tabular.bottomLine(cur.idx(), flag));
break;
case LyXTabular::M_TOGGLE_LINE_LEFT:
flag = false;
case LyXTabular::TOGGLE_LINE_LEFT:
- status.setOnOff(tabular.leftLine(actcell, flag));
+ status.setOnOff(tabular.leftLine(cur.idx(), flag));
break;
case LyXTabular::M_TOGGLE_LINE_RIGHT:
flag = false;
case LyXTabular::TOGGLE_LINE_RIGHT:
- status.setOnOff(tabular.rightLine(actcell, flag));
+ status.setOnOff(tabular.rightLine(cur.idx(), flag));
break;
case LyXTabular::M_ALIGN_LEFT:
flag = false;
case LyXTabular::ALIGN_LEFT:
- status.setOnOff(tabular.getAlignment(actcell, flag) == LYX_ALIGN_LEFT);
+ status.setOnOff(tabular.getAlignment(cur.idx(), flag) == LYX_ALIGN_LEFT);
break;
case LyXTabular::M_ALIGN_RIGHT:
flag = false;
case LyXTabular::ALIGN_RIGHT:
- status.setOnOff(tabular.getAlignment(actcell, flag) == LYX_ALIGN_RIGHT);
+ status.setOnOff(tabular.getAlignment(cur.idx(), flag) == LYX_ALIGN_RIGHT);
break;
case LyXTabular::M_ALIGN_CENTER:
flag = false;
case LyXTabular::ALIGN_CENTER:
- status.setOnOff(tabular.getAlignment(actcell, flag) == LYX_ALIGN_CENTER);
+ status.setOnOff(tabular.getAlignment(cur.idx(), flag) == LYX_ALIGN_CENTER);
break;
case LyXTabular::ALIGN_BLOCK:
- status.enabled(!tabular.getPWidth(actcell).zero());
- status.setOnOff(tabular.getAlignment(actcell, flag) == LYX_ALIGN_BLOCK);
+ status.enabled(!tabular.getPWidth(cur.idx()).zero());
+ status.setOnOff(tabular.getAlignment(cur.idx(), flag) == LYX_ALIGN_BLOCK);
break;
case LyXTabular::M_VALIGN_TOP:
flag = false;
case LyXTabular::VALIGN_TOP:
status.setOnOff(
- tabular.getVAlignment(actcell, flag) == LyXTabular::LYX_VALIGN_TOP);
+ tabular.getVAlignment(cur.idx(), flag) == LyXTabular::LYX_VALIGN_TOP);
break;
case LyXTabular::M_VALIGN_BOTTOM:
flag = false;
case LyXTabular::VALIGN_BOTTOM:
status.setOnOff(
- tabular.getVAlignment(actcell, flag) == LyXTabular::LYX_VALIGN_BOTTOM);
+ tabular.getVAlignment(cur.idx(), flag) == LyXTabular::LYX_VALIGN_BOTTOM);
break;
case LyXTabular::M_VALIGN_MIDDLE:
flag = false;
case LyXTabular::VALIGN_MIDDLE:
status.setOnOff(
- tabular.getVAlignment(actcell, flag) == LyXTabular::LYX_VALIGN_MIDDLE);
+ tabular.getVAlignment(cur.idx(), flag) == LyXTabular::LYX_VALIGN_MIDDLE);
break;
case LyXTabular::SET_LONGTABULAR:
break;
case LyXTabular::SET_ROTATE_CELL:
- status.setOnOff(tabular.getRotateCell(actcell));
+ status.setOnOff(tabular.getRotateCell(cur.idx()));
break;
case LyXTabular::UNSET_ROTATE_CELL:
- status.setOnOff(!tabular.getRotateCell(actcell));
+ status.setOnOff(!tabular.getRotateCell(cur.idx()));
break;
case LyXTabular::SET_USEBOX:
- status.setOnOff(strToInt(argument) == tabular.getUsebox(actcell));
+ status.setOnOff(strToInt(argument) == tabular.getUsebox(cur.idx()));
break;
case LyXTabular::SET_LTFIRSTHEAD:
int InsetTabular::plaintext(Buffer const & buf, ostream & os,
OutputParams const & runparams) const
{
- int dp = runparams.linelen ? ownerPar(buf, this).params().depth() : 0;
+ int dp = runparams.linelen ? runparams.depth : 0;
return tabular.plaintext(buf, os, runparams, dp, false, 0);
}
InsetBase * InsetTabular::setPos(LCursor & cur, int x, int y) const
{
+ lyxerr << "# InsetTabular::setPos() x=" << x << " y=" << y << endl;
int idx_min = 0;
int dist_min = 1000000;
for (idx_type i = 0; i < nargs(); ++i) {
void InsetTabular::resetPos(LCursor & cur) const
{
BufferView & bv = cur.bv();
- int actcell = cur.idx();
- int actcol = tabular.column_of_cell(actcell);
-
+ int const actcol = tabular.column_of_cell(cur.idx());
int const offset = ADD_TO_TABULAR_WIDTH + 2;
- int new_x = getCellXPos(actcell) + offset;
- int old_x = cursorx_;
+ int const new_x = getCellXPos(cur.idx()) + offset;
+ int const old_x = cursorx_;
+ int const col_width = tabular.getWidthOfColumn(cur.idx());
cursorx_ = new_x;
-// cursor.x(getCellXPos(actcell) + offset);
+// cursor.x(getCellXPos(cur.idx()) + offset);
if (actcol < tabular.columns() - 1 && scroll(false) &&
tabular.getWidthOfTabular() < bv.workWidth()-20)
{
scroll(bv, 0.0F);
} else if (cursorx_ - offset > 20 &&
- cursorx_ - offset + tabular.getWidthOfColumn(actcell)
- > bv.workWidth() - 20) {
- scroll(bv, - tabular.getWidthOfColumn(actcell) - 20);
+ cursorx_ - offset + col_width > bv.workWidth() - 20) {
+ scroll(bv, - col_width - 20);
} else if (cursorx_ - offset < 20) {
scroll(bv, 20 - cursorx_ + offset);
} else if (scroll() && xo() > 20 &&
int row = tabular.row_of_cell(cur.idx());
if (row == tabular.rows() - 1)
return;
- cur.idx() = tabular.getLastCellInRow(row);
- cur.idx() = tabular.getCellBelow(cur.idx());
+ cur.idx() = tabular.getCellBelow(tabular.getLastCellInRow(row));
} else {
if (cur.idx() == 0)
return;
LyXTabular::Feature feature, string const & value)
{
BufferView & bv = cur.bv();
- int actcell = cur.idx();
int sel_col_start;
int sel_col_end;
int sel_row_start;
recordUndo(cur, Undo::ATOMIC);
getSelection(cur, sel_row_start, sel_row_end, sel_col_start, sel_col_end);
- int row = tabular.row_of_cell(actcell);
- int column = tabular.column_of_cell(actcell);
+ int row = tabular.row_of_cell(cur.idx());
+ int column = tabular.column_of_cell(cur.idx());
bool flag = true;
LyXTabular::ltType ltt;
case LyXTabular::SET_PWIDTH: {
LyXLength const len(value);
- tabular.setColumnPWidth(actcell, len);
+ tabular.setColumnPWidth(cur.idx(), len);
if (len.zero()
- && tabular.getAlignment(actcell, true) == LYX_ALIGN_BLOCK)
+ && tabular.getAlignment(cur.idx(), true) == LYX_ALIGN_BLOCK)
tabularFeatures(cur, LyXTabular::ALIGN_CENTER, string());
else if (!len.zero()
- && tabular.getAlignment(actcell, true) != LYX_ALIGN_BLOCK)
+ && tabular.getAlignment(cur.idx(), true) != LYX_ALIGN_BLOCK)
tabularFeatures(cur, LyXTabular::ALIGN_BLOCK, string());
break;
}
case LyXTabular::SET_MPWIDTH:
- tabular.setMColumnPWidth(actcell, LyXLength(value));
+ tabular.setMColumnPWidth(cur.idx(), LyXLength(value));
break;
case LyXTabular::SET_SPECIAL_COLUMN:
case LyXTabular::SET_SPECIAL_MULTI:
- tabular.setAlignSpecial(actcell,value,feature);
+ tabular.setAlignSpecial(cur.idx(),value,feature);
break;
case LyXTabular::APPEND_ROW:
// append the row into the tabular
- tabular.appendRow(bv.buffer()->params(), actcell);
+ tabular.appendRow(bv.buffer()->params(), cur.idx());
break;
case LyXTabular::APPEND_COLUMN:
// append the column into the tabular
- tabular.appendColumn(bv.buffer()->params(), actcell);
- actcell = tabular.getCellNumber(row, column);
+ tabular.appendColumn(bv.buffer()->params(), cur.idx());
break;
case LyXTabular::DELETE_ROW:
tabular.deleteRow(sel_row_start);
if (sel_row_start >= tabular.rows())
--sel_row_start;
- actcell = tabular.getCellNumber(sel_row_start, column);
+ cur.idx() = tabular.getCellNumber(sel_row_start, column);
+ cur.par() = 0;
+ cur.pos() = 0;
cur.selection() = false;
break;
tabular.deleteColumn(sel_col_start);
if (sel_col_start >= tabular.columns())
--sel_col_start;
- actcell = tabular.getCellNumber(row, sel_col_start);
+ cur.idx() = tabular.getCellNumber(row, sel_col_start);
+ cur.par() = 0;
+ cur.pos() = 0;
cur.selection() = false;
break;
case LyXTabular::M_TOGGLE_LINE_TOP:
flag = false;
case LyXTabular::TOGGLE_LINE_TOP: {
- bool lineSet = !tabular.topLine(actcell, flag);
+ bool lineSet = !tabular.topLine(cur.idx(), flag);
for (int i = sel_row_start; i <= sel_row_end; ++i)
for (int j = sel_col_start; j <= sel_col_end; ++j)
tabular.setTopLine(
case LyXTabular::M_TOGGLE_LINE_BOTTOM:
flag = false;
case LyXTabular::TOGGLE_LINE_BOTTOM: {
- bool lineSet = !tabular.bottomLine(actcell, flag);
+ bool lineSet = !tabular.bottomLine(cur.idx(), flag);
for (int i = sel_row_start; i <= sel_row_end; ++i)
for (int j = sel_col_start; j <= sel_col_end; ++j)
tabular.setBottomLine(
case LyXTabular::M_TOGGLE_LINE_LEFT:
flag = false;
case LyXTabular::TOGGLE_LINE_LEFT: {
- bool lineSet = !tabular.leftLine(actcell, flag);
+ bool lineSet = !tabular.leftLine(cur.idx(), flag);
for (int i = sel_row_start; i <= sel_row_end; ++i)
for (int j = sel_col_start; j <= sel_col_end; ++j)
tabular.setLeftLine(
case LyXTabular::M_TOGGLE_LINE_RIGHT:
flag = false;
case LyXTabular::TOGGLE_LINE_RIGHT: {
- bool lineSet = !tabular.rightLine(actcell, flag);
+ bool lineSet = !tabular.rightLine(cur.idx(), flag);
for (int i = sel_row_start; i <= sel_row_end; ++i)
for (int j = sel_col_start; j <= sel_col_end; ++j)
tabular.setRightLine(
// just multicol for one Single Cell
if (!hasSelection()) {
// check whether we are completly in a multicol
- if (tabular.isMultiColumn(actcell))
- tabular.unsetMultiColumn(actcell);
+ if (tabular.isMultiColumn(cur.idx()))
+ tabular.unsetMultiColumn(cur.idx());
else
- tabular.setMultiColumn(bv.buffer(), actcell, 1);
+ tabular.setMultiColumn(bv.buffer(), cur.idx(), 1);
break;
}
// we have a selection so this means we just add all this
s_end = sel_cell_end;
}
tabular.setMultiColumn(bv.buffer(), s_start, s_end - s_start + 1);
- actcell = s_start;
+ cur.idx() = s_start;
+ cur.par() = 0;
+ cur.pos() = 0;
#endif
cur.selection() = false;
break;
case LyXTabular::SET_USEBOX: {
LyXTabular::BoxType val = LyXTabular::BoxType(strToInt(value));
- if (val == tabular.getUsebox(actcell))
+ if (val == tabular.getUsebox(cur.idx()))
val = LyXTabular::BOX_NONE;
for (int i = sel_row_start; i <= sel_row_end; ++i)
for (int j = sel_col_start; j <= sel_col_end; ++j)
{
if (!paste_tabular)
return false;
- int actcell = cur.idx();
- int actcol = tabular.column_of_cell(actcell);
- int actrow = tabular.row_of_cell(actcell);
+ int actcol = tabular.column_of_cell(cur.idx());
+ int actrow = tabular.row_of_cell(cur.idx());
for (int r1 = 0, r2 = actrow;
r1 < paste_tabular->rows() && r2 < tabular.rows();
++r1, ++r2) {
for (int i = rs; i <= re; ++i)
for (int j = cs; j <= ce; ++j)
cell(tabular.getCellNumber(i, j)).clear(track);
+
+ // cursor position might be invalid now
+ cur.pos() = cur.lastpos();
+ cur.clearSelection();
}
-bool InsetTabular::isRightToLeft(LCursor & cur)
+bool InsetTabular::isRightToLeft(LCursor & cur) const
{
- return cur.bv().getParentLanguage(this)->RightToLeft();
+ BOOST_ASSERT(cur.size() > 1);
+ Paragraph const & parentpar = cur[cur.size() - 2].paragraph();
+ LCursor::pos_type const parentpos = cur[cur.size() - 2].pos();
+ return parentpar.getFontSettings(cur.bv().buffer()->params(),
+ parentpos).language()->RightToLeft();
}
string::size_type len = buf.length();
string::size_type p = 0;
- int actcell = bv.cursor().idx();
- int actcol = tabular.column_of_cell(actcell);
- int actrow = tabular.row_of_cell(actcell);
-
while (p < len && (p = buf.find_first_of("\t\n", p)) != string::npos) {
switch (buf[p]) {
case '\t':
cols = 0;
} else {
loctab = &tabular;
- cell = actcell;
- ocol = actcol;
- row = actrow;
+ cell = bv.cursor().idx();
+ ocol = tabular.column_of_cell(cell);
+ row = tabular.row_of_cell(cell);
}
string::size_type op = 0;
// we can only set this if we are not too far right
if (cols < columns) {
InsetText & inset = loctab->getCellInset(cell);
- LyXFont const font = inset.text_.getFont(0, 0);
+ Paragraph & par = inset.text_.getPar(0);
+ LyXFont const font = inset.text_.getFont(par, 0);
inset.setText(buf.substr(op, p - op), font);
++cols;
++cell;
// we can only set this if we are not too far right
if (cols < columns) {
InsetText & inset = tabular.getCellInset(cell);
- LyXFont const font = inset.text_.getFont(0, 0);
+ Paragraph & par = inset.text_.getPar(0);
+ LyXFont const font = inset.text_.getFont(par, 0);
inset.setText(buf.substr(op, p - op), font);
}
cols = ocol;
// check for the last cell if there is no trailing '\n'
if (cell < cells && op < len) {
InsetText & inset = loctab->getCellInset(cell);
- LyXFont const font = inset.text_.getFont(0, 0);
+ Paragraph & par = inset.text_.getPar(0);
+ LyXFont const font = inset.text_.getFont(par, 0);
inset.setText(buf.substr(op, len - op), font);
}
return true;
projects / lyx.git / blobdiff