#include "bufferparams.h"
#include "BufferView.h"
#include "cursor.h"
+#include "CutAndPaste.h"
+#include "coordcache.h"
#include "debug.h"
#include "dispatchresult.h"
#include "funcrequest.h"
#include "ParagraphParameters.h"
#include "undo.h"
+#include "support/convert.h"
+
#include "frontends/Alert.h"
#include "frontends/font_metrics.h"
#include "frontends/LyXView.h"
#include "frontends/Painter.h"
+#include "frontends/nullpainter.h"
#include <sstream>
#include <iostream>
+#include <limits>
+
+using lyx::cap::tabularStackDirty;
using lyx::graphics::PreviewLoader;
using lyx::support::ltrim;
-using lyx::support::strToInt;
-using lyx::support::strToDbl;
+
+using boost::shared_ptr;
using std::auto_ptr;
using std::endl;
{ LyXTabular::UNSET_ROTATE_CELL, "unset-rotate-cell" },
{ LyXTabular::SET_USEBOX, "set-usebox" },
{ LyXTabular::SET_LTHEAD, "set-lthead" },
+ { LyXTabular::UNSET_LTHEAD, "unset-lthead" },
{ LyXTabular::SET_LTFIRSTHEAD, "set-ltfirsthead" },
+ { LyXTabular::UNSET_LTFIRSTHEAD, "unset-ltfirsthead" },
{ LyXTabular::SET_LTFOOT, "set-ltfoot" },
+ { LyXTabular::UNSET_LTFOOT, "unset-ltfoot" },
{ LyXTabular::SET_LTLASTFOOT, "set-ltlastfoot" },
+ { LyXTabular::UNSET_LTLASTFOOT, "unset-ltlastfoot" },
{ LyXTabular::SET_LTNEWPAGE, "set-ltnewpage" },
{ LyXTabular::SET_SPECIAL_COLUMN, "set-special-column" },
{ LyXTabular::SET_SPECIAL_MULTI, "set-special-multi" },
}
-InsetTabular::InsetTabular(Buffer const & buf, int rows, int columns)
- : tabular(buf.params(), max(rows, 1), max(columns, 1)),
- buffer_(&buf), cursorx_(0)
+InsetTabular::InsetTabular(Buffer const & buf, row_type rows,
+ col_type columns)
+ : tabular(buf.params(), max(rows, row_type(1)),
+ max(columns, col_type(1))), buffer_(&buf), scx_(0)
{}
InsetTabular::InsetTabular(InsetTabular const & tab)
- : UpdatableInset(tab), tabular(tab.tabular),
- buffer_(tab.buffer_), cursorx_(0)
+ : InsetOld(tab), tabular(tab.tabular),
+ buffer_(tab.buffer_), scx_(0)
{}
}
-auto_ptr<InsetBase> InsetTabular::clone() const
+auto_ptr<InsetBase> InsetTabular::doClone() const
{
return auto_ptr<InsetBase>(new InsetTabular(*this));
}
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") {
BOOST_ASSERT(false);
}
- for (int i = 0, cell = -1; i < tabular.rows(); ++i) {
+ row_type i = 0;
+ for (idx_type cell = 0; i < tabular.rows(); ++i) {
int maxAsc = 0;
int maxDesc = 0;
- for (int j = 0; j < tabular.columns(); ++j) {
+ for (col_type j = 0; j < tabular.columns(); ++j) {
if (tabular.isPartOfMultiColumn(i, j))
+ // Multicolumn cell, but not first one
continue;
- ++cell;
Dimension dim;
MetricsInfo m = mi;
- LyXLength p_width = tabular.column_info[j].p_width;
- if (!p_width.zero()) {
+ LyXLength p_width;
+ if (tabular.cell_info[i][j].multicolumn ==
+ LyXTabular::CELL_BEGIN_OF_MULTICOLUMN)
+ p_width = tabular.cellinfo_of_cell(cell).p_width;
+ else
+ 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);
+ tabular.getCellInset(cell)->metrics(m, dim);
+ if (!p_width.zero())
+ dim.wid = m.base.textwidth;
maxAsc = max(maxAsc, dim.asc);
maxDesc = max(maxDesc, dim.des);
tabular.setWidthOfCell(cell, dim.wid);
+ ++cell;
}
tabular.setAscentOfRow(i, maxAsc + ADD_TO_HEIGHT);
tabular.setDescentOfRow(i, maxDesc + ADD_TO_HEIGHT);
}
dim.asc = tabular.getAscentOfRow(0);
- dim.des = tabular.getHeightOfTabular() - tabular.getAscentOfRow(0) + 1;
+ dim.des = tabular.getHeightOfTabular() - dim.asc;
dim.wid = tabular.getWidthOfTabular() + 2 * ADD_TO_TABULAR_WIDTH;
dim_ = dim;
}
void InsetTabular::draw(PainterInfo & pi, int x, int y) const
{
- //lyxerr << "InsetTabular::draw: " << x << " " << y << endl;
+ setPosCache(pi, x, y);
+ //lyxerr << "InsetTabular::draw: " << x << " " << y << endl;
BufferView * bv = pi.base.bv;
- setPosCache(pi, x, y);
- x += scroll();
+ static NullPainter nop;
+ static PainterInfo nullpi(bv, nop);
+
+ //resetPos(bv->cursor());
+
+ x += scx_;
x += ADD_TO_TABULAR_WIDTH;
- int idx = 0;
- first_visible_cell = -1;
- for (int i = 0; i < tabular.rows(); ++i) {
+ idx_type idx = 0;
+ first_visible_cell = LyXTabular::npos;
+ for (row_type i = 0; i < tabular.rows(); ++i) {
int nx = x;
+ int const a = tabular.getAscentOfRow(i);
+ int const d = tabular.getDescentOfRow(i);
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);
- continue;
- }
- for (int j = 0; j < tabular.columns(); ++j) {
- if (nx > bv->workWidth())
- break;
+ for (col_type j = 0; j < tabular.columns(); ++j) {
if (tabular.isPartOfMultiColumn(i, j))
continue;
- if (first_visible_cell < 0)
+ if (first_visible_cell == LyXTabular::npos)
first_visible_cell = idx;
- if (bv->cursor().selection())
- drawCellSelection(pi, nx, y, i, j, idx);
int const cx = nx + tabular.getBeginningOfTextInCell(idx);
- cell(idx).draw(pi, cx, y);
- drawCellLines(pi.pain, nx, y, i, idx);
+ if (nx + tabular.getWidthOfColumn(idx) < 0
+ || nx > bv->workWidth()
+ || y + d < 0
+ || y - a > bv->workHeight()) {
+ cell(idx)->draw(nullpi, cx, y);
+ drawCellLines(nop, nx, y, i, idx, pi.erased_);
+ } else {
+ cell(idx)->draw(pi, cx, y);
+ drawCellLines(pi.pain, nx, y, i, idx, pi.erased_);
+ }
nx += tabular.getWidthOfColumn(idx);
++idx;
}
-// Would be nice, but for some completely unfathomable reason,
-// on a col resize to a new fixed width, even though the insettexts
-// are resized, the cell isn't, but drawing all cells in a tall table
-// has the desired effect somehow. Complete dark magic.
-#if 0
- // avoiding drawing the rest of a long table is
- // a pretty big speedup
- if (y > bv->workHeight())
- break;
-#endif
+ if (i + 1 < tabular.rows())
+ y += d + tabular.getAscentOfRow(i + 1) +
+ tabular.getAdditionalHeight(i + 1);
+ }
+}
+
- y += tabular.getDescentOfRow(i) +
- tabular.getAscentOfRow(i + 1) +
- tabular.getAdditionalHeight(i + 1);
+void InsetTabular::drawSelection(PainterInfo & pi, int x, int y) const
+{
+ setPosCache(pi, x, y);
+
+ LCursor & cur = pi.base.bv->cursor();
+ if (!cur.selection())
+ return;
+ if (!ptr_cmp(&cur.inset(), this))
+ return;
+
+ //resetPos(cur);
+
+ x += scx_ + ADD_TO_TABULAR_WIDTH;
+
+ if (tablemode(cur)) {
+ row_type rs, re;
+ col_type cs, ce;
+ getSelection(cur, rs, re, cs, ce);
+ y -= tabular.getAscentOfRow(0);
+ for (row_type j = 0; j < tabular.rows(); ++j) {
+ int const a = tabular.getAscentOfRow(j);
+ int const h = a + tabular.getDescentOfRow(j);
+ int xx = x;
+ y += tabular.getAdditionalHeight(j);
+ for (col_type i = 0; i < tabular.columns(); ++i) {
+ if (tabular.isPartOfMultiColumn(j, i))
+ continue;
+ idx_type const cell =
+ tabular.getCellNumber(j, i);
+ int const w = tabular.getWidthOfColumn(cell);
+ if (i >= cs && i <= ce && j >= rs && j <= re)
+ pi.pain.fillRectangle(xx, y, w, h,
+ LColor::selection);
+ xx += w;
+
+ }
+ y += h;
+ }
+
+ } else {
+ cur.text()->drawSelection(pi, x + getCellXPos(cur.idx()) + tabular.getBeginningOfTextInCell(cur.idx()), 0 /*this value is ignored */);
}
}
void InsetTabular::drawCellLines(Painter & pain, int x, int y,
- int row, int cell) const
+ row_type row, idx_type cell, bool erased) const
{
int x2 = x + tabular.getWidthOfColumn(cell);
bool on_off = false;
+ LColor::color col = LColor::tabularline;
+ LColor::color onoffcol = LColor::tabularonoffline;
+
+ if (erased) {
+ col = LColor::strikeout;
+ onoffcol = LColor::strikeout;
+ }
if (!tabular.topAlreadyDrawn(cell)) {
on_off = !tabular.topLine(cell);
pain.line(x, y - tabular.getAscentOfRow(row),
x2, y - tabular.getAscentOfRow(row),
- on_off ? LColor::tabularonoffline : LColor::tabularline,
+ on_off ? onoffcol : col,
on_off ? Painter::line_onoffdash : Painter::line_solid);
}
on_off = !tabular.bottomLine(cell);
pain.line(x, y + tabular.getDescentOfRow(row),
x2, y + tabular.getDescentOfRow(row),
- on_off ? LColor::tabularonoffline : LColor::tabularline,
+ on_off ? onoffcol : col,
on_off ? Painter::line_onoffdash : Painter::line_solid);
if (!tabular.leftAlreadyDrawn(cell)) {
on_off = !tabular.leftLine(cell);
pain.line(x, y - tabular.getAscentOfRow(row),
x, y + tabular.getDescentOfRow(row),
- on_off ? LColor::tabularonoffline : LColor::tabularline,
+ on_off ? onoffcol : col,
on_off ? Painter::line_onoffdash : Painter::line_solid);
}
on_off = !tabular.rightLine(cell);
y - tabular.getAscentOfRow(row),
x2 - tabular.getAdditionalWidth(cell),
y + tabular.getDescentOfRow(row),
- on_off ? LColor::tabularonoffline : LColor::tabularline,
+ on_off ? onoffcol : col,
on_off ? Painter::line_onoffdash : Painter::line_solid);
}
-void InsetTabular::drawCellSelection(PainterInfo & pi, int x, int y,
- int row, int column, int cell) const
-{
- LCursor & cur = pi.base.bv->cursor();
- BOOST_ASSERT(cur.selection());
- if (tablemode(cur)) {
- int rs, re, cs, ce;
- getSelection(cur, rs, re, cs, ce);
- if (column >= cs && column <= ce && row >= rs && row <= re) {
- int w = tabular.getWidthOfColumn(cell);
- int h = tabular.getAscentOfRow(row) + tabular.getDescentOfRow(row)-1;
- pi.pain.fillRectangle(x, y - tabular.getAscentOfRow(row) + 1,
- w, h, LColor::selection);
- }
- }
-}
-
-
string const InsetTabular::editMessage() const
{
return _("Opened table");
{
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.pit() = 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.pit() = 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.idx() = cell;
-}
-
-
-InsetBase * InsetTabular::editXY(LCursor & cur, int x, int y) const
-{
- //lyxerr << "InsetTabular::editXY: " << this << endl;
- cur.selection() = false;
- cur.push(const_cast<InsetTabular&>(*this));
- return setPos(cur, x, y);
- //int xx = cursorx_ - xo() + tabular.getBeginningOfTextInCell(actcell);
}
-void InsetTabular::priv_dispatch(LCursor & cur, FuncRequest & cmd)
+void InsetTabular::doDispatch(LCursor & cur, FuncRequest & cmd)
{
- lyxerr << "# InsetTabular::dispatch: cmd: " << cmd << endl;
- //lyxerr << " cur:\n" << cur << endl;
+ lyxerr[Debug::DEBUG] << "# InsetTabular::doDispatch: cmd: " << cmd
+ << "\n cur:" << cur << endl;
CursorSlice sl = cur.top();
LCursor & bvcur = cur.bv().cursor();
switch (cmd.action) {
case LFUN_MOUSE_PRESS:
- lyxerr << "# InsetTabular::MousePress\n" << cur.bv().cursor() << endl;
+ //lyxerr << "# InsetTabular::MousePress\n" << cur.bv().cursor() << endl;
if (cmd.button() == mouse_button::button1) {
cur.selection() = false;
- setPos(cur, cmd.x, cmd.y);
+ setCursorFromCoordinates(cur, cmd.x, cmd.y);
cur.resetAnchor();
bvcur = cur;
break;
}
- //if (cmd.button() == mouse_button::button2)
- // dispatch(cur, FuncRequest(LFUN_PASTESELECTION, "paragraph"));
+ if (cmd.button() == mouse_button::button2) {
+ // FIXME: pasting multiple cells (with insettabular's own
+ // LFUN_PASTESELECTION still does not work! (jspitzm)
+ cmd = FuncRequest(LFUN_PASTESELECTION, "paragraph");
+ cell(cur.idx())->dispatch(cur, cmd);
+ break;
+ }
// we'll pop up the table dialog on release
if (cmd.button() == mouse_button::button3)
break;
case LFUN_MOUSE_MOTION:
- lyxerr << "# InsetTabular::MouseMotion\n" << bvcur << endl;
+ //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);
+ setCursorFromCoordinates(cur, cmd.x, cmd.y);
bvcur.setCursor(cur);
bvcur.selection() = true;
- }
+ } else
+ cur.undispatched();
}
break;
case LFUN_MOUSE_RELEASE:
- lyxerr << "# InsetTabular::MouseRelease\n" << bvcur << endl;
+ //lyxerr << "# InsetTabular::MouseRelease\n" << bvcur << endl;
if (cmd.button() == mouse_button::button3)
InsetTabularMailer(*this).showDialog(&cur.bv());
break;
cur.selection() = false;
break;
- case LFUN_SCROLL_INSET:
- if (cmd.argument.empty())
- break;
- if (cmd.argument.find('.') != cmd.argument.npos)
- scroll(cur.bv(), static_cast<float>(strToDbl(cmd.argument)));
- else
- scroll(cur.bv(), strToInt(cmd.argument));
- break;
-
case LFUN_RIGHTSEL:
case LFUN_RIGHT:
- cell(cur.idx()).dispatch(cur, cmd);
- cur.dispatched(); // override the cell's decision
- if (sl == cur.top())
+ cell(cur.idx())->dispatch(cur, cmd);
+ if (!cur.result().dispatched()) {
isRightToLeft(cur) ? movePrevCell(cur) : moveNextCell(cur);
- if (sl == cur.top()) {
- cmd = FuncRequest(LFUN_FINISHED_RIGHT);
- cur.undispatched();
+ if (sl == cur.top())
+ cmd = FuncRequest(LFUN_FINISHED_RIGHT);
+ else
+ cur.dispatched();
}
break;
case LFUN_LEFTSEL:
case LFUN_LEFT:
- cell(cur.idx()).dispatch(cur, cmd);
- cur.dispatched(); // override the cell's decision
- if (sl == cur.top())
+ cell(cur.idx())->dispatch(cur, cmd);
+ if (!cur.result().dispatched()) {
isRightToLeft(cur) ? moveNextCell(cur) : movePrevCell(cur);
- if (sl == cur.top()) {
- cmd = FuncRequest(LFUN_FINISHED_LEFT);
- cur.undispatched();
+ if (sl == cur.top())
+ cmd = FuncRequest(LFUN_FINISHED_LEFT);
+ else
+ cur.dispatched();
}
break;
case LFUN_DOWNSEL:
case LFUN_DOWN:
- cell(cur.idx()).dispatch(cur, cmd);
+ cell(cur.idx())->dispatch(cur, cmd);
cur.dispatched(); // override the cell's decision
if (sl == cur.top())
+ // if our LyXText didn't do anything to the cursor
+ // then we try to put the cursor into the cell below
+ // setting also the right targetX.
if (tabular.row_of_cell(cur.idx()) != tabular.rows() - 1) {
cur.idx() = tabular.getCellBelow(cur.idx());
- cur.par() = 0;
- cur.pos() = 0;
- resetPos(cur);
+ cur.pit() = 0;
+ cur.pos() = cell(cur.idx())->getText(0)->x2pos(
+ cur.pit(), 0, cur.targetX());
}
if (sl == cur.top()) {
- cmd = FuncRequest(LFUN_FINISHED_DOWN);
+ // we trick it to go to the RIGHT after leaving the
+ // tabular.
+ cmd = FuncRequest(LFUN_FINISHED_RIGHT);
cur.undispatched();
}
break;
case LFUN_UPSEL:
case LFUN_UP:
- cell(cur.idx()).dispatch(cur, cmd);
+ cell(cur.idx())->dispatch(cur, cmd);
cur.dispatched(); // override the cell's decision
if (sl == cur.top())
+ // if our LyXText didn't do anything to the cursor
+ // then we try to put the cursor into the cell above
+ // setting also the right targetX.
if (tabular.row_of_cell(cur.idx()) != 0) {
cur.idx() = tabular.getCellAbove(cur.idx());
- cur.par() = cur.lastpar();
- cur.pos() = cur.lastpos();
- resetPos(cur);
+ cur.pit() = cur.lastpit();
+ LyXText const * text = cell(cur.idx())->getText(0);
+ cur.pos() = text->x2pos(
+ cur.pit(),
+ text->paragraphs().back().rows().size()-1,
+ cur.targetX());
}
if (sl == cur.top()) {
cmd = FuncRequest(LFUN_FINISHED_UP);
}
break;
- 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;
- } else {
- cur.idx() = tabular.getFirstCellInRow(tabular.rows() - 1) + column;
- }
- resetPos(cur);
- break;
- }
-
- case LFUN_PRIOR: {
- //if (hasSelection())
- // cur.selection() = false;
- int column = tabular.column_of_cell(cur.idx());
- if (yo() < 0) {
- cur.bv().scrollDocView(
- cur.bv().top_y() - cur.bv().painter().paperHeight());
- if (yo() > 0)
- cur.idx() = column;
- else
- cur.idx() = tabular.getCellBelow(first_visible_cell) + column;
- } else {
- cur.idx() = column;
- }
- resetPos(cur);
- break;
- }
+// case LFUN_NEXT: {
+// //if (hasSelection())
+// // cur.selection() = false;
+// col_type 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) + col;
+// }
+// cur.par() = 0;
+// cur.pos() = 0;
+// break;
+// }
+//
+// case LFUN_PRIOR: {
+// //if (hasSelection())
+// // cur.selection() = false;
+// col_type 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(t);
+// if (yo() > 0)
+// cur.idx() = col;
+// else
+// cur.idx() = tabular.getCellBelow(first_visible_cell) + col;
+// } else {
+// cur.idx() = col;
+// }
+// cur.par() = cur.lastpar();
+// cur.pos() = cur.lastpos();
+// break;
+// }
case LFUN_LAYOUT_TABULAR:
InsetTabularMailer(*this).showDialog(&cur.bv());
// insert file functions
case LFUN_FILE_INSERT_ASCII_PARA:
case LFUN_FILE_INSERT_ASCII: {
- string tmpstr = getContentsOfAsciiFile(&cur.bv(), cmd.argument, false);
+ string const tmpstr = getContentsOfAsciiFile(&cur.bv(), cmd.argument, false);
if (!tmpstr.empty() && !insertAsciiString(cur.bv(), tmpstr, false))
cur.undispatched();
break;
}
case LFUN_CUT:
- if (copySelection(cur)) {
- recordUndo(cur, Undo::DELETE);
- cutSelection(cur);
+ if (tablemode(cur)) {
+ if (copySelection(cur)) {
+ recordUndoInset(cur, Undo::DELETE);
+ cutSelection(cur);
+ }
}
+ else
+ cell(cur.idx())->dispatch(cur, cmd);
break;
case LFUN_BACKSPACE:
case LFUN_DELETE:
- recordUndo(cur, Undo::DELETE);
- if (tablemode(cur))
+ if (tablemode(cur)) {
+ recordUndoInset(cur, Undo::DELETE);
cutSelection(cur);
+ }
else
- cell(cur.idx()).dispatch(cur, cmd);
+ cell(cur.idx())->dispatch(cur, cmd);
break;
case LFUN_COPY:
if (!cur.selection())
break;
- finishUndo();
- copySelection(cur);
+ if (tablemode(cur)) {
+ finishUndo();
+ copySelection(cur);
+ } else
+ cell(cur.idx())->dispatch(cur, cmd);
break;
case LFUN_PASTESELECTION: {
if (clip.empty())
break;
if (clip.find('\t') != string::npos) {
- int cols = 1;
- int rows = 1;
- int maxCols = 1;
+ col_type cols = 1;
+ row_type rows = 1;
+ col_type maxCols = 1;
size_t len = clip.length();
for (size_t p = 0; p < len; ++p) {
p = clip.find_first_of("\t\n", p);
new LyXTabular(cur.buffer().params(), rows, maxCols));
string::size_type op = 0;
- int cell = 0;
- int cells = paste_tabular->getNumberOfCells();
+ idx_type cell = 0;
+ idx_type const cells =
+ paste_tabular->getNumberOfCells();
cols = 0;
LyXFont font;
for (size_t p = 0; cell < cells && p < len; ++p) {
break;
switch (clip[p]) {
case '\t':
- paste_tabular->getCellInset(cell).
+ paste_tabular->getCellInset(cell)->
setText(clip.substr(op, p - op), font);
++cols;
++cell;
break;
case '\n':
- paste_tabular->getCellInset(cell).
+ paste_tabular->getCellInset(cell)->
setText(clip.substr(op, p - op), font);
while (cols++ < maxCols)
++cell;
}
// check for the last cell if there is no trailing '\n'
if (cell < cells && op < len)
- paste_tabular->getCellInset(cell).
+ paste_tabular->getCellInset(cell)->
setText(clip.substr(op, len - op), font);
} else if (!insertAsciiString(cur.bv(), clip, true)) {
// so that the clipboard is used and it goes on
}
case LFUN_PASTE:
- if (hasPasteBuffer()) {
- recordUndo(cur, Undo::INSERT);
+ if (hasPasteBuffer() && tabularStackDirty()) {
+ recordUndoInset(cur, Undo::INSERT);
pasteSelection(cur);
break;
}
- cell(cur.idx()).dispatch(cur, cmd);
+ cell(cur.idx())->dispatch(cur, cmd);
break;
+ case LFUN_EMPH:
+ case LFUN_BOLD:
+ case LFUN_ROMAN:
+ case LFUN_NOUN:
+ case LFUN_ITAL:
+ case LFUN_FRAK:
+ case LFUN_CODE:
+ case LFUN_SANS:
+ case LFUN_FREEFONT_APPLY:
+ case LFUN_FREEFONT_UPDATE:
+ case LFUN_FONT_SIZE:
+ case LFUN_UNDERLINE:
+ case LFUN_LANGUAGE:
+ case LFUN_CAPITALIZE_WORD:
+ case LFUN_UPCASE_WORD:
+ case LFUN_LOWCASE_WORD:
+ case LFUN_TRANSPOSE_CHARS:
+ if (tablemode(cur)) {
+ row_type rs, re;
+ col_type cs, ce;
+ getSelection(cur, rs, re, cs, ce);
+ for (row_type i = rs; i <= re; ++i) {
+ for (col_type j = cs; j <= ce; ++j) {
+ // cursor follows cell:
+ cur.idx() = tabular.getCellNumber(i, j);
+ // select this cell only:
+ cur.pos() = 0;
+ cur.resetAnchor();
+ cur.pos() = cur.top().lastpos();
+ cur.setCursor(cur);
+ cur.setSelection();
+ cell(cur.idx())->dispatch(cur, cmd);
+ }
+ }
+ // Restore original selection
+ cur.idx() = tabular.getCellNumber(rs, cs);
+ cur.pos() = 0;
+ cur.resetAnchor();
+ cur.idx() = tabular.getCellNumber(re, ce);
+ cur.pos() = cur.top().lastpos();
+ cur.setCursor(cur);
+ cur.setSelection();
+ break;
+ } else {
+ cell(cur.idx())->dispatch(cur, cmd);
+ break;
+ }
default:
// we try to handle this event in the insets dispatch function.
- cell(cur.idx()).dispatch(cur, cmd);
+ cell(cur.idx())->dispatch(cur, cmd);
break;
}
+ resetPos(cur);
InsetTabularMailer(*this).updateDialog(&cur.bv());
}
{
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) {
string const argument
= ltrim(cmd.argument.substr(tabularFeature[i].feature.length()));
- int sel_row_start = 0;
- int sel_row_end = 0;
- int dummy;
+ row_type sel_row_start = 0;
+ row_type sel_row_end = 0;
+ col_type dummy;
LyXTabular::ltType dummyltt;
bool flag = true;
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(convert<int>(argument) == tabular.getUsebox(cur.idx()));
break;
case LyXTabular::SET_LTFIRSTHEAD:
status.setOnOff(tabular.getRowOfLTHead(sel_row_start, dummyltt));
break;
+ case LyXTabular::UNSET_LTFIRSTHEAD:
+ status.setOnOff(!tabular.getRowOfLTHead(sel_row_start, dummyltt));
+ break;
+
case LyXTabular::SET_LTHEAD:
status.setOnOff(tabular.getRowOfLTHead(sel_row_start, dummyltt));
break;
+ case LyXTabular::UNSET_LTHEAD:
+ status.setOnOff(!tabular.getRowOfLTHead(sel_row_start, dummyltt));
+ break;
+
case LyXTabular::SET_LTFOOT:
status.setOnOff(tabular.getRowOfLTFoot(sel_row_start, dummyltt));
break;
+ case LyXTabular::UNSET_LTFOOT:
+ status.setOnOff(!tabular.getRowOfLTFoot(sel_row_start, dummyltt));
+ break;
+
case LyXTabular::SET_LTLASTFOOT:
status.setOnOff(tabular.getRowOfLTFoot(sel_row_start, dummyltt));
break;
+ case LyXTabular::UNSET_LTLASTFOOT:
+ status.setOnOff(!tabular.getRowOfLTFoot(sel_row_start, dummyltt));
+ break;
+
case LyXTabular::SET_LTNEWPAGE:
status.setOnOff(tabular.getLTNewPage(sel_row_start));
break;
return true;
}
+ // These are only enabled inside tabular
+ case LFUN_CELL_BACKWARD:
+ case LFUN_CELL_FORWARD:
+ status.enabled(true);
+ return true;
+
+ // disable these with multiple cells selected
+ case LFUN_INSET_INSERT:
+ case LFUN_TABULAR_INSERT:
+ case LFUN_INSERT_CHARSTYLE:
+ case LFUN_INSET_FLOAT:
+ case LFUN_INSET_WIDE_FLOAT:
+ case LFUN_INSET_FOOTNOTE:
+ case LFUN_INSET_MARGINAL:
+ case LFUN_INSERT_MATH:
+ case LFUN_MATH_MODE:
+ case LFUN_MATH_MUTATE:
+ case LFUN_MATH_DISPLAY:
+ case LFUN_INSERT_NOTE:
+ case LFUN_INSET_OPTARG:
+ case LFUN_INSERT_BOX:
+ case LFUN_INSERT_BRANCH:
+ case LFUN_INSET_WRAP:
+ case LFUN_INSET_ERT: {
+ if (tablemode(cur)) {
+ status.enabled(false);
+ return true;
+ } else
+ return cell(cur.idx())->getStatus(cur, cmd, status);
+ }
+
+ // disable in non-fixed-width cells
+ case LFUN_BREAKLINE:
+ case LFUN_BREAKPARAGRAPH:
+ case LFUN_BREAKPARAGRAPHKEEPLAYOUT:
+ case LFUN_BREAKPARAGRAPH_SKIP: {
+ if (tabular.getPWidth(cur.idx()).zero()) {
+ status.enabled(false);
+ return true;
+ } else
+ return cell(cur.idx())->getStatus(cur, cmd, status);
+ }
+
+ case LFUN_INSET_MODIFY:
+ if (translate(cmd.getArg(0)) == TABULAR_CODE) {
+ status.enabled(true);
+ return true;
+ }
+ // Fall through
+
default:
// we try to handle this event in the insets dispatch function.
- return cell(cur.idx()).getStatus(cur, cmd, status);
+ return cell(cur.idx())->getStatus(cur, cmd, status);
}
}
int InsetTabular::plaintext(Buffer const & buf, ostream & os,
OutputParams const & runparams) const
{
- int dp = runparams.linelen ? runparams.depth : 0;
+ int const dp = runparams.linelen ? runparams.depth : 0;
return tabular.plaintext(buf, os, runparams, dp, false, 0);
}
OutputParams const & runparams) const
{
int ret = 0;
- InsetOld * master = 0;
+ InsetBase * master = 0;
#ifdef WITH_WARNINGS
#warning Why not pass a proper DocIterator here?
// if the table is inside a float it doesn't need the informaltable
// wrapper. Search for it.
for (master = owner(); master; master = master->owner())
- if (master->lyxCode() == InsetOld::FLOAT_CODE)
+ if (master->lyxCode() == InsetBase::FLOAT_CODE)
break;
#endif
if (!master) {
os << "<informaltable>";
- if (runparams.mixed_content)
- os << endl;
++ret;
}
ret += tabular.docbook(buf, os, runparams);
if (!master) {
os << "</informaltable>";
- if (runparams.mixed_content)
- os << endl;
++ret;
}
return ret;
}
-InsetText const & InsetTabular::cell(int idx) const
+shared_ptr<InsetText const> InsetTabular::cell(idx_type idx) const
{
return tabular.getCellInset(idx);
}
-InsetText & InsetTabular::cell(int idx)
+shared_ptr<InsetText> InsetTabular::cell(idx_type idx)
{
return tabular.getCellInset(idx);
}
-void InsetTabular::getCursorPos(LCursor const & cur, int & x, int & y) const
+void InsetTabular::cursorPos
+ (CursorSlice const & sl, bool boundary, int & x, int & y) const
+{
+ cell(sl.idx())->cursorPos(sl, boundary, x, y);
+
+ // y offset correction
+ int const row = tabular.row_of_cell(sl.idx());
+ for (int i = 0; i <= row; ++i) {
+ if (i != 0) {
+ y += tabular.getAscentOfRow(i);
+ y += tabular.getAdditionalHeight(i);
+ }
+ if (i != row)
+ y += tabular.getDescentOfRow(i);
+ }
+
+ // x offset correction
+ int const col = tabular.column_of_cell(sl.idx());
+ int idx = tabular.getCellNumber(row, 0);
+ for (int j = 0; j < col; ++j) {
+ if (tabular.isPartOfMultiColumn(row, j))
+ continue;
+ x += tabular.getWidthOfColumn(idx);
+ ++idx;
+ }
+ x += tabular.getBeginningOfTextInCell(idx);
+ x += ADD_TO_TABULAR_WIDTH;
+ x += scx_;
+}
+
+
+int InsetTabular::dist(idx_type const cell, int x, int y) const
+{
+ int xx = 0;
+ int yy = 0;
+ InsetBase const & inset = *tabular.getCellInset(cell);
+ Point o = theCoords.getInsets().xy(&inset);
+ int const xbeg = o.x_ - tabular.getBeginningOfTextInCell(cell);
+ int const xend = xbeg + tabular.getWidthOfColumn(cell);
+ int const ybeg = o.y_ - inset.ascent();
+ row_type const row = tabular.row_of_cell(cell);
+ int const rowheight = tabular.getAscentOfRow(row)
+ + tabular.getDescentOfRow(row)
+ + tabular.getAdditionalHeight(row);
+ int const yend = ybeg + rowheight;
+
+ if (x < xbeg)
+ xx = xbeg - x;
+ else if (x > xend)
+ xx = x - xend;
+
+ if (y < ybeg)
+ yy = ybeg - y;
+ else if (y > yend)
+ yy = y - yend;
+
+ //lyxerr << " xbeg=" << xbeg << " xend=" << xend
+ // << " ybeg=" << ybeg << " yend=" << yend
+ // << " xx=" << xx << " yy=" << yy
+ // << " dist=" << xx + yy << endl;
+ return xx + yy;
+}
+
+
+InsetBase * InsetTabular::editXY(LCursor & cur, int x, int y)
+{
+ //lyxerr << "InsetTabular::editXY: " << this << endl;
+ cur.selection() = false;
+ cur.push(*this);
+ cur.idx() = getNearestCell(x, y);
+ resetPos(cur);
+ return cell(cur.idx())->text_.editXY(cur, x, y);
+}
+
+
+void InsetTabular::setCursorFromCoordinates(LCursor & cur, int x, int y) const
{
- cell(cur.idx()).getCursorPos(cur, x, y);
+ cur.idx() = getNearestCell(x, y);
+ cell(cur.idx())->text_.setCursorFromCoordinates(cur, x, y);
}
-InsetBase * InsetTabular::setPos(LCursor & cur, int x, int y) const
+InsetTabular::idx_type InsetTabular::getNearestCell(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) {
- int d = getText(i)->dist(x, y);
- if (d < dist_min) {
- dist_min = d;
- idx_min = i;
+ idx_type idx_min = 0;
+ int dist_min = std::numeric_limits<int>::max();
+ for (idx_type i = 0, n = nargs(); i != n; ++i) {
+ if (theCoords.getInsets().has(tabular.getCellInset(i).get())) {
+ int const d = dist(i, x, y);
+ if (d < dist_min) {
+ dist_min = d;
+ idx_min = i;
+ }
}
}
- cur.idx() = idx_min;
- InsetBase * inset = cell(cur.idx()).text_.editXY(cur, x, y);
- //lyxerr << "# InsetTabular::setPos()\n" << cur << endl;
- return inset;
+ return idx_min;
}
-int InsetTabular::getCellXPos(int cell) const
+int InsetTabular::getCellXPos(idx_type const cell) const
{
- int c = cell;
+ idx_type c = cell;
for (; !tabular.isFirstCellInRow(c); --c)
;
for (; c < cell; ++c)
lx += tabular.getWidthOfColumn(c);
- return lx - tabular.getWidthOfColumn(cell) + xo();
+ return lx - tabular.getWidthOfColumn(cell);
}
void InsetTabular::resetPos(LCursor & cur) const
{
BufferView & bv = cur.bv();
- int actcell = cur.idx();
- int actcol = tabular.column_of_cell(actcell);
-
- int const offset = ADD_TO_TABULAR_WIDTH + 2;
- int new_x = getCellXPos(actcell) + offset;
- int old_x = cursorx_;
- cursorx_ = new_x;
-// cursor.x(getCellXPos(actcell) + 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);
- } else if (cursorx_ - offset < 20) {
- scroll(bv, 20 - cursorx_ + offset);
- } else if (scroll() && xo() > 20 &&
- xo() + tabular.getWidthOfTabular() > bv.workWidth() - 20) {
- scroll(bv, old_x - cursorx_);
+ int const maxwidth = bv.workWidth();
+
+ if (&cur.inset() != this) {
+ scx_ = 0;
+ } else {
+ int const X1 = 0;
+ int const X2 = maxwidth;
+ int const offset = ADD_TO_TABULAR_WIDTH + 2;
+ int const x1 = xo() + getCellXPos(cur.idx()) + offset;
+ int const x2 = x1 + tabular.getWidthOfColumn(cur.idx());
+
+ if (x1 < X1)
+ scx_ = X1 + 20 - x1;
+ else if (x2 > X2)
+ scx_ = X2 - 20 - x2;
+ else
+ scx_ = 0;
}
+ cur.needsUpdate();
+
InsetTabularMailer(*this).updateDialog(&bv);
}
void InsetTabular::moveNextCell(LCursor & cur)
{
- lyxerr << "InsetTabular::moveNextCell 1 cur: " << cur.top() << endl;
if (isRightToLeft(cur)) {
- lyxerr << "InsetTabular::moveNextCell A cur: " << endl;
if (tabular.isFirstCellInRow(cur.idx())) {
- int row = tabular.row_of_cell(cur.idx());
+ row_type const 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;
--cur.idx();
}
} else {
- lyxerr << "InsetTabular::moveNextCell B cur: " << endl;
if (tabular.isLastCell(cur.idx()))
return;
++cur.idx();
}
- cur.par() = 0;
+ cur.pit() = 0;
cur.pos() = 0;
- lyxerr << "InsetTabular::moveNextCell 2 cur: " << cur.top() << endl;
resetPos(cur);
}
{
if (isRightToLeft(cur)) {
if (tabular.isLastCellInRow(cur.idx())) {
- int row = tabular.row_of_cell(cur.idx());
+ row_type const row = tabular.row_of_cell(cur.idx());
if (row == 0)
return;
cur.idx() = tabular.getFirstCellInRow(row);
return;
--cur.idx();
}
- cur.par() = 0;
- cur.pos() = 0;
+ cur.pit() = cur.lastpit();
+ cur.pos() = cur.lastpos();
resetPos(cur);
}
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;
- int sel_row_end;
+ col_type sel_col_start;
+ col_type sel_col_end;
+ row_type sel_row_start;
+ row_type sel_row_end;
bool setLines = false;
LyXAlignment setAlign = LYX_ALIGN_LEFT;
LyXTabular::VAlignment setVAlign = LyXTabular::LYX_VALIGN_TOP;
break;
}
- recordUndo(cur, Undo::ATOMIC);
+ recordUndoInset(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);
+ row_type const row = tabular.row_of_cell(cur.idx());
+ col_type const 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, 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)
- tabularFeatures(cur, LyXTabular::ALIGN_BLOCK, string());
break;
}
case LyXTabular::SET_MPWIDTH:
- tabular.setMColumnPWidth(actcell, LyXLength(value));
+ tabular.setMColumnPWidth(cur, 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());
+ cur.idx() = tabular.getCellNumber(row, column);
break;
case LyXTabular::DELETE_ROW:
- for (int i = sel_row_start; i <= sel_row_end; ++i)
+ for (row_type i = sel_row_start; i <= sel_row_end; ++i)
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.pit() = 0;
+ cur.pos() = 0;
cur.selection() = false;
break;
case LyXTabular::DELETE_COLUMN:
- for (int i = sel_col_start; i <= sel_col_end; ++i)
+ for (col_type i = sel_col_start; i <= sel_col_end; ++i)
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.pit() = 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);
- for (int i = sel_row_start; i <= sel_row_end; ++i)
- for (int j = sel_col_start; j <= sel_col_end; ++j)
+ bool lineSet = !tabular.topLine(cur.idx(), flag);
+ for (row_type i = sel_row_start; i <= sel_row_end; ++i)
+ for (col_type j = sel_col_start; j <= sel_col_end; ++j)
tabular.setTopLine(
tabular.getCellNumber(i, j),
lineSet, flag);
case LyXTabular::M_TOGGLE_LINE_BOTTOM:
flag = false;
case LyXTabular::TOGGLE_LINE_BOTTOM: {
- bool lineSet = !tabular.bottomLine(actcell, flag);
- for (int i = sel_row_start; i <= sel_row_end; ++i)
- for (int j = sel_col_start; j <= sel_col_end; ++j)
+ bool lineSet = !tabular.bottomLine(cur.idx(), flag);
+ for (row_type i = sel_row_start; i <= sel_row_end; ++i)
+ for (col_type j = sel_col_start; j <= sel_col_end; ++j)
tabular.setBottomLine(
tabular.getCellNumber(i, j),
lineSet,
case LyXTabular::M_TOGGLE_LINE_LEFT:
flag = false;
case LyXTabular::TOGGLE_LINE_LEFT: {
- bool lineSet = !tabular.leftLine(actcell, flag);
- for (int i = sel_row_start; i <= sel_row_end; ++i)
- for (int j = sel_col_start; j <= sel_col_end; ++j)
+ bool lineSet = !tabular.leftLine(cur.idx(), flag);
+ for (row_type i = sel_row_start; i <= sel_row_end; ++i)
+ for (col_type j = sel_col_start; j <= sel_col_end; ++j)
tabular.setLeftLine(
tabular.getCellNumber(i,j),
lineSet,
case LyXTabular::M_TOGGLE_LINE_RIGHT:
flag = false;
case LyXTabular::TOGGLE_LINE_RIGHT: {
- bool lineSet = !tabular.rightLine(actcell, flag);
- for (int i = sel_row_start; i <= sel_row_end; ++i)
- for (int j = sel_col_start; j <= sel_col_end; ++j)
+ bool lineSet = !tabular.rightLine(cur.idx(), flag);
+ for (row_type i = sel_row_start; i <= sel_row_end; ++i)
+ for (col_type j = sel_col_start; j <= sel_col_end; ++j)
tabular.setRightLine(
tabular.getCellNumber(i,j),
lineSet,
case LyXTabular::ALIGN_RIGHT:
case LyXTabular::ALIGN_CENTER:
case LyXTabular::ALIGN_BLOCK:
- for (int i = sel_row_start; i <= sel_row_end; ++i)
- for (int j = sel_col_start; j <= sel_col_end; ++j)
+ for (row_type i = sel_row_start; i <= sel_row_end; ++i)
+ for (col_type j = sel_col_start; j <= sel_col_end; ++j)
tabular.setAlignment(
tabular.getCellNumber(i, j),
setAlign,
case LyXTabular::VALIGN_TOP:
case LyXTabular::VALIGN_BOTTOM:
case LyXTabular::VALIGN_MIDDLE:
- for (int i = sel_row_start; i <= sel_row_end; ++i)
- for (int j = sel_col_start; j <= sel_col_end; ++j)
+ for (row_type i = sel_row_start; i <= sel_row_end; ++i)
+ for (col_type j = sel_col_start; j <= sel_col_end; ++j)
tabular.setVAlignment(
tabular.getCellNumber(i, j),
setVAlign, flag);
_("You cannot set multicolumn vertically."));
return;
}
-#if 0
- // just multicol for one Single Cell
- if (!hasSelection()) {
- // check whether we are completly in a multicol
- if (tabular.isMultiColumn(actcell))
- tabular.unsetMultiColumn(actcell);
+ if (!cur.selection()) {
+ // just multicol for one single cell
+ // check whether we are completely in a multicol
+ 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
// cells to form a multicolumn cell
- int s_start;
- int s_end;
-
- if (sel_cell_start > sel_cell_end) {
- s_start = sel_cell_end;
- s_end = sel_cell_start;
- } else {
- s_start = sel_cell_start;
- s_end = sel_cell_end;
- }
+ idx_type const s_start = cur.selBegin().idx();
+ idx_type const s_end = cur.selEnd().idx();
tabular.setMultiColumn(bv.buffer(), s_start, s_end - s_start + 1);
- actcell = s_start;
-#endif
+ cur.idx() = s_start;
+ cur.pit() = 0;
+ cur.pos() = 0;
cur.selection() = false;
break;
}
case LyXTabular::SET_ALL_LINES:
setLines = true;
case LyXTabular::UNSET_ALL_LINES:
-#if 0
- for (int i = sel_row_start; i <= sel_row_end; ++i)
- for (int j = sel_col_start; j <= sel_col_end; ++j)
+ for (row_type i = sel_row_start; i <= sel_row_end; ++i)
+ for (col_type j = sel_col_start; j <= sel_col_end; ++j)
tabular.setAllLines(
tabular.getCellNumber(i,j), setLines);
-#endif
break;
case LyXTabular::SET_LONGTABULAR:
break;
case LyXTabular::SET_ROTATE_CELL:
- for (int i = sel_row_start; i <= sel_row_end; ++i)
- for (int j = sel_col_start; j <= sel_col_end; ++j)
+ for (row_type i = sel_row_start; i <= sel_row_end; ++i)
+ for (col_type j = sel_col_start; j <= sel_col_end; ++j)
tabular.setRotateCell(
tabular.getCellNumber(i, j), true);
break;
case LyXTabular::UNSET_ROTATE_CELL:
- for (int i = sel_row_start; i <= sel_row_end; ++i)
- for (int j = sel_col_start; j <= sel_col_end; ++j)
+ for (row_type i = sel_row_start; i <= sel_row_end; ++i)
+ for (col_type j = sel_col_start; j <= sel_col_end; ++j)
tabular.setRotateCell(
tabular.getCellNumber(i, j), false);
break;
case LyXTabular::SET_USEBOX: {
- LyXTabular::BoxType val = LyXTabular::BoxType(strToInt(value));
- if (val == tabular.getUsebox(actcell))
+ LyXTabular::BoxType val = LyXTabular::BoxType(convert<int>(value));
+ 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)
+ for (row_type i = sel_row_start; i <= sel_row_end; ++i)
+ for (col_type j = sel_col_start; j <= sel_col_end; ++j)
tabular.setUsebox(tabular.getCellNumber(i, j), val);
break;
}
if (!cur.selection())
return false;
- int rs, re, cs, ce;
+ row_type rs, re;
+ col_type cs, ce;
getSelection(cur, rs, re, cs, ce);
paste_tabular.reset(new LyXTabular(tabular));
- for (int i = 0; i < rs; ++i)
+ for (row_type i = 0; i < rs; ++i)
paste_tabular->deleteRow(0);
- int const rows = re - rs + 1;
+ row_type const rows = re - rs + 1;
while (paste_tabular->rows() > rows)
paste_tabular->deleteRow(rows);
paste_tabular->setBottomLine(paste_tabular->getFirstCellInRow(rows - 1),
true, true);
- for (int i = 0; i < cs; ++i)
+ for (col_type i = 0; i < cs; ++i)
paste_tabular->deleteColumn(0);
- int const columns = ce - cs + 1;
+ col_type const columns = ce - cs + 1;
while (paste_tabular->columns() > columns)
paste_tabular->deleteColumn(columns);
OutputParams const runparams;
paste_tabular->plaintext(cur.buffer(), os, runparams, 0, true, '\t');
cur.bv().stuffClipboard(os.str());
+ // mark tabular stack dirty
+ // FIXME: this is a workaround for bug 1919. Should be removed for 1.5,
+ // when we (hopefully) have a one-for-all paste mechanism.
+ lyx::cap::dirtyTabularStack(true);
+
return true;
}
{
if (!paste_tabular)
return false;
- int actcell = cur.idx();
- int actcol = tabular.column_of_cell(actcell);
- int actrow = tabular.row_of_cell(actcell);
- for (int r1 = 0, r2 = actrow;
+ col_type const actcol = tabular.column_of_cell(cur.idx());
+ row_type const actrow = tabular.row_of_cell(cur.idx());
+ for (row_type r1 = 0, r2 = actrow;
r1 < paste_tabular->rows() && r2 < tabular.rows();
++r1, ++r2) {
- for (int c1 = 0, c2 = actcol;
+ for (col_type c1 = 0, c2 = actcol;
c1 < paste_tabular->columns() && c2 < tabular.columns();
++c1, ++c2) {
if (paste_tabular->isPartOfMultiColumn(r1, c1) &&
--c1;
continue;
}
- InsetText & inset = tabular.getCellInset(r2, c2);
- inset = paste_tabular->getCellInset(r1, c1);
- inset.markNew();
+ shared_ptr<InsetText> inset(
+ new InsetText(*paste_tabular->getCellInset(r1, c1)));
+ tabular.setCellInset(r2, c2, inset);
+ inset->markNew();
+ cur.pos() = 0;
}
}
return true;
if (!cur.selection())
return;
- bool const track = cur.buffer().params().tracking_changes;
- int rs, re, cs, ce;
+ row_type rs, re;
+ col_type cs, ce;
getSelection(cur, rs, re, cs, ce);
- for (int i = rs; i <= re; ++i)
- for (int j = cs; j <= ce; ++j)
- cell(tabular.getCellNumber(i, j)).clear(track);
+ for (row_type i = rs; i <= re; ++i) {
+ for (col_type j = cs; j <= ce; ++j) {
+ shared_ptr<InsetText> t
+ = cell(tabular.getCellNumber(i, j));
+ if (cur.buffer().params().tracking_changes)
+ t->markErased(true);
+ else
+ t->clear();
+ }
+ }
+
+ // cursor position might be invalid now
+ cur.pos() = cur.lastpos();
+ cur.clearSelection();
}
bool InsetTabular::isRightToLeft(LCursor & cur) const
{
- 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(),
+ BOOST_ASSERT(cur.depth() > 1);
+ Paragraph const & parentpar = cur[cur.depth() - 2].paragraph();
+ LCursor::pos_type const parentpos = cur[cur.depth() - 2].pos();
+ return parentpar.getFontSettings(cur.bv().buffer()->params(),
parentpos).language()->RightToLeft();
}
void InsetTabular::getSelection(LCursor & cur,
- int & rs, int & re, int & cs, int & ce) const
+ row_type & rs, row_type & re, col_type & cs, col_type & ce) const
{
CursorSlice const & beg = cur.selBegin();
CursorSlice const & end = cur.selEnd();
}
-size_t InsetTabular::nargs() const
-{
- return tabular.getNumberOfCells();
-}
-
-
LyXText * InsetTabular::getText(int idx) const
{
- return size_t(idx) < nargs() ? cell(idx).getText(0) : 0;
+ return size_t(idx) < nargs() ? cell(idx)->getText(0) : 0;
}
-void InsetTabular::markErased()
+void InsetTabular::markErased(bool erased)
{
for (idx_type idx = 0; idx < nargs(); ++idx)
- cell(idx).markErased();
+ cell(idx)->markErased(erased);
}
-bool InsetTabular::forceDefaultParagraphs(InsetBase const *) const
+bool InsetTabular::forceDefaultParagraphs(idx_type cell) const
{
-#if 0
- const int cell = tabular.getCellFromInset(in);
-
- if (cell != -1)
- return tabular.getPWidth(cell).zero();
-
- // this is a workaround for a crash (New, Insert->Tabular,
- // Insert->FootNote)
- if (!owner())
- return false;
-
- // well we didn't obviously find it so maybe our owner knows more
- BOOST_ASSERT(owner());
- return owner()->forceDefaultParagraphs(in);
-#endif
- return false;
+ return tabular.getPWidth(cell).zero();
}
if (buf.length() <= 0)
return true;
- int cols = 1;
- int rows = 1;
- int maxCols = 1;
- string::size_type len = buf.length();
+ col_type cols = 1;
+ row_type rows = 1;
+ col_type maxCols = 1;
+ string::size_type const 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':
}
maxCols = max(cols, maxCols);
LyXTabular * loctab;
- int cell = 0;
- int ocol = 0;
- int row = 0;
+ idx_type cell = 0;
+ col_type ocol = 0;
+ row_type row = 0;
if (usePaste) {
paste_tabular.reset(
new LyXTabular(bv.buffer()->params(), rows, maxCols));
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;
- int cells = loctab->getNumberOfCells();
+ idx_type const cells = loctab->getNumberOfCells();
p = 0;
cols = ocol;
rows = loctab->rows();
- int const columns = loctab->columns();
+ col_type const columns = loctab->columns();
while (cell < cells && p < len && row < rows &&
(p = buf.find_first_of("\t\n", p)) != string::npos)
case '\t':
// we can only set this if we are not too far right
if (cols < columns) {
- InsetText & inset = loctab->getCellInset(cell);
- Paragraph & par = inset.text_.getPar(0);
- LyXFont const font = inset.text_.getFont(par, 0);
- inset.setText(buf.substr(op, p - op), font);
+ shared_ptr<InsetText> inset = loctab->getCellInset(cell);
+ Paragraph & par = inset->text_.getPar(0);
+ LyXFont const font = inset->text_.getFont(par, 0);
+ inset->setText(buf.substr(op, p - op), font);
++cols;
++cell;
}
case '\n':
// we can only set this if we are not too far right
if (cols < columns) {
- InsetText & inset = tabular.getCellInset(cell);
- Paragraph & par = inset.text_.getPar(0);
- LyXFont const font = inset.text_.getFont(par, 0);
- inset.setText(buf.substr(op, p - op), font);
+ shared_ptr<InsetText> inset = tabular.getCellInset(cell);
+ Paragraph & par = inset->text_.getPar(0);
+ LyXFont const font = inset->text_.getFont(par, 0);
+ inset->setText(buf.substr(op, p - op), font);
}
cols = ocol;
++row;
}
// check for the last cell if there is no trailing '\n'
if (cell < cells && op < len) {
- InsetText & inset = loctab->getCellInset(cell);
- Paragraph & par = inset.text_.getPar(0);
- LyXFont const font = inset.text_.getFont(par, 0);
- inset.setText(buf.substr(op, len - op), font);
+ shared_ptr<InsetText> inset = loctab->getCellInset(cell);
+ Paragraph & par = inset->text_.getPar(0);
+ LyXFont const font = inset->text_.getFont(par, 0);
+ inset->setText(buf.substr(op, len - op), font);
}
return true;
}
void InsetTabular::addPreview(PreviewLoader & loader) const
{
- int const rows = tabular.rows();
- int const columns = tabular.columns();
- for (int i = 0; i < rows; ++i) {
- for (int j = 0; j < columns; ++j)
- tabular.getCellInset(i, j).addPreview(loader);
+ row_type const rows = tabular.rows();
+ col_type const columns = tabular.columns();
+ for (row_type i = 0; i < rows; ++i) {
+ for (col_type j = 0; j < columns; ++j)
+ tabular.getCellInset(i, j)->addPreview(loader);
}
}
}
-int InsetTabularMailer::string2params(string const & in, InsetTabular & inset)
+void InsetTabularMailer::string2params(string const & in, InsetTabular & inset)
{
istringstream data(in);
LyXLex lex(0,0);
lex.setStream(data);
-#ifdef WITH_WARNINGS
-#warning CHECK verify that this is a sane value to return.
-#endif
if (in.empty())
- return -1;
-
- if (lex.isOK()) {
- lex.next();
- string const token = lex.getString();
- if (token != name_)
- return -1;
- }
+ return;
- int cell = -1;
- if (lex.isOK()) {
- lex.next();
- string const token = lex.getString();
- if (token != "\\active_cell")
- return -1;
- lex.next();
- cell = lex.getInteger();
- }
+ string token;
+ lex >> token;
+ if (!lex || token != name_)
+ return print_mailer_error("InsetTabularMailer", in, 1,
+ name_);
// This is part of the inset proper that is usually swallowed
// by Buffer::readInset
- if (lex.isOK()) {
- lex.next();
- string const token = lex.getString();
- if (token != "Tabular")
- return -1;
- }
-
- if (!lex.isOK())
- return -1;
+ lex >> token;
+ if (!lex || token != "Tabular")
+ return print_mailer_error("InsetTabularMailer", in, 2,
+ "Tabular");
Buffer const & buffer = inset.buffer();
inset.read(buffer, lex);
-
- // We can't set the active cell, but we can tell the frontend
- // what it is.
- return cell;
}
string const InsetTabularMailer::params2string(InsetTabular const & inset)
{
ostringstream data;
-#ifdef WITH_WARNINGS
-#warning wrong!
-#endif
- //data << name_ << " \\active_cell " << inset.getActCell() << '\n';
- data << name_ << " \\active_cell " << 0 << '\n';
+ data << name_ << ' ';
inset.write(inset.buffer(), data);
data << "\\end_inset\n";
return data.str();
projects / lyx.git / blobdiff