#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 "support/std_sstream.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;
using std::max;
-using std::swap;
using std::string;
-using std::auto_ptr;
using std::istringstream;
using std::ostream;
using std::ostringstream;
+using std::swap;
+using std::vector;
namespace {
{ 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), cursory_(0), tablemode(false)
-{
- tabular.setOwner(this);
- clearSelection();
- in_reset_pos = 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), cursory_(0), tablemode(false)
-{
- tabular.setOwner(this);
- clearSelection();
- in_reset_pos = 0;
-}
+ : InsetOld(tab), tabular(tab.tabular),
+ buffer_(tab.buffer_), scx_(0)
+{}
InsetTabular::~InsetTabular()
}
-auto_ptr<InsetBase> InsetTabular::clone() const
+auto_ptr<InsetBase> InsetTabular::doClone() const
{
return auto_ptr<InsetBase>(new InsetTabular(*this));
}
}
-void InsetTabular::buffer(Buffer * b)
+void InsetTabular::buffer(Buffer const * b)
{
buffer_ = b;
}
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);
}
- calculate_dimensions_of_cells(mi);
+ row_type i = 0;
+ for (idx_type cell = 0; i < tabular.rows(); ++i) {
+ int maxAsc = 0;
+ int maxDesc = 0;
+ for (col_type j = 0; j < tabular.columns(); ++j) {
+ if (tabular.isPartOfMultiColumn(i, j))
+ // Multicolumn cell, but not first one
+ continue;
+ Dimension dim;
+ MetricsInfo m = mi;
+ 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);
+ 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;
- if (!owner())
- x += scroll();
+ static NullPainter nop;
+ static PainterInfo nullpi(bv, nop);
- xo_ = x;
- yo_ = y;
+ //resetPos(bv->cursor());
+
+ x += scx_;
x += ADD_TO_TABULAR_WIDTH;
- int cell = 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;
- cell = 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;
+ int const a = tabular.getAscentOfRow(i);
+ int const d = tabular.getDescentOfRow(i);
+ idx = tabular.getCellNumber(i, 0);
+ for (col_type j = 0; j < tabular.columns(); ++j) {
if (tabular.isPartOfMultiColumn(i, j))
continue;
- if (first_visible_cell < 0)
- first_visible_cell = cell;
- if (hasSelection())
- drawCellSelection(pi.pain, nx, y, i, j, cell);
-
- int const cx = nx + tabular.getBeginningOfTextInCell(cell);
- tabular.getCellInset(cell).draw(pi, cx, y);
- drawCellLines(pi.pain, nx, y, i, cell);
- nx += tabular.getWidthOfColumn(cell);
- ++cell;
+ if (first_visible_cell == LyXTabular::npos)
+ first_visible_cell = idx;
+
+ int const cx = nx + tabular.getBeginningOfTextInCell(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(Painter & pain, int x, int y,
- int row, int column, int cell) const
+string const InsetTabular::editMessage() const
{
- if (!tablemode)
- return;
-
- BOOST_ASSERT(hasSelection());
- int cs = tabular.column_of_cell(sel_cell_start);
- int ce = tabular.column_of_cell(sel_cell_end);
- if (cs > ce) {
- ce = cs;
- cs = tabular.column_of_cell(sel_cell_end);
- } else {
- ce = tabular.right_column_of_cell(sel_cell_end);
- }
-
- int rs = tabular.row_of_cell(sel_cell_start);
- int re = tabular.row_of_cell(sel_cell_end);
- if (rs > re)
- swap(rs, re);
-
- if (column >= cs && column <= ce && row >= rs && row <= re) {
- int w = tabular.getWidthOfColumn(cell);
- int h = tabular.getAscentOfRow(row) + tabular.getDescentOfRow(row)-1;
- pain.fillRectangle(x, y - tabular.getAscentOfRow(row) + 1,
- w, h, LColor::selection);
- }
+ return _("Opened table");
}
-string const InsetTabular::editMessage() const
+void InsetTabular::edit(LCursor & cur, bool left)
{
- return _("Opened table");
+ lyxerr << "InsetTabular::edit: " << this << endl;
+ finishUndo();
+ cur.selection() = false;
+ cur.push(*this);
+ if (left) {
+ if (isRightToLeft(cur))
+ cur.idx() = tabular.getLastCellInRow(0);
+ else
+ cur.idx() = 0;
+ cur.pit() = 0;
+ cur.pos() = 0;
+ } else {
+ if (isRightToLeft(cur))
+ cur.idx() = tabular.getFirstCellInRow(tabular.rows() - 1);
+ else
+ cur.idx() = tabular.getNumberOfCells() - 1;
+ cur.pit() = 0;
+ cur.pos() = cur.lastpos(); // FIXME crude guess
+ }
+ // this accesses the position cache before it is initialized
+ //resetPos(cur);
+ //cur.bv().fitCursor();
}
-void InsetTabular::updateLocal(BufferView & bv) const
+void InsetTabular::doDispatch(LCursor & cur, FuncRequest & cmd)
{
- bv.update();
- resetPos(bv);
-}
+ lyxerr[Debug::DEBUG] << "# InsetTabular::doDispatch: cmd: " << cmd
+ << "\n cur:" << cur << endl;
+ CursorSlice sl = cur.top();
+ LCursor & bvcur = cur.bv().cursor();
-extern LCursor theTempCursor;
+ switch (cmd.action) {
+ case LFUN_MOUSE_PRESS:
+ //lyxerr << "# InsetTabular::MousePress\n" << cur.bv().cursor() << endl;
+ if (cmd.button() == mouse_button::button1) {
+ cur.selection() = false;
+ setCursorFromCoordinates(cur, cmd.x, cmd.y);
+ cur.resetAnchor();
+ bvcur = cur;
+ break;
+ }
-void InsetTabular::lfunMousePress(BufferView & bv, FuncRequest const & cmd)
-{
- if (hasSelection() && cmd.button() == mouse_button::button3)
- return;
+ 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;
+ }
- int cell = getCell(cmd.x + xo_, cmd.y + yo_);
- clearSelection();
+ // we'll pop up the table dialog on release
+ if (cmd.button() == mouse_button::button3)
+ break;
+ break;
- lyxerr << "# InsetTabular::lfunMousePress cell: " << cell << endl;
- if (cell == -1) {
- tablemode = true;
- bv.fullCursor(theTempCursor);
- bv.fullCursor().push(this);
- bv.fullCursor().idx() = cell;
- } else {
- tablemode = false;
- setPos(bv, cmd.x, cmd.y);
- bv.fullCursor(theTempCursor);
- bv.fullCursor().idx() = cell;
- }
- lyxerr << bv.cursor() << endl;
+ case LFUN_MOUSE_MOTION:
+ //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)) {
+ setCursorFromCoordinates(cur, cmd.x, cmd.y);
+ bvcur.setCursor(cur);
+ bvcur.selection() = true;
+ } else
+ cur.undispatched();
+ }
+ break;
- if (cmd.button() == mouse_button::button2)
- dispatch(bv, FuncRequest(LFUN_PASTESELECTION, "paragraph"));
-}
+ case LFUN_MOUSE_RELEASE:
+ //lyxerr << "# InsetTabular::MouseRelease\n" << bvcur << endl;
+ if (cmd.button() == mouse_button::button3)
+ InsetTabularMailer(*this).showDialog(&cur.bv());
+ break;
+ case LFUN_CELL_BACKWARD:
+ movePrevCell(cur);
+ cur.selection() = false;
+ break;
-void InsetTabular::lfunMouseMotion(BufferView & bv, FuncRequest const & cmd)
-{
- int const actcell = getCell(cmd.x + xo_, cmd.y + yo_);
- lyxerr << "# InsetTabular::lfunMouseMotion cell: " << actcell << endl;
+ case LFUN_CELL_FORWARD:
+ moveNextCell(cur);
+ cur.selection() = false;
+ break;
- setPos(bv, cmd.x, cmd.y);
- if (!hasSelection()) {
- setSelection(actcell, actcell);
- bv.setSelection();
- } else {
- bv.cursor().idx() = actcell;
- setSelection(sel_cell_start, actcell);
- tablemode = (sel_cell_start != actcell);
- }
-}
+ case LFUN_RIGHTSEL:
+ case LFUN_RIGHT:
+ 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);
+ else
+ cur.dispatched();
+ }
+ break;
+ case LFUN_LEFTSEL:
+ case LFUN_LEFT:
+ 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);
+ else
+ cur.dispatched();
+ }
+ break;
-void InsetTabular::lfunMouseRelease(BufferView & bv, FuncRequest const & cmd)
-{
- int const actcell = getCell(cmd.x + xo_, cmd.y + yo_);
- lyxerr << "# InsetTabular::lfunMouseRelease cell: " << actcell << endl;
- if (cmd.button() == mouse_button::button3)
- InsetTabularMailer(*this).showDialog(&bv);
-}
+ case LFUN_DOWNSEL:
+ case LFUN_DOWN:
+ 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.pit() = 0;
+ cur.pos() = cell(cur.idx())->getText(0)->x2pos(
+ cur.pit(), 0, cur.targetX());
+ }
+ if (sl == cur.top()) {
+ // 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);
+ 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.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);
+ cur.undispatched();
+ }
+ break;
-void InsetTabular::edit(BufferView * view, bool left)
-{
- BufferView & bv = *view;
- lyxerr << "InsetTabular::edit: " << this << endl;
- finishUndo();
- //tablemode = false;
- int cell;
- if (left) {
- if (isRightToLeft(bv))
- cell = tabular.getLastCellInRow(0);
- else
- cell = 0;
- } else {
- if (isRightToLeft(bv))
- cell = tabular.getFirstCellInRow(tabular.rows()-1);
- else
- cell = tabular.getNumberOfCells() - 1;
- }
- clearSelection();
- resetPos(bv);
- bv.fitCursor();
- bv.fullCursor().push(this);
- bv.fullCursor().idx() = cell;
- lyxerr << bv.cursor() << endl;
-}
+// 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());
+ break;
+ case LFUN_INSET_DIALOG_UPDATE:
+ InsetTabularMailer(*this).updateDialog(&cur.bv());
+ break;
-void InsetTabular::edit(BufferView * bv, int x, int y)
-{
- lyxerr << "InsetTabular::edit: " << this << " first cell "
- << &tabular.cell_info[0][0].inset << endl;
+ case LFUN_TABULAR_FEATURE:
+ if (!tabularFeatures(cur, cmd.argument))
+ cur.undispatched();
+ break;
- finishUndo();
- setPos(*bv, x, y);
- clearSelection();
- finishUndo();
- //int xx = cursorx_ - xo_ + tabular.getBeginningOfTextInCell(actcell);
- bv->fullCursor().push(this);
- //if (x > xx)
- // activateCellInset(bv, cell, x - xx, y - cursory_);
-}
+ // insert file functions
+ case LFUN_FILE_INSERT_ASCII_PARA:
+ case LFUN_FILE_INSERT_ASCII: {
+ string const tmpstr = getContentsOfAsciiFile(&cur.bv(), cmd.argument, false);
+ if (!tmpstr.empty() && !insertAsciiString(cur.bv(), tmpstr, false))
+ cur.undispatched();
+ break;
+ }
+ case LFUN_CUT:
+ if (tablemode(cur)) {
+ if (copySelection(cur)) {
+ recordUndoInset(cur, Undo::DELETE);
+ cutSelection(cur);
+ }
+ }
+ else
+ cell(cur.idx())->dispatch(cur, cmd);
+ break;
-DispatchResult
-InsetTabular::priv_dispatch(BufferView & bv, FuncRequest const & cmd)
-{
- lyxerr << "# InsetTabular::dispatch: " << cmd
- << " tablemode: " << tablemode << endl;
+ case LFUN_BACKSPACE:
+ case LFUN_DELETE:
+ if (tablemode(cur)) {
+ recordUndoInset(cur, Undo::DELETE);
+ cutSelection(cur);
+ }
+ else
+ cell(cur.idx())->dispatch(cur, cmd);
+ break;
- DispatchResult result(true, true);
- switch (cmd.action) {
+ case LFUN_COPY:
+ if (!cur.selection())
+ break;
+ if (tablemode(cur)) {
+ finishUndo();
+ copySelection(cur);
+ } else
+ cell(cur.idx())->dispatch(cur, cmd);
+ break;
- case LFUN_MOUSE_PRESS:
- lfunMousePress(bv, cmd);
- return DispatchResult(true, true);
+ case LFUN_PASTESELECTION: {
+ string const clip = cur.bv().getClipboard();
+ if (clip.empty())
+ break;
+ if (clip.find('\t') != string::npos) {
+ 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);
+ if (p == string::npos)
+ break;
+ switch (clip[p]) {
+ case '\t':
+ ++cols;
+ break;
+ case '\n':
+ if (p + 1 < len)
+ ++rows;
+ maxCols = max(cols, maxCols);
+ cols = 1;
+ break;
+ }
+ }
+ maxCols = max(cols, maxCols);
- case LFUN_MOUSE_MOTION:
- lfunMouseMotion(bv, cmd);
- return DispatchResult(true, true);
+ paste_tabular.reset(
+ new LyXTabular(cur.buffer().params(), rows, maxCols));
+
+ string::size_type op = 0;
+ 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) {
+ p = clip.find_first_of("\t\n", p);
+ if (p == string::npos || p >= len)
+ break;
+ switch (clip[p]) {
+ case '\t':
+ paste_tabular->getCellInset(cell)->
+ setText(clip.substr(op, p - op), font);
+ ++cols;
+ ++cell;
+ break;
+ case '\n':
+ paste_tabular->getCellInset(cell)->
+ setText(clip.substr(op, p - op), font);
+ while (cols++ < maxCols)
+ ++cell;
+ cols = 0;
+ break;
+ }
+ op = p + 1;
+ }
+ // check for the last cell if there is no trailing '\n'
+ if (cell < cells && op < len)
+ 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
+ // to default
+ // and executes LFUN_PASTESELECTION in insettext!
+ paste_tabular.reset();
+ }
+ // fall through
+ }
- case LFUN_MOUSE_RELEASE:
- lfunMouseRelease(bv, cmd);
- return DispatchResult(true, true);
+ case LFUN_PASTE:
+ if (hasPasteBuffer() && tabularStackDirty()) {
+ recordUndoInset(cur, Undo::INSERT);
+ pasteSelection(cur);
+ break;
+ }
+ 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);
break;
}
- CursorSlice & cur = bv.cursor();
+ resetPos(cur);
+ InsetTabularMailer(*this).updateDialog(&cur.bv());
+}
- if (!tablemode) {
-
- int cell = cur.idx_;
- lyxerr << "# InsetTabular::dispatch: A " << cur << endl;
- result = tabular.getCellInset(cell).dispatch(bv, cmd);
- switch (result.val()) {
- case FINISHED:
- if (movePrevCell(bv, cur))
- result = DispatchResult(true, true);
- else
- result = DispatchResult(false, FINISHED);
- break;
+// function sets an object as defined in func_status.h:
+// states OK, Unknown, Disabled, On, Off.
+bool InsetTabular::getStatus(LCursor & cur, FuncRequest const & cmd,
+ FuncStatus & status) const
+{
+ switch (cmd.action) {
+ case LFUN_TABULAR_FEATURE: {
+ int action = LyXTabular::LAST_ACTION;
+ int i = 0;
+ for (; tabularFeature[i].action != LyXTabular::LAST_ACTION; ++i) {
+ string const tmp = tabularFeature[i].feature;
+ if (tmp == cmd.argument.substr(0, tmp.length())) {
+ action = tabularFeature[i].action;
+ break;
+ }
+ }
+ if (action == LyXTabular::LAST_ACTION) {
+ status.clear();
+ status.unknown(true);
+ return true;
+ }
- case FINISHED_RIGHT:
- if (moveNextCell(bv, cur))
- result = DispatchResult(true, true);
- else
- result = DispatchResult(false, FINISHED_RIGHT);
+ string const argument
+ = ltrim(cmd.argument.substr(tabularFeature[i].feature.length()));
+
+ row_type sel_row_start = 0;
+ row_type sel_row_end = 0;
+ col_type dummy;
+ LyXTabular::ltType dummyltt;
+ bool flag = true;
+
+ getSelection(cur, sel_row_start, sel_row_end, dummy, dummy);
+
+ switch (action) {
+ case LyXTabular::SET_PWIDTH:
+ case LyXTabular::SET_MPWIDTH:
+ case LyXTabular::SET_SPECIAL_COLUMN:
+ case LyXTabular::SET_SPECIAL_MULTI:
+ case LyXTabular::APPEND_ROW:
+ case LyXTabular::APPEND_COLUMN:
+ case LyXTabular::DELETE_ROW:
+ case LyXTabular::DELETE_COLUMN:
+ case LyXTabular::SET_ALL_LINES:
+ case LyXTabular::UNSET_ALL_LINES:
+ status.clear();
+ return true;
+
+ case LyXTabular::MULTICOLUMN:
+ status.setOnOff(tabular.isMultiColumn(cur.idx()));
break;
- case FINISHED_UP:
- if (moveUpLock(bv, cur))
- result = DispatchResult(true, true);
- else
- result = DispatchResult(false, FINISHED_UP);
+ case LyXTabular::M_TOGGLE_LINE_TOP:
+ flag = false;
+ case LyXTabular::TOGGLE_LINE_TOP:
+ status.setOnOff(tabular.topLine(cur.idx(), flag));
break;
- case FINISHED_DOWN:
- if (moveDownLock(bv, cur))
- result = DispatchResult(true, true);
- else
- result = DispatchResult(false, FINISHED_UP);
+ case LyXTabular::M_TOGGLE_LINE_BOTTOM:
+ flag = false;
+ case LyXTabular::TOGGLE_LINE_BOTTOM:
+ status.setOnOff(tabular.bottomLine(cur.idx(), flag));
break;
- default:
- lyxerr << "# don't handle dispatch" << endl;
+ case LyXTabular::M_TOGGLE_LINE_LEFT:
+ flag = false;
+ case LyXTabular::TOGGLE_LINE_LEFT:
+ status.setOnOff(tabular.leftLine(cur.idx(), flag));
break;
- }
-
- lyxerr << "# InsetTabular::dispatch: B " << cur << endl;
- } else {
- lyxerr << "# InsetTabular::dispatch 3: " << cmd << endl;
- switch (cmd.action) {
-
- case LFUN_CELL_BACKWARD:
- case LFUN_CELL_FORWARD:
- if (cmd.action == LFUN_CELL_FORWARD)
- moveNextCell(bv, cur);
- else
- movePrevCell(bv, cur);
- clearSelection();
- return result;
-
- case LFUN_SCROLL_INSET:
- if (!cmd.argument.empty()) {
- if (cmd.argument.find('.') != cmd.argument.npos)
- scroll(bv, static_cast<float>(strToDbl(cmd.argument)));
- else
- scroll(bv, strToInt(cmd.argument));
- bv.update();
- return DispatchResult(true, true);
- }
-
- case LFUN_RIGHTSEL: {
- int const start = hasSelection() ? sel_cell_start : cur.idx_;
- if (tabular.isLastCellInRow(cur.idx_)) {
- setSelection(start, cur.idx_);
- break;
- }
+ case LyXTabular::M_TOGGLE_LINE_RIGHT:
+ flag = false;
+ case LyXTabular::TOGGLE_LINE_RIGHT:
+ status.setOnOff(tabular.rightLine(cur.idx(), flag));
+ break;
- int end = cur.idx_;
- // if we are starting a selection, only select
- // the current cell at the beginning
- if (hasSelection()) {
- moveRight(bv, cur);
- end = cur.idx_;
- }
- setSelection(start, end);
+ case LyXTabular::M_ALIGN_LEFT:
+ flag = false;
+ case LyXTabular::ALIGN_LEFT:
+ status.setOnOff(tabular.getAlignment(cur.idx(), flag) == LYX_ALIGN_LEFT);
break;
- }
- case LFUN_RIGHT:
- if (!moveRightLock(bv, cur))
- result = DispatchResult(false, FINISHED_RIGHT);
- clearSelection();
+ case LyXTabular::M_ALIGN_RIGHT:
+ flag = false;
+ case LyXTabular::ALIGN_RIGHT:
+ status.setOnOff(tabular.getAlignment(cur.idx(), flag) == LYX_ALIGN_RIGHT);
break;
- case LFUN_LEFTSEL: {
- int const start = hasSelection() ? sel_cell_start : cur.idx_;
- if (tabular.isFirstCellInRow(cur.idx_)) {
- setSelection(start, cur.idx_);
- break;
- }
+ case LyXTabular::M_ALIGN_CENTER:
+ flag = false;
+ case LyXTabular::ALIGN_CENTER:
+ status.setOnOff(tabular.getAlignment(cur.idx(), flag) == LYX_ALIGN_CENTER);
+ break;
- int end = cur.idx_;
- // if we are starting a selection, only select
- // the current cell at the beginning
- if (hasSelection()) {
- moveLeft(bv, cur);
- end = cur.idx_;
- }
- setSelection(start, end);
+ case LyXTabular::ALIGN_BLOCK:
+ status.enabled(!tabular.getPWidth(cur.idx()).zero());
+ status.setOnOff(tabular.getAlignment(cur.idx(), flag) == LYX_ALIGN_BLOCK);
break;
- }
- case LFUN_LEFT:
- if (!moveLeftLock(bv, cur))
- result = DispatchResult(false, FINISHED);
- clearSelection();
+ case LyXTabular::M_VALIGN_TOP:
+ flag = false;
+ case LyXTabular::VALIGN_TOP:
+ status.setOnOff(
+ tabular.getVAlignment(cur.idx(), flag) == LyXTabular::LYX_VALIGN_TOP);
break;
- case LFUN_DOWNSEL: {
- int const start = hasSelection() ? sel_cell_start : cur.idx_;
- int const ocell = cur.idx_;
- // if we are starting a selection, only select
- // the current cell at the beginning
- if (hasSelection()) {
- moveDown(bv, cur);
- if (ocell == sel_cell_end ||
- tabular.column_of_cell(ocell) > tabular.column_of_cell(cur.idx_))
- setSelection(start, tabular.getCellBelow(sel_cell_end));
- else
- setSelection(start, tabular.getLastCellBelow(sel_cell_end));
- } else {
- setSelection(start, start);
- }
+ case LyXTabular::M_VALIGN_BOTTOM:
+ flag = false;
+ case LyXTabular::VALIGN_BOTTOM:
+ status.setOnOff(
+ tabular.getVAlignment(cur.idx(), flag) == LyXTabular::LYX_VALIGN_BOTTOM);
break;
- }
- case LFUN_DOWN:
- if (!moveDown(bv, cur))
- result = DispatchResult(false, FINISHED_DOWN);
- clearSelection();
+ case LyXTabular::M_VALIGN_MIDDLE:
+ flag = false;
+ case LyXTabular::VALIGN_MIDDLE:
+ status.setOnOff(
+ tabular.getVAlignment(cur.idx(), flag) == LyXTabular::LYX_VALIGN_MIDDLE);
break;
- case LFUN_UPSEL: {
- int const start = hasSelection() ? sel_cell_start : cur.idx_;
- int const ocell = cur.idx_;
- // if we are starting a selection, only select
- // the current cell at the beginning
- if (hasSelection()) {
- moveUp(bv, cur);
- if (ocell == sel_cell_end ||
- tabular.column_of_cell(ocell) > tabular.column_of_cell(cur.idx_))
- setSelection(start, tabular.getCellAbove(sel_cell_end));
- else
- setSelection(start, tabular.getLastCellAbove(sel_cell_end));
- } else {
- setSelection(start, start);
- }
+ case LyXTabular::SET_LONGTABULAR:
+ status.setOnOff(tabular.isLongTabular());
break;
- }
- case LFUN_UP:
- if (!moveUp(bv, cur))
- result = DispatchResult(false, FINISHED_DOWN);
- clearSelection();
+ case LyXTabular::UNSET_LONGTABULAR:
+ status.setOnOff(!tabular.isLongTabular());
break;
- case LFUN_NEXT: {
- if (hasSelection())
- clearSelection();
- int actcell = bv.cursor().idx();
- int actcol = tabular.column_of_cell(actcell);
- int column = actcol;
- if (bv.top_y() + bv.painter().paperHeight()
- < yo_ + tabular.getHeightOfTabular())
- {
- bv.scrollDocView(bv.top_y() + bv.painter().paperHeight());
- cur.idx() = tabular.getCellBelow(first_visible_cell) + column;
- } else {
- cur.idx() = tabular.getFirstCellInRow(tabular.rows() - 1) + column;
- }
- resetPos(bv);
+ case LyXTabular::SET_ROTATE_TABULAR:
+ status.setOnOff(tabular.getRotateTabular());
break;
- }
- case LFUN_PRIOR: {
- if (hasSelection())
- clearSelection();
- int actcell = bv.cursor().idx();
- int actcol = tabular.column_of_cell(actcell);
- int column = actcol;
- if (yo_ < 0) {
- bv.scrollDocView(bv.top_y() - bv.painter().paperHeight());
- if (yo_ > 0)
- cur.idx() = column;
- else
- cur.idx() = tabular.getCellBelow(first_visible_cell) + column;
- } else {
- cur.idx() = column;
- }
- resetPos(bv);
+ case LyXTabular::UNSET_ROTATE_TABULAR:
+ status.setOnOff(!tabular.getRotateTabular());
break;
- }
- // none of these make sense for insettabular,
- // but we must catch them to prevent any
- // selection from being confused
- case LFUN_PRIORSEL:
- case LFUN_NEXTSEL:
- case LFUN_WORDLEFT:
- case LFUN_WORDLEFTSEL:
- case LFUN_WORDRIGHT:
- case LFUN_WORDRIGHTSEL:
- case LFUN_WORDSEL:
- case LFUN_DOWN_PARAGRAPH:
- case LFUN_DOWN_PARAGRAPHSEL:
- case LFUN_UP_PARAGRAPH:
- case LFUN_UP_PARAGRAPHSEL:
- case LFUN_BACKSPACE:
- case LFUN_HOME:
- case LFUN_HOMESEL:
- case LFUN_END:
- case LFUN_ENDSEL:
- case LFUN_BEGINNINGBUF:
- case LFUN_BEGINNINGBUFSEL:
- case LFUN_ENDBUF:
- case LFUN_ENDBUFSEL:
+ case LyXTabular::SET_ROTATE_CELL:
+ status.setOnOff(tabular.getRotateCell(cur.idx()));
break;
- case LFUN_LAYOUT_TABULAR:
- InsetTabularMailer(*this).showDialog(&bv);
+ case LyXTabular::UNSET_ROTATE_CELL:
+ status.setOnOff(!tabular.getRotateCell(cur.idx()));
break;
- case LFUN_INSET_DIALOG_UPDATE:
- InsetTabularMailer(*this).updateDialog(&bv);
+ case LyXTabular::SET_USEBOX:
+ status.setOnOff(convert<int>(argument) == tabular.getUsebox(cur.idx()));
break;
- case LFUN_TABULAR_FEATURE:
- if (!tabularFeatures(bv, cmd.argument))
- result = DispatchResult(false);
+ case LyXTabular::SET_LTFIRSTHEAD:
+ status.setOnOff(tabular.getRowOfLTHead(sel_row_start, dummyltt));
break;
- // insert file functions
- case LFUN_FILE_INSERT_ASCII_PARA:
- case LFUN_FILE_INSERT_ASCII: {
- string tmpstr = getContentsOfAsciiFile(&bv, cmd.argument, false);
- if (!tmpstr.empty() && !insertAsciiString(bv, tmpstr, false))
- result = DispatchResult(false);
+ case LyXTabular::UNSET_LTFIRSTHEAD:
+ status.setOnOff(!tabular.getRowOfLTHead(sel_row_start, dummyltt));
break;
- }
- case LFUN_LANGUAGE:
- case LFUN_EMPH:
- case LFUN_BOLD:
- case LFUN_NOUN:
- case LFUN_CODE:
- case LFUN_SANS:
- case LFUN_ROMAN:
- case LFUN_DEFAULT:
- case LFUN_UNDERLINE:
- case LFUN_FONT_SIZE:
- lyxerr << "font changes not re-implemented for tables after LOCK" << endl;
+ case LyXTabular::SET_LTHEAD:
+ status.setOnOff(tabular.getRowOfLTHead(sel_row_start, dummyltt));
break;
- case LFUN_CUT:
- if (copySelection(bv)) {
- recordUndo(bv, Undo::DELETE);
- cutSelection(bv.buffer()->params());
- }
+ case LyXTabular::UNSET_LTHEAD:
+ status.setOnOff(!tabular.getRowOfLTHead(sel_row_start, dummyltt));
break;
- case LFUN_DELETE:
- recordUndo(bv, Undo::DELETE);
- cutSelection(bv.buffer()->params());
+ case LyXTabular::SET_LTFOOT:
+ status.setOnOff(tabular.getRowOfLTFoot(sel_row_start, dummyltt));
break;
- case LFUN_COPY:
- if (!hasSelection())
- break;
- finishUndo();
- copySelection(bv);
+ case LyXTabular::UNSET_LTFOOT:
+ status.setOnOff(!tabular.getRowOfLTFoot(sel_row_start, dummyltt));
break;
- case LFUN_PASTESELECTION: {
- string const clip = bv.getClipboard();
- if (clip.empty())
- break;
- if (clip.find('\t') != string::npos) {
- int cols = 1;
- int rows = 1;
- int maxCols = 1;
- string::size_type len = clip.length();
- string::size_type p = 0;
-
- while (p < len &&
- (p = clip.find_first_of("\t\n", p)) != string::npos) {
- switch (clip[p]) {
- case '\t':
- ++cols;
- break;
- case '\n':
- if (p + 1 < len)
- ++rows;
- maxCols = max(cols, maxCols);
- cols = 1;
- break;
- }
- ++p;
- }
- maxCols = max(cols, maxCols);
-
- paste_tabular.reset(
- new LyXTabular(bv.buffer()->params(), rows, maxCols));
-
- string::size_type op = 0;
- int cell = 0;
- int cells = paste_tabular->getNumberOfCells();
- p = 0;
- cols = 0;
- LyXFont font;
- while (cell < cells && p < len &&
- (p = clip.find_first_of("\t\n", p)) != string::npos) {
- if (p >= len)
- break;
- switch (clip[p]) {
- case '\t':
- paste_tabular->getCellInset(cell).
- setText(clip.substr(op, p-op), font);
- ++cols;
- ++cell;
- break;
- case '\n':
- paste_tabular->getCellInset(cell).
- setText(clip.substr(op, p-op), font);
- while (cols++ < maxCols)
- ++cell;
- cols = 0;
- break;
- }
- ++p;
- op = p;
- }
- // check for the last cell if there is no trailing '\n'
- if (cell < cells && op < len)
- paste_tabular->getCellInset(cell).
- setText(clip.substr(op, len-op), font);
- } else if (!insertAsciiString(bv, clip, true))
- {
- // so that the clipboard is used and it goes on
- // to default
- // and executes LFUN_PASTESELECTION in insettext!
- paste_tabular.reset();
- }
- // fall through
- }
+ case LyXTabular::SET_LTLASTFOOT:
+ status.setOnOff(tabular.getRowOfLTFoot(sel_row_start, dummyltt));
+ break;
- case LFUN_PASTE:
- if (hasPasteBuffer()) {
- recordUndo(bv, Undo::INSERT);
- pasteSelection(bv);
- break;
- }
- // fall through
+ case LyXTabular::UNSET_LTLASTFOOT:
+ status.setOnOff(!tabular.getRowOfLTFoot(sel_row_start, dummyltt));
+ break;
- // ATTENTION: the function above has to be PASTE and PASTESELECTION!!!
+ case LyXTabular::SET_LTNEWPAGE:
+ status.setOnOff(tabular.getLTNewPage(sel_row_start));
+ break;
default:
- // handle font changing stuff on selection before we lock the inset
- // in the default part!
- result = DispatchResult(false);
- // we try to activate the actual inset and put this event down to
- // the insets dispatch function.
+ status.clear();
+ status.enabled(false);
break;
}
+ return true;
+ }
- updateLocal(bv);
- InsetTabularMailer(*this).updateDialog(&bv);
+ // 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);
}
- if (cmd.action == LFUN_INSET_TOGGLE) {
- tablemode = !tablemode;
- result = DispatchResult(true, true);
+ // 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);
}
- return result;
+ 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);
+ }
}
int InsetTabular::plaintext(Buffer const & buf, ostream & os,
OutputParams const & runparams) const
{
- int dp = runparams.linelen ? ownerPar(buf, this).params().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;
+ InsetBase * master = 0;
+#ifdef WITH_WARNINGS
+#warning Why not pass a proper DocIterator here?
+#endif
+#if 0
// 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;
}
-void InsetTabular::calculate_dimensions_of_cells(MetricsInfo & mi) const
+shared_ptr<InsetText const> InsetTabular::cell(idx_type idx) const
{
- for (int i = 0, cell = -1; i < tabular.rows(); ++i) {
- int maxAsc = 0;
- int maxDesc = 0;
- for (int j = 0; j < tabular.columns(); ++j) {
- if (tabular.isPartOfMultiColumn(i, j))
- continue;
- ++cell;
- Dimension dim;
- MetricsInfo m = mi;
- m.base.textwidth =
- tabular.column_info[j].p_width.inPixels(mi.base.textwidth);
- tabular.getCellInset(cell).metrics(m, dim);
- maxAsc = max(maxAsc, dim.asc);
- maxDesc = max(maxDesc, dim.des);
- tabular.setWidthOfCell(cell, dim.wid);
- }
- tabular.setAscentOfRow(i, maxAsc + ADD_TO_HEIGHT);
- tabular.setDescentOfRow(i, maxDesc + ADD_TO_HEIGHT);
- }
+ return tabular.getCellInset(idx);
}
-void InsetTabular::getCursorPos(int cell, int & x, int & y) const
+shared_ptr<InsetText> InsetTabular::cell(idx_type idx)
{
- InsetText const & inset = tabular.getCellInset(cell);
- inset.getCursorPos(cell, x, y);
- x += inset.x() - xo_;
- y += inset.y() - yo_;
+ return tabular.getCellInset(idx);
}
-void InsetTabular::setPos(BufferView & bv, int x, int y) const
+void InsetTabular::cursorPos
+ (CursorSlice const & sl, bool boundary, int & x, int & y) const
{
- int const cell = getCell(x + xo_, y + yo_);
- lyxerr << "# InsetTabular::setPos() cell: " << cell << endl;
- InsetText const & inset = tabular.getCellInset(cell);
- inset.text_.setCursorFromCoordinates(x, y);
-#if 0
- cursory_ = 0;
- int actcell = 0;
- int actrow = 0;
- int actcol = 0;
- int ly = tabular.getDescentOfRow(actrow);
-
- // first search the right row
- while (ly < y && actrow + 1 < tabular.rows()) {
- cursory_ += tabular.getDescentOfRow(actrow) +
- tabular.getAscentOfRow(actrow + 1) +
- tabular.getAdditionalHeight(actrow + 1);
- ++actrow;
- ly = cursory_ + tabular.getDescentOfRow(actrow);
- }
- actcell = tabular.getCellNumber(actrow, actcol);
-
- // now search the right column
- int lx = tabular.getWidthOfColumn(actcell) -
- tabular.getAdditionalWidth(actcell);
+ cell(sl.idx())->cursorPos(sl, boundary, x, y);
- for (; !tabular.isLastCellInRow(actcell) && lx < x; ++actcell)
- lx += tabular.getWidthOfColumn(actcell + 1)
- + tabular.getAdditionalWidth(actcell);
+ // 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);
+ }
- cursorx_ = lx - tabular.getWidthOfColumn(actcell) + xo_ + 2;
-#endif
- resetPos(bv);
+ // 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::getCellXPos(int cell) const
+int InsetTabular::dist(idx_type const cell, int x, int y) const
{
- int c = cell;
-
- for (; !tabular.isFirstCellInRow(c); --c)
- ;
- int lx = tabular.getWidthOfColumn(cell);
- for (; c < cell; ++c)
- lx += tabular.getWidthOfColumn(c);
+ 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;
- return lx - tabular.getWidthOfColumn(cell) + xo_;
-}
-
-
-void InsetTabular::resetPos(BufferView &) const
-{
-#if 0
-#ifdef WITH_WARNINGS
-#warning This should be fixed in the right manner (20011128 Jug)
-#endif
- // fast hack to fix infinite repaintings!
- if (in_reset_pos > 0)
- return;
+ if (x < xbeg)
+ xx = xbeg - x;
+ else if (x > xend)
+ xx = x - xend;
- int cell = 0;
- int actcell = bv->cursor().cell();
- int actcol = tabular.column_of_cell(actcell);
- int actrow = 0;
- cursory_ = 0;
- for (; cell < actcell && !tabular.isLastRow(cell); ++cell) {
- if (tabular.isLastCellInRow(cell)) {
- cursory_ += tabular.getDescentOfRow(actrow) +
- tabular.getAscentOfRow(actrow + 1) +
- tabular.getAdditionalHeight(actrow + 1);
- ++actrow;
- }
- }
+ if (y < ybeg)
+ yy = ybeg - y;
+ else if (y > yend)
+ yy = y - yend;
- // we need this only from here on!!!
- ++in_reset_pos;
- 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);
- updateLocal(bv);
- } else if (cursorx_ - offset > 20 &&
- cursorx_ - offset + tabular.getWidthOfColumn(actcell)
- > bv.workWidth() - 20) {
- scroll(&bv, - tabular.getWidthOfColumn(actcell) - 20);
- updateLocal(bv);
- } else if (cursorx_ - offset < 20) {
- scroll(&bv, 20 - cursorx_ + offset);
- updateLocal(bv);
- } else if (scroll() && xo_ > 20 &&
- xo_ + tabular.getWidthOfTabular() > bv->workWidth() - 20) {
- scroll(&bv, old_x - cursorx_);
- updateLocal(bv);
- }
- InsetTabularMailer(*this).updateDialog(bv);
- in_reset_pos = 0;
-#endif
+ //lyxerr << " xbeg=" << xbeg << " xend=" << xend
+ // << " ybeg=" << ybeg << " yend=" << yend
+ // << " xx=" << xx << " yy=" << yy
+ // << " dist=" << xx + yy << endl;
+ return xx + yy;
}
-bool InsetTabular::moveRight(BufferView & bv, CursorSlice & cur)
+InsetBase * InsetTabular::editXY(LCursor & cur, int x, int y)
{
- bool moved = isRightToLeft(bv)
- ? movePrevCell(bv, cur) : moveNextCell(bv, cur);
- if (!moved)
- return false;
- resetPos(bv);
- return true;
+ //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);
}
-bool InsetTabular::moveRightLock(BufferView & bv, CursorSlice & cur)
+void InsetTabular::setCursorFromCoordinates(LCursor & cur, int x, int y) const
{
- bool moved = isRightToLeft(bv)
- ? movePrevCell(bv, cur) : moveNextCell(bv, cur);
- if (!moved)
- return false;
- activateCellInset(bv, cur.idx_, false);
- return true;
+ cur.idx() = getNearestCell(x, y);
+ cell(cur.idx())->text_.setCursorFromCoordinates(cur, x, y);
}
-bool InsetTabular::moveLeft(BufferView & bv, CursorSlice & cur)
+InsetTabular::idx_type InsetTabular::getNearestCell(int x, int y) const
{
- bool moved = isRightToLeft(bv)
- ? moveNextCell(bv, cur) : movePrevCell(bv, cur);
- if (!moved)
- return false;
- resetPos(bv);
- return true;
+ 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;
+ }
+ }
+ }
+ return idx_min;
}
-bool InsetTabular::moveLeftLock(BufferView & bv, CursorSlice & cur)
+int InsetTabular::getCellXPos(idx_type const cell) const
{
- bool moved = isRightToLeft(bv)
- ? moveNextCell(bv, cur) : movePrevCell(bv, cur);
- if (!moved)
- return false;
- activateCellInset(bv, cur.idx_, true);
- return true;
-}
+ idx_type c = cell;
+ for (; !tabular.isFirstCellInRow(c); --c)
+ ;
+ int lx = tabular.getWidthOfColumn(cell);
+ for (; c < cell; ++c)
+ lx += tabular.getWidthOfColumn(c);
-bool InsetTabular::moveUp(BufferView & bv, CursorSlice & cur)
-{
- if (tabular.row_of_cell(cur.idx_) == 0)
- return false;
- cur.idx_ = tabular.getCellAbove(cur.idx_);
- resetPos(bv);
- return true;
+ return lx - tabular.getWidthOfColumn(cell);
}
-bool InsetTabular::moveUpLock(BufferView & bv, CursorSlice & cur)
+void InsetTabular::resetPos(LCursor & cur) const
{
- if (tabular.row_of_cell(cur.idx_) == 0)
- return false;
- cur.idx_ = tabular.getCellAbove(cur.idx_);
- resetPos(bv);
- activateCellInset(bv, cur.idx_, bv.x_target(), 0);
- return true;
-}
+ BufferView & bv = cur.bv();
+ 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;
+ }
-bool InsetTabular::moveDown(BufferView & bv, CursorSlice & cur)
-{
- if (tabular.row_of_cell(cur.idx_) == tabular.rows() - 1)
- return false;
- cur.idx_ = tabular.getCellBelow(cur.idx_);
- resetPos(bv);
- return true;
-}
-
+ cur.needsUpdate();
-bool InsetTabular::moveDownLock(BufferView & bv, CursorSlice & cur)
-{
- if (tabular.row_of_cell(cur.idx_) == tabular.rows() - 1)
- return false;
- cur.idx_ = tabular.getCellBelow(cur.idx_);
- resetPos(bv);
- activateCellInset(bv, cur.idx_, bv.x_target());
- return true;
+ InsetTabularMailer(*this).updateDialog(&bv);
}
-bool InsetTabular::moveNextCell(BufferView & bv, CursorSlice & cur)
+void InsetTabular::moveNextCell(LCursor & cur)
{
- lyxerr << "InsetTabular::moveNextCell 1 cur: " << cur << endl;
- if (isRightToLeft(bv)) {
- if (tabular.isFirstCellInRow(cur.idx_)) {
- int row = tabular.row_of_cell(cur.idx_);
+ if (isRightToLeft(cur)) {
+ if (tabular.isFirstCellInRow(cur.idx())) {
+ row_type const row = tabular.row_of_cell(cur.idx());
if (row == tabular.rows() - 1)
- return false;
- cur.idx_ = tabular.getLastCellInRow(row);
- cur.idx_ = tabular.getCellBelow(cur.idx_);
+ return;
+ cur.idx() = tabular.getCellBelow(tabular.getLastCellInRow(row));
} else {
- if (cur.idx_ == 0)
- return false;
- --cur.idx_;
+ if (cur.idx() == 0)
+ return;
+ --cur.idx();
}
} else {
- if (tabular.isLastCell(cur.idx_))
- return false;
- ++cur.idx_;
+ if (tabular.isLastCell(cur.idx()))
+ return;
+ ++cur.idx();
}
- cur.par_ = 0;
- cur.pos_ = 0;
- lyxerr << "InsetTabular::moveNextCell 2 cur: " << cur << endl;
- resetPos(bv);
- return true;
+ cur.pit() = 0;
+ cur.pos() = 0;
+ resetPos(cur);
}
-bool InsetTabular::movePrevCell(BufferView & bv, CursorSlice & cur)
+void InsetTabular::movePrevCell(LCursor & cur)
{
- if (isRightToLeft(bv)) {
- if (tabular.isLastCellInRow(cur.idx_)) {
- int row = tabular.row_of_cell(cur.idx_);
+ if (isRightToLeft(cur)) {
+ if (tabular.isLastCellInRow(cur.idx())) {
+ row_type const row = tabular.row_of_cell(cur.idx());
if (row == 0)
- return false;
- cur.idx_ = tabular.getFirstCellInRow(row);
- cur.idx_ = tabular.getCellAbove(cur.idx_);
+ return;
+ cur.idx() = tabular.getFirstCellInRow(row);
+ cur.idx() = tabular.getCellAbove(cur.idx());
} else {
- if (tabular.isLastCell(cur.idx_))
- return false;
- ++cur.idx_;
+ if (tabular.isLastCell(cur.idx()))
+ return;
+ ++cur.idx();
}
} else {
- if (cur.idx_ == 0) // first cell
- return false;
- --cur.idx_;
+ if (cur.idx() == 0) // first cell
+ return;
+ --cur.idx();
}
- cur.par_ = 0;
- cur.pos_ = 0;
- resetPos(bv);
- return true;
+ cur.pit() = cur.lastpit();
+ cur.pos() = cur.lastpos();
+ resetPos(cur);
}
-bool InsetTabular::tabularFeatures(BufferView & bv, string const & what)
+bool InsetTabular::tabularFeatures(LCursor & cur, string const & what)
{
LyXTabular::Feature action = LyXTabular::LAST_ACTION;
string const val =
ltrim(what.substr(tabularFeature[i].feature.length()));
- tabularFeatures(bv, action, val);
+ tabularFeatures(cur, action, val);
return true;
}
} // anon namespace
-void InsetTabular::tabularFeatures(BufferView & bv,
+void InsetTabular::tabularFeatures(LCursor & cur,
LyXTabular::Feature feature, string const & value)
{
- int actcell = bv.cursor().idx();
- int sel_col_start;
- int sel_col_end;
- int sel_row_start;
- int sel_row_end;
+ BufferView & bv = cur.bv();
+ 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;
}
- if (hasSelection()) {
- getSelection(actcell, sel_row_start, sel_row_end, sel_col_start, sel_col_end);
- } else {
- sel_col_start = sel_col_end = tabular.column_of_cell(actcell);
- sel_row_start = sel_row_end = tabular.row_of_cell(actcell);
- }
- recordUndo(bv, Undo::ATOMIC);
+ recordUndoInset(cur, Undo::ATOMIC);
- int row = tabular.row_of_cell(actcell);
- int column = tabular.column_of_cell(actcell);
+ getSelection(cur, sel_row_start, sel_row_end, sel_col_start, sel_col_end);
+ 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)
- tabularFeatures(bv, LyXTabular::ALIGN_CENTER, string());
- else if (!len.zero()
- && tabular.getAlignment(actcell, true) != LYX_ALIGN_BLOCK)
- tabularFeatures(bv, LyXTabular::ALIGN_BLOCK, string());
+ && tabular.getAlignment(cur.idx(), true) == LYX_ALIGN_BLOCK)
+ tabularFeatures(cur, LyXTabular::ALIGN_CENTER, 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.setOwner(this);
+ tabular.appendRow(bv.buffer()->params(), cur.idx());
break;
case LyXTabular::APPEND_COLUMN:
// append the column into the tabular
- tabular.appendColumn(bv.buffer()->params(), actcell);
- tabular.setOwner(this);
- 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);
- clearSelection();
+ 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);
- clearSelection();
+ 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;
}
- // just multicol for one Single Cell
- if (!hasSelection()) {
- // check wether 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;
- clearSelection();
+ 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:
- 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);
break;
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;
}
break;
}
- updateLocal(bv);
InsetTabularMailer(*this).updateDialog(&bv);
}
-void InsetTabular::activateCellInset(BufferView & bv, int cell, int x, int y)
-{
- tabular.getCellInset(cell).edit(&bv, x, y);
- bv.cursor().idx(cell);
- updateLocal(bv);
-}
-
-
-void InsetTabular::activateCellInset(BufferView & bv, int cell, bool behind)
-{
- tabular.getCellInset(cell).edit(&bv, behind);
- bv.cursor().idx(cell);
- updateLocal(bv);
-}
-
-
bool InsetTabular::showInsetDialog(BufferView * bv) const
{
InsetTabularMailer(*this).showDialog(bv);
}
-//
-// function returns an object as defined in func_status.h:
-// states OK, Unknown, Disabled, On, Off.
-//
-FuncStatus InsetTabular::getStatus(string const & what, int actcell) const
-{
- FuncStatus status;
- int action = LyXTabular::LAST_ACTION;
-
- int i = 0;
- for (; tabularFeature[i].action != LyXTabular::LAST_ACTION; ++i) {
- string const tmp = tabularFeature[i].feature;
- if (tmp == what.substr(0, tmp.length())) {
- //if (!compare(tabularFeatures[i].feature.c_str(), what.c_str(),
- // tabularFeatures[i].feature.length()))
- action = tabularFeature[i].action;
- break;
- }
- }
- if (action == LyXTabular::LAST_ACTION) {
- status.clear();
- status.unknown(true);
- return status;
- }
-
- string const argument
- = ltrim(what.substr(tabularFeature[i].feature.length()));
-
- int sel_row_start;
- int sel_row_end;
- int dummy;
- LyXTabular::ltType dummyltt;
- bool flag = true;
-
- if (hasSelection())
- getSelection(actcell, sel_row_start, sel_row_end, dummy, dummy);
- else
- sel_row_start = sel_row_end = tabular.row_of_cell(actcell);
-
- switch (action) {
- case LyXTabular::SET_PWIDTH:
- case LyXTabular::SET_MPWIDTH:
- case LyXTabular::SET_SPECIAL_COLUMN:
- case LyXTabular::SET_SPECIAL_MULTI:
- case LyXTabular::APPEND_ROW:
- case LyXTabular::APPEND_COLUMN:
- case LyXTabular::DELETE_ROW:
- case LyXTabular::DELETE_COLUMN:
- case LyXTabular::SET_ALL_LINES:
- case LyXTabular::UNSET_ALL_LINES:
- status.clear();
- return status;
-
- case LyXTabular::MULTICOLUMN:
- status.setOnOff(tabular.isMultiColumn(actcell));
- break;
-
- case LyXTabular::M_TOGGLE_LINE_TOP:
- flag = false;
- case LyXTabular::TOGGLE_LINE_TOP:
- status.setOnOff(tabular.topLine(actcell, flag));
- break;
-
- case LyXTabular::M_TOGGLE_LINE_BOTTOM:
- flag = false;
- case LyXTabular::TOGGLE_LINE_BOTTOM:
- status.setOnOff(tabular.bottomLine(actcell, flag));
- break;
-
- case LyXTabular::M_TOGGLE_LINE_LEFT:
- flag = false;
- case LyXTabular::TOGGLE_LINE_LEFT:
- status.setOnOff(tabular.leftLine(actcell, flag));
- break;
-
- case LyXTabular::M_TOGGLE_LINE_RIGHT:
- flag = false;
- case LyXTabular::TOGGLE_LINE_RIGHT:
- status.setOnOff(tabular.rightLine(actcell, flag));
- break;
-
- case LyXTabular::M_ALIGN_LEFT:
- flag = false;
- case LyXTabular::ALIGN_LEFT:
- status.setOnOff(tabular.getAlignment(actcell, 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);
- break;
-
- case LyXTabular::M_ALIGN_CENTER:
- flag = false;
- case LyXTabular::ALIGN_CENTER:
- status.setOnOff(tabular.getAlignment(actcell, flag) == LYX_ALIGN_CENTER);
- break;
-
- case LyXTabular::ALIGN_BLOCK:
- status.disabled(tabular.getPWidth(actcell).zero());
- status.setOnOff(tabular.getAlignment(actcell, 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);
- break;
-
- case LyXTabular::M_VALIGN_BOTTOM:
- flag = false;
- case LyXTabular::VALIGN_BOTTOM:
- status.setOnOff(
- tabular.getVAlignment(actcell, 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);
- break;
-
- case LyXTabular::SET_LONGTABULAR:
- status.setOnOff(tabular.isLongTabular());
- break;
-
- case LyXTabular::UNSET_LONGTABULAR:
- status.setOnOff(!tabular.isLongTabular());
- break;
-
- case LyXTabular::SET_ROTATE_TABULAR:
- status.setOnOff(tabular.getRotateTabular());
- break;
-
- case LyXTabular::UNSET_ROTATE_TABULAR:
- status.setOnOff(!tabular.getRotateTabular());
- break;
-
- case LyXTabular::SET_ROTATE_CELL:
- status.setOnOff(tabular.getRotateCell(actcell));
- break;
-
- case LyXTabular::UNSET_ROTATE_CELL:
- status.setOnOff(!tabular.getRotateCell(actcell));
- break;
-
- case LyXTabular::SET_USEBOX:
- status.setOnOff(strToInt(argument) == tabular.getUsebox(actcell));
- break;
-
- case LyXTabular::SET_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::SET_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::SET_LTNEWPAGE:
- status.setOnOff(tabular.getLTNewPage(sel_row_start));
- break;
-
- default:
- status.clear();
- status.disabled(true);
- break;
- }
- return status;
-}
-
-
void InsetTabular::getLabelList(Buffer const & buffer,
- std::vector<string> & list) const
+ vector<string> & list) const
{
tabular.getLabelList(buffer, list);
}
-bool InsetTabular::copySelection(BufferView & bv)
+bool InsetTabular::copySelection(LCursor & cur)
{
- if (!hasSelection())
+ if (!cur.selection())
return false;
- int sel_col_start = tabular.column_of_cell(sel_cell_start);
- int sel_col_end = tabular.column_of_cell(sel_cell_end);
- if (sel_col_start > sel_col_end) {
- sel_col_start = sel_col_end;
- sel_col_end = tabular.right_column_of_cell(sel_cell_start);
- } else {
- sel_col_end = tabular.right_column_of_cell(sel_cell_end);
- }
-
- int sel_row_start = tabular.row_of_cell(sel_cell_start);
- int sel_row_end = tabular.row_of_cell(sel_cell_end);
- if (sel_row_start > sel_row_end)
- swap(sel_row_start, sel_row_end);
+ row_type rs, re;
+ col_type cs, ce;
+ getSelection(cur, rs, re, cs, ce);
paste_tabular.reset(new LyXTabular(tabular));
- paste_tabular->setOwner(this);
- for (int i = 0; i < sel_row_start; ++i)
+ for (row_type i = 0; i < rs; ++i)
paste_tabular->deleteRow(0);
- int const rows = sel_row_end - sel_row_start + 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 < sel_col_start; ++i)
+ for (col_type i = 0; i < cs; ++i)
paste_tabular->deleteColumn(0);
- int const columns = sel_col_end - sel_col_start + 1;
+ col_type const columns = ce - cs + 1;
while (paste_tabular->columns() > columns)
paste_tabular->deleteColumn(columns);
ostringstream os;
OutputParams const runparams;
- paste_tabular->plaintext(*bv.buffer(), os, runparams,
- ownerPar(*bv.buffer(), this).params().depth(), true, '\t');
- bv.stuffClipboard(os.str());
+ 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;
}
-bool InsetTabular::pasteSelection(BufferView & bv)
+bool InsetTabular::pasteSelection(LCursor & cur)
{
if (!paste_tabular)
return false;
- int actcell = bv.cursor().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.setOwner(this);
- 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;
}
-bool InsetTabular::cutSelection(BufferParams const & bp)
+void InsetTabular::cutSelection(LCursor & cur)
{
- if (!hasSelection())
- return false;
+ if (!cur.selection())
+ return;
- int sel_col_start = tabular.column_of_cell(sel_cell_start);
- int sel_col_end = tabular.column_of_cell(sel_cell_end);
- if (sel_col_start > sel_col_end) {
- sel_col_start = sel_col_end;
- sel_col_end = tabular.right_column_of_cell(sel_cell_start);
- } else {
- sel_col_end = tabular.right_column_of_cell(sel_cell_end);
+ 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) {
+ shared_ptr<InsetText> t
+ = cell(tabular.getCellNumber(i, j));
+ if (cur.buffer().params().tracking_changes)
+ t->markErased(true);
+ else
+ t->clear();
+ }
}
- int sel_row_start = tabular.row_of_cell(sel_cell_start);
- int sel_row_end = tabular.row_of_cell(sel_cell_end);
-
- if (sel_row_start > sel_row_end)
- swap(sel_row_start, sel_row_end);
-
- if (sel_cell_start > sel_cell_end)
- swap(sel_cell_start, sel_cell_end);
-
- for (int i = sel_row_start; i <= sel_row_end; ++i)
- for (int j = sel_col_start; j <= sel_col_end; ++j)
- tabular.getCellInset(tabular.getCellNumber(i, j))
- .clear(bp.tracking_changes);
- return true;
+ // cursor position might be invalid now
+ cur.pos() = cur.lastpos();
+ cur.clearSelection();
}
-bool InsetTabular::isRightToLeft(BufferView & bv)
+bool InsetTabular::isRightToLeft(LCursor & cur) const
{
- return bv.getParentLanguage(this)->RightToLeft();
+ 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(int actcell,
- int & srow, int & erow, int & scol, int & ecol) const
+void InsetTabular::getSelection(LCursor & cur,
+ row_type & rs, row_type & re, col_type & cs, col_type & ce) const
{
- int const start = hasSelection() ? sel_cell_start : actcell;
- int const end = hasSelection() ? sel_cell_end : actcell;
-
- srow = tabular.row_of_cell(start);
- erow = tabular.row_of_cell(end);
- if (srow > erow)
- swap(srow, erow);
-
- scol = tabular.column_of_cell(start);
- ecol = tabular.column_of_cell(end);
- if (scol > ecol)
- swap(scol, ecol);
- else
- ecol = tabular.right_column_of_cell(end);
-}
-
+ CursorSlice const & beg = cur.selBegin();
+ CursorSlice const & end = cur.selEnd();
+ cs = tabular.column_of_cell(beg.idx());
+ ce = tabular.column_of_cell(end.idx());
+ if (cs > ce) {
+ ce = cs;
+ cs = tabular.column_of_cell(end.idx());
+ } else {
+ ce = tabular.right_column_of_cell(end.idx());
+ }
-int InsetTabular::numParagraphs() const
-{
- return tabular.getNumberOfCells();
+ rs = tabular.row_of_cell(beg.idx());
+ re = tabular.row_of_cell(end.idx());
+ if (rs > re)
+ swap(rs, re);
}
-LyXText * InsetTabular::getText(int i) const
+LyXText * InsetTabular::getText(int idx) const
{
- return i < tabular.getNumberOfCells()
- ? tabular.getCellInset(i).getText(0)
- : 0;
+ return size_t(idx) < nargs() ? cell(idx)->getText(0) : 0;
}
-void InsetTabular::markErased()
+void InsetTabular::markErased(bool erased)
{
- for (int cell = 0; cell < tabular.getNumberOfCells(); ++cell)
- tabular.getCellInset(cell).markErased();
+ for (idx_type idx = 0; idx < nargs(); ++idx)
+ cell(idx)->markErased(erased);
}
-bool InsetTabular::forceDefaultParagraphs(InsetOld const * in) const
+bool InsetTabular::forceDefaultParagraphs(idx_type cell) const
{
- 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);
+ 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));
- paste_tabular->setOwner(this);
loctab = paste_tabular.get();
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);
- LyXFont const font = inset.text_.
- getFont(inset.paragraphs().begin(), 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);
- LyXFont const font = inset.text_.
- getFont(inset.paragraphs().begin(), 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);
- LyXFont const font = inset.text_.getFont(inset.paragraphs().begin(), 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);
}
}
-
-void InsetTabular::clearSelection() const
+bool InsetTabular::tablemode(LCursor & cur) const
{
- sel_cell_start = 0;
- sel_cell_end = 0;
- has_selection = false;
+ return cur.selection() && cur.selBegin().idx() != cur.selEnd().idx();
}
-void InsetTabular::setSelection(int start, int end) const
-{
- sel_cell_start = start;
- sel_cell_end = end;
- has_selection = true;
-}
+
string const InsetTabularMailer::name_("tabular");
}
-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);
-#warning CHECK verify that this is a sane value to return.
if (in.empty())
- return -1;
+ return;
- if (lex.isOK()) {
- lex.next();
- string const token = lex.getString();
- if (token != name_)
- return -1;
- }
-
- 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;
-#warning wrong!
- //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