*
* \author Jürgen Vigna
*
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
*/
#include <config.h>
#include "insettabular.h"
-#include "insettext.h"
#include "buffer.h"
+#include "bufferparams.h"
#include "BufferView.h"
-#include "lfuns.h"
#include "debug.h"
-#include "dimension.h"
#include "funcrequest.h"
+#include "FuncStatus.h"
#include "gettext.h"
#include "language.h"
-#include "LaTeXFeatures.h"
-#include "Lsstream.h"
+#include "LColor.h"
#include "lyx_cb.h"
-#include "lyxfunc.h"
-#include "lyxlength.h"
#include "lyxlex.h"
-#include "lyxtext.h"
+#include "metricsinfo.h"
+#include "paragraph.h"
+#include "paragraph_funcs.h"
#include "ParagraphParameters.h"
#include "undo_funcs.h"
#include "WordLangTuple.h"
-#include "metricsinfo.h"
#include "frontends/Alert.h"
-#include "frontends/Dialogs.h"
#include "frontends/font_metrics.h"
#include "frontends/LyXView.h"
#include "frontends/Painter.h"
-#include "support/LAssert.h"
-#include "support/lstrings.h"
+#include "support/std_sstream.h"
+#include <iostream>
-#include <fstream>
-#include <algorithm>
-#include <cstdlib>
-#include <map>
+using lyx::graphics::PreviewLoader;
+using lyx::support::ltrim;
+using lyx::support::strToInt;
-using namespace lyx::support;
-using namespace lyx::graphics;
-
-using std::vector;
-using std::ostream;
-using std::ifstream;
-using std::max;
using std::endl;
-using std::swap;
using std::max;
+using std::swap;
+using std::string;
using std::auto_ptr;
+using std::istringstream;
+using std::ostream;
+using std::ostringstream;
namespace {
{ LyXTabular::ALIGN_BLOCK, "align-block" },
{ LyXTabular::VALIGN_TOP, "valign-top" },
{ LyXTabular::VALIGN_BOTTOM, "valign-bottom" },
- { LyXTabular::VALIGN_CENTER, "valign-center" },
+ { LyXTabular::VALIGN_MIDDLE, "valign-middle" },
{ LyXTabular::M_TOGGLE_LINE_TOP, "m-toggle-line-top" },
{ LyXTabular::M_TOGGLE_LINE_BOTTOM, "m-toggle-line-bottom" },
{ LyXTabular::M_TOGGLE_LINE_LEFT, "m-toggle-line-left" },
{ LyXTabular::M_ALIGN_CENTER, "m-align-center" },
{ LyXTabular::M_VALIGN_TOP, "m-valign-top" },
{ LyXTabular::M_VALIGN_BOTTOM, "m-valign-bottom" },
- { LyXTabular::M_VALIGN_CENTER, "m-valign-center" },
+ { LyXTabular::M_VALIGN_MIDDLE, "m-valign-middle" },
{ LyXTabular::MULTICOLUMN, "multicolumn" },
{ LyXTabular::SET_ALL_LINES, "set-all-lines" },
{ LyXTabular::UNSET_ALL_LINES, "unset-all-lines" },
InsetTabular::InsetTabular(Buffer const & buf, int rows, int columns)
- : tabular(buf.params, this, max(rows, 1), max(columns, 1)),
+ : tabular(buf.params(), max(rows, 1), max(columns, 1)),
buffer_(&buf), cursorx_(0), cursory_(0)
{
+ tabular.setOwner(this);
// for now make it always display as display() inset
// just for test!!!
the_locking_inset = 0;
oldcell = -1;
actrow = actcell = 0;
clearSelection();
- need_update = INIT;
in_reset_pos = 0;
inset_x = 0;
inset_y = 0;
InsetTabular::InsetTabular(InsetTabular const & tab)
- : UpdatableInset(tab),
- tabular(tab.buffer_->params, this, tab.tabular),
+ : UpdatableInset(tab), tabular(tab.tabular),
buffer_(tab.buffer_), cursorx_(0), cursory_(0)
{
+ tabular.setOwner(this);
the_locking_inset = 0;
old_locking_inset = 0;
locked = false;
oldcell = -1;
actrow = actcell = 0;
clearSelection();
- need_update = INIT;
in_reset_pos = 0;
inset_x = 0;
inset_y = 0;
}
-Buffer const * InsetTabular::buffer() const
+Buffer const & InsetTabular::buffer() const
{
- return buffer_;
+ return *buffer_;
}
BufferView * InsetTabular::view() const
{
- Assert(false);
+ BOOST_ASSERT(false);
return 0;
}
}
-void InsetTabular::write(Buffer const * buf, ostream & os) const
+void InsetTabular::write(Buffer const & buf, ostream & os) const
{
os << "Tabular" << endl;
tabular.write(buf, os);
}
-void InsetTabular::read(Buffer const * buf, LyXLex & lex)
+void InsetTabular::read(Buffer const & buf, LyXLex & lex)
{
bool const old_format = (lex.getString() == "\\LyXTable");
tabular.read(buf, lex);
- need_update = INIT;
-
if (old_format)
return;
// mi.base.textwidth << "\n";
if (!mi.base.bv) {
lyxerr << "InsetTabular::metrics: need bv" << endl;
- Assert(0);
+ BOOST_ASSERT(false);
}
calculate_dimensions_of_cells(mi);
tabular.getAscentOfRow(i + 1) +
tabular.getAdditionalHeight(i + 1);
}
-
- need_update = NONE;
}
void InsetTabular::drawCellSelection(Painter & pain, int x, int y,
int row, int column, int cell) const
{
- Assert(hasSelection());
+ BOOST_ASSERT(hasSelection());
int cs = tabular.column_of_cell(sel_cell_start);
int ce = tabular.column_of_cell(sel_cell_end);
if (cs > ce) {
{
if (the_locking_inset) {
the_locking_inset->insetUnlock(bv);
- updateLocal(bv, CELL);
+ updateLocal(bv);
the_locking_inset = 0;
}
actcell = 0;
locked = false;
if (scroll(false) || hasSelection()) {
clearSelection();
- if (scroll(false)) {
+ if (scroll(false))
scroll(bv, 0.0F);
- }
- updateLocal(bv, FULL);
+ updateLocal(bv);
}
}
-void InsetTabular::updateLocal(BufferView * bv, UpdateCodes what) const
+void InsetTabular::updateLocal(BufferView * bv) const
{
- lyxerr << "InsetTabular::updateLocal: " << what << endl;
- if (!locked && what == CELL)
- what = FULL;
- if (need_update < what) // only set this if it has greater update
- need_update = what;
- // Dirty Cast! (Lgb)
- if (need_update != NONE) {
- bv->updateInset(const_cast<InsetTabular *>(this));
- if (locked)
- resetPos(bv);
- }
+ bv->updateInset(this);
+ if (locked)
+ resetPos(bv);
}
if (scroll(false))
scroll(bv, 0.0F);
#endif
- updateLocal(bv, CELL);
+ updateLocal(bv);
// this has to be here otherwise we don't redraw the cell!
the_locking_inset = 0;
return true;
}
-bool InsetTabular::updateInsetInInset(BufferView * bv, InsetOld * inset)
-{
- InsetOld * tl_inset = inset;
- // look if this inset is really inside myself!
- while(tl_inset->owner() && tl_inset->owner() != this)
- tl_inset = tl_inset->owner();
- // if we enter here it's not ower inset
- if (!tl_inset->owner())
- return false;
- // we only have to do this if this is a subinset of our cells
- if (tl_inset != inset) {
- if (!static_cast<InsetText *>(tl_inset)->updateInsetInInset(bv, inset))
- return false;
- }
- updateLocal(bv, CELL);
- return true;
-}
-
-
int InsetTabular::insetInInsetY() const
{
if (!the_locking_inset)
if (hasSelection()) {
clearSelection();
- updateLocal(cmd.view(), FULL);
+ updateLocal(cmd.view());
}
int const ocell = actcell;
- int const orow = actrow;
BufferView * bv = cmd.view();
if (!locked) {
inset_y = 0;
}
setPos(bv, cmd.x, cmd.y);
- if (actrow != orow)
- updateLocal(bv, NONE);
clearSelection();
-#if 0
- if (cmd.button() == mouse_button::button3) {
- if ((ocell != actcell) && the_locking_inset) {
- the_locking_inset->insetUnlock(bv);
- updateLocal(bv, CELL);
- the_locking_inset = 0;
- }
- return;
- }
-#endif
bool const inset_hit = insetHit(bv, cmd.x, cmd.y);
if (the_locking_inset) {
the_locking_inset->insetUnlock(bv);
- updateLocal(bv, CELL);
+ updateLocal(bv);
the_locking_inset = 0;
}
cmd1.x -= inset_x;
cmd1.y -= inset_y;
the_locking_inset->localDispatch(cmd1);
- return;
}
}
setPos(bv, cmd.x, cmd.y);
if (!hasSelection()) {
setSelection(actcell, actcell);
- updateLocal(bv, FULL);
+ updateLocal(bv);
} else if (old_cell != actcell) {
setSelection(sel_cell_start, actcell);
- updateLocal(bv, FULL);
+ updateLocal(bv);
}
}
-InsetOld::RESULT InsetTabular::localDispatch(FuncRequest const & cmd)
+dispatch_result InsetTabular::localDispatch(FuncRequest const & cmd)
{
// We need to save the value of the_locking_inset as the call to
// the_locking_inset->localDispatch might unlock it.
old_locking_inset = the_locking_inset;
- RESULT result = UpdatableInset::localDispatch(cmd);
+ dispatch_result result = UpdatableInset::localDispatch(cmd);
BufferView * bv = cmd.view();
if (cmd.action == LFUN_INSET_EDIT) {
movePrevCell(bv, old_locking_inset != 0);
clearSelection();
if (hs)
- updateLocal(bv, FULL);
- if (!the_locking_inset) {
+ updateLocal(bv);
+ if (!the_locking_inset)
return DISPATCHED_NOUPDATE;
- }
return result;
// this to avoid compiler warnings.
default:
int sc = scroll();
resetPos(bv);
if (sc != scroll()) { // inset has been scrolled
- updateLocal(bv, FULL);
+ updateLocal(bv);
}
return result;
} else if (result == DISPATCHED) {
- updateLocal(bv, CELL);
+ updateLocal(bv);
return result;
} else if (result == FINISHED_UP) {
action = LFUN_UP;
end = actcell;
}
setSelection(start, end);
- updateLocal(bv, FULL);
+ updateLocal(bv);
break;
}
case LFUN_RIGHT:
result = moveRight(bv);
clearSelection();
if (hs)
- updateLocal(bv, FULL);
+ updateLocal(bv);
break;
case LFUN_LEFTSEL: {
int const start = hasSelection() ? sel_cell_start : actcell;
end = actcell;
}
setSelection(start, end);
- updateLocal(bv, FULL);
+ updateLocal(bv);
break;
}
case LFUN_LEFT:
result = moveLeft(bv);
clearSelection();
if (hs)
- updateLocal(bv, FULL);
+ updateLocal(bv);
break;
case LFUN_DOWNSEL: {
int const start = hasSelection() ? sel_cell_start : actcell;
// the current cell at the beginning
if (hasSelection()) {
moveDown(bv, false);
- if ((ocell == sel_cell_end) ||
- (tabular.column_of_cell(ocell)>tabular.column_of_cell(actcell)))
+ if (ocell == sel_cell_end ||
+ tabular.column_of_cell(ocell) > tabular.column_of_cell(actcell))
setSelection(start, tabular.getCellBelow(sel_cell_end));
else
setSelection(start, tabular.getLastCellBelow(sel_cell_end));
} else {
setSelection(start, start);
}
- updateLocal(bv, FULL);
+ updateLocal(bv);
}
break;
case LFUN_DOWN:
result = moveDown(bv, old_locking_inset != 0);
clearSelection();
- if (hs) {
- updateLocal(bv, FULL);
- }
+ if (hs)
+ updateLocal(bv);
break;
case LFUN_UPSEL: {
int const start = hasSelection() ? sel_cell_start : actcell;
} else {
setSelection(start, start);
}
- updateLocal(bv, FULL);
+ updateLocal(bv);
}
break;
case LFUN_UP:
result = moveUp(bv, old_locking_inset != 0);
clearSelection();
if (hs)
- updateLocal(bv, FULL);
+ updateLocal(bv);
break;
case LFUN_NEXT: {
- UpdateCodes code = CURSOR;
- if (hs) {
+ if (hs)
clearSelection();
- code = FULL;
- }
int column = actcol;
unlockInsetInInset(bv, the_locking_inset);
- if (bv->text->top_y() + bv->painter().paperHeight() <
- (top_baseline + tabular.getHeightOfTabular()))
+ if (bv->top_y() + bv->painter().paperHeight() <
+ top_baseline + tabular.getHeightOfTabular())
{
- bv->scrollDocView(bv->text->top_y() + bv->painter().paperHeight());
- code = FULL;
+ bv->scrollDocView(bv->top_y() + bv->painter().paperHeight());
actcell = tabular.getCellBelow(first_visible_cell) + column;
} else {
actcell = tabular.getFirstCellInRow(tabular.rows() - 1) + column;
}
resetPos(bv);
- updateLocal(bv, code);
+ updateLocal(bv);
break;
}
case LFUN_PRIOR: {
- UpdateCodes code = CURSOR;
- if (hs) {
+ if (hs)
clearSelection();
- code = FULL;
- }
int column = actcol;
unlockInsetInInset(bv, the_locking_inset);
if (top_baseline < 0) {
- bv->scrollDocView(bv->text->top_y() - bv->painter().paperHeight());
- code = FULL;
+ bv->scrollDocView(bv->top_y() - bv->painter().paperHeight());
if (top_baseline > 0)
actcell = column;
else
actcell = column;
}
resetPos(bv);
- updateLocal(bv, code);
+ updateLocal(bv);
break;
}
// none of these make sense for insettabular,
if (tmpstr.empty())
break;
if (insertAsciiString(bv, tmpstr, false))
- updateLocal(bv, INIT);
+ updateLocal(bv);
else
result = UNDISPATCHED;
break;
// no break here!
case LFUN_DELETE:
recordUndo(bv, Undo::DELETE);
- cutSelection(bv->buffer()->params);
- updateLocal(bv, INIT);
+ cutSelection(bv->buffer()->params());
+ updateLocal(bv);
break;
case LFUN_COPY:
if (!hasSelection())
}
maxCols = max(cols, maxCols);
delete paste_tabular;
- paste_tabular = new LyXTabular(bv->buffer()->params,
+ paste_tabular = new LyXTabular(bv->buffer()->params(),
this, rows, maxCols);
string::size_type op = 0;
int cell = 0;
if (hasPasteBuffer()) {
recordUndo(bv, Undo::INSERT);
pasteSelection(bv);
- updateLocal(bv, INIT);
+ updateLocal(bv);
break;
}
// ATTENTION: the function above has to be PASTE and PASTESELECTION!!!
if (result == DISPATCHED || the_locking_inset)
break;
if (activateCellInset(bv)) {
- // reset need_update setted in above function!
- need_update = NONE;
result = the_locking_inset->localDispatch(FuncRequest(bv, action, arg));
if (result == UNDISPATCHED || result >= FINISHED) {
unlockInsetInInset(bv, the_locking_inset);
// we need to update if this was requested before
- updateLocal(bv, NONE);
+ updateLocal(bv);
return UNDISPATCHED;
- } else if (hs) {
- clearSelection();
- // so the below CELL is not set because this is higher
- // priority and we get a full redraw
- need_update = FULL;
}
- updateLocal(bv, CELL);
+ if (hs)
+ clearSelection();
+ updateLocal(bv);
return result;
}
break;
}
if (result < FINISHED) {
if (!the_locking_inset && bv->fitCursor())
- updateLocal(bv, FULL);
+ updateLocal(bv);
} else
bv->unlockInset(this);
return result;
}
-int InsetTabular::latex(Buffer const * buf, ostream & os,
+int InsetTabular::latex(Buffer const & buf, ostream & os,
LatexRunParams const & runparams) const
{
return tabular.latex(buf, os, runparams);
}
-int InsetTabular::ascii(Buffer const * buf, ostream & os, int ll) const
+int InsetTabular::ascii(Buffer const & buf, ostream & os, int ll) const
{
if (ll > 0)
- return tabular.ascii(buf, os, (int)parOwner()->params().depth(),
+ return tabular.ascii(buf, os, ownerPar(buf, this).params().depth(),
false, 0);
return tabular.ascii(buf, os, 0, false, 0);
}
-int InsetTabular::linuxdoc(Buffer const * buf, ostream & os) const
+int InsetTabular::linuxdoc(Buffer const & buf, ostream & os) const
{
return tabular.linuxdoc(buf,os);
}
-int InsetTabular::docbook(Buffer const * buf, ostream & os, bool mixcont) const
+int InsetTabular::docbook(Buffer const & buf, ostream & os, bool mixcont) const
{
int ret = 0;
InsetOld * master;
// if we have a locking_inset we should have to check only this cell for
// change so I'll try this to have a boost, but who knows ;) (Jug?)
// This is _really_ important (André)
- if (need_update != INIT &&
- the_locking_inset == &tabular.getCellInset(actcell)) {
+ if (the_locking_inset == &tabular.getCellInset(actcell)) {
int maxAsc = 0;
int maxDesc = 0;
for (int j = 0; j < tabular.columns(); ++j) {
void InsetTabular::fitInsetCursor(BufferView * bv) const
{
if (the_locking_inset) {
- int old_top_y = bv->text->top_y();
the_locking_inset->fitInsetCursor(bv);
- if (old_top_y != bv->text->top_y())
- need_update = FULL;
return;
}
- LyXFont font;
+ LyXFont font;
int const asc = font_metrics::maxAscent(font);
int const desc = font_metrics::maxDescent(font);
resetPos(bv);
- if (bv->fitLockedInsetCursor(cursorx_, cursory_, asc, desc))
- need_update = FULL;
+ bv->fitLockedInsetCursor(cursorx_, cursory_, asc, desc);
}
// now search the right column
int lx = tabular.getWidthOfColumn(actcell) -
tabular.getAdditionalWidth(actcell);
- for (; !tabular.isLastCellInRow(actcell) && lx < x; ++actcell) {
+
+ for (; !tabular.isLastCellInRow(actcell) && lx < x; ++actcell)
lx += tabular.getWidthOfColumn(actcell + 1)
+ tabular.getAdditionalWidth(actcell);
- }
+
cursorx_ = lx - tabular.getWidthOfColumn(actcell) + top_x + 2;
resetPos(bv);
}
}
// we need this only from here on!!!
++in_reset_pos;
- static int const offset = ADD_TO_TABULAR_WIDTH + 2;
+ int const offset = ADD_TO_TABULAR_WIDTH + 2;
int new_x = getCellXPos(actcell);
int old_x = cursorx_;
new_x += offset;
tabular.getWidthOfTabular() < bv->workWidth()-20)
{
scroll(bv, 0.0F);
- updateLocal(bv, FULL);
+ updateLocal(bv);
} else if (the_locking_inset &&
tabular.getWidthOfColumn(actcell) > bv->workWidth() - 20)
{
int xx = cursorx_ - offset + bv->text->getRealCursorX();
if (xx > bv->workWidth()-20) {
scroll(bv, -(xx - bv->workWidth() + 60));
- updateLocal(bv, FULL);
+ updateLocal(bv);
} else if (xx < 20) {
if (xx < 0)
xx = -xx + 60;
else
xx = 60;
scroll(bv, xx);
- updateLocal(bv, FULL);
+ updateLocal(bv);
}
} else if (cursorx_ - offset > 20 &&
cursorx_ - offset + tabular.getWidthOfColumn(actcell)
> bv->workWidth() - 20) {
scroll(bv, -tabular.getWidthOfColumn(actcell) - 20);
- updateLocal(bv, FULL);
+ updateLocal(bv);
} else if (cursorx_ - offset < 20) {
scroll(bv, 20 - cursorx_ + offset);
- updateLocal(bv, FULL);
+ updateLocal(bv);
} else if (scroll() && top_x > 20 &&
(top_x + tabular.getWidthOfTabular()) > bv->workWidth() - 20) {
scroll(bv, old_x - cursorx_);
- updateLocal(bv, FULL);
+ updateLocal(bv);
}
if (the_locking_inset) {
inset_x = cursorx_ - top_x + tabular.getBeginningOfTextInCell(actcell);
}
-InsetOld::RESULT InsetTabular::moveRight(BufferView * bv, bool lock)
+dispatch_result InsetTabular::moveRight(BufferView * bv, bool lock)
{
if (lock && !old_locking_inset) {
if (activateCellInset(bv))
}
-InsetOld::RESULT InsetTabular::moveLeft(BufferView * bv, bool lock)
+dispatch_result InsetTabular::moveLeft(BufferView * bv, bool lock)
{
bool moved = isRightToLeft(bv) ? moveNextCell(bv) : movePrevCell(bv);
if (!moved)
}
-InsetOld::RESULT InsetTabular::moveUp(BufferView * bv, bool lock)
+dispatch_result InsetTabular::moveUp(BufferView * bv, bool lock)
{
int const ocell = actcell;
actcell = tabular.getCellAbove(actcell);
}
-InsetOld::RESULT InsetTabular::moveDown(BufferView * bv, bool lock)
+dispatch_result InsetTabular::moveDown(BufferView * bv, bool lock)
{
int const ocell = actcell;
actcell = tabular.getCellBelow(actcell);
}
if (lock) {
bool rtl = tabular.getCellInset(actcell).paragraphs.begin()->
- isRightToLeftPar(bv->buffer()->params);
+ isRightToLeftPar(bv->buffer()->params());
activateCellInset(bv, 0, 0, mouse_button::none, !rtl);
}
resetPos(bv);
}
if (lock) {
bool rtl = tabular.getCellInset(actcell).paragraphs.begin()->
- isRightToLeftPar(bv->buffer()->params);
+ isRightToLeftPar(bv->buffer()->params());
activateCellInset(bv, 0, 0, mouse_button::none, !rtl);
}
resetPos(bv);
unFreezeUndo();
if (selectall)
clearSelection();
- updateLocal(bv, INIT);
+ updateLocal(bv);
}
if (the_locking_inset)
the_locking_inset->setFont(bv, font, tall);
setVAlign = LyXTabular::LYX_VALIGN_BOTTOM;
break;
- case LyXTabular::M_VALIGN_CENTER:
- case LyXTabular::VALIGN_CENTER:
- setVAlign = LyXTabular::LYX_VALIGN_CENTER;
+ case LyXTabular::M_VALIGN_MIDDLE:
+ case LyXTabular::VALIGN_MIDDLE:
+ setVAlign = LyXTabular::LYX_VALIGN_MIDDLE;
break;
default:
case LyXTabular::SET_PWIDTH:
{
- LyXLength const vallen(value);
- LyXLength const & tmplen = tabular.getColumnPWidth(actcell);
+ LyXLength const len(value);
+ LyXLength const & oldlen = tabular.getColumnPWidth(actcell);
- bool const update = (tmplen != vallen);
- tabular.setColumnPWidth(actcell, vallen);
- if (update) {
+ tabular.setColumnPWidth(actcell, len);
+ if (oldlen != len) {
// We need this otherwise we won't resize
// the insettext of the active cell (if any)
// until later (see InsetText::do_resize)
unlockInsetInInset(bv, the_locking_inset);
-
- for (int i = 0; i < tabular.rows(); ++i)
- tabular.getCellInset(i, column).resizeLyXText(bv);
- updateLocal(bv, INIT);
+ bv->update();
}
- if (vallen.zero()
+ if (len.zero()
&& tabular.getAlignment(actcell, true) == LYX_ALIGN_BLOCK)
tabularFeatures(bv, LyXTabular::ALIGN_CENTER, string());
- else if (!vallen.zero()
+ else if (!len.zero()
&& tabular.getAlignment(actcell, true) != LYX_ALIGN_BLOCK)
tabularFeatures(bv, LyXTabular::ALIGN_BLOCK, string());
break;
case LyXTabular::SET_MPWIDTH:
{
- LyXLength const vallen(value);
- LyXLength const & tmplen = tabular.getPWidth(actcell);
-
- bool const update = (tmplen != vallen);
- tabular.setMColumnPWidth(actcell, vallen);
- if (update) {
+ LyXLength const len(value);
+ LyXLength const & oldlen = tabular.getPWidth(actcell);
+ tabular.setMColumnPWidth(actcell, len);
+ if (oldlen != len) {
// We need this otherwise we won't resize
// the insettext of the active cell (if any)
// until later (see InsetText::do_resize)
unlockInsetInInset(bv, the_locking_inset);
-
- for (int i = 0; i < tabular.rows(); ++i)
- tabular.getCellInset(i, column).resizeLyXText(bv);
-
- updateLocal(bv, INIT);
+ updateLocal(bv);
}
}
break;
case LyXTabular::SET_SPECIAL_COLUMN:
case LyXTabular::SET_SPECIAL_MULTI:
tabular.setAlignSpecial(actcell,value,feature);
- updateLocal(bv, FULL);
+ updateLocal(bv);
break;
case LyXTabular::APPEND_ROW:
// append the row into the tabular
unlockInsetInInset(bv, the_locking_inset);
- tabular.appendRow(bv->buffer()->params, actcell);
- updateLocal(bv, INIT);
+ tabular.appendRow(bv->buffer()->params(), actcell);
+ tabular.setOwner(this);
+ updateLocal(bv);
break;
case LyXTabular::APPEND_COLUMN:
// append the column into the tabular
unlockInsetInInset(bv, the_locking_inset);
- tabular.appendColumn(bv->buffer()->params, actcell);
+ tabular.appendColumn(bv->buffer()->params(), actcell);
+ tabular.setOwner(this);
actcell = tabular.getCellNumber(row, column);
- updateLocal(bv, INIT);
+ updateLocal(bv);
break;
case LyXTabular::DELETE_ROW:
unlockInsetInInset(bv, the_locking_inset);
--sel_row_start;
actcell = tabular.getCellNumber(sel_row_start, column);
clearSelection();
- updateLocal(bv, INIT);
+ updateLocal(bv);
break;
case LyXTabular::DELETE_COLUMN:
unlockInsetInInset(bv, the_locking_inset);
--sel_col_start;
actcell = tabular.getCellNumber(row, sel_col_start);
clearSelection();
- updateLocal(bv, INIT);
+ updateLocal(bv);
break;
case LyXTabular::M_TOGGLE_LINE_TOP:
flag = false;
tabular.setTopLine(
tabular.getCellNumber(i, j),
lineSet, flag);
- updateLocal(bv, INIT);
+ updateLocal(bv);
break;
}
tabular.getCellNumber(i, j),
lineSet,
flag);
- updateLocal(bv, INIT);
+ updateLocal(bv);
break;
}
tabular.getCellNumber(i,j),
lineSet,
flag);
- updateLocal(bv, INIT);
+ updateLocal(bv);
break;
}
tabular.getCellNumber(i,j),
lineSet,
flag);
- updateLocal(bv, INIT);
+ updateLocal(bv);
break;
}
tabular.getCellNumber(i, j),
setAlign,
flag);
- updateLocal(bv, INIT);
+ updateLocal(bv);
break;
case LyXTabular::M_VALIGN_TOP:
case LyXTabular::M_VALIGN_BOTTOM:
- case LyXTabular::M_VALIGN_CENTER:
+ case LyXTabular::M_VALIGN_MIDDLE:
flag = false;
case LyXTabular::VALIGN_TOP:
case LyXTabular::VALIGN_BOTTOM:
- case LyXTabular::VALIGN_CENTER:
+ 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)
tabular.setVAlignment(
tabular.getCellNumber(i, j),
setVAlign, flag);
- updateLocal(bv, INIT);
+ updateLocal(bv);
break;
case LyXTabular::MULTICOLUMN: {
// just multicol for one Single Cell
if (!hasSelection()) {
// check wether we are completly in a multicol
- if (tabular.isMultiColumn(actcell)) {
+ if (tabular.isMultiColumn(actcell))
tabular.unsetMultiColumn(actcell);
- updateLocal(bv, INIT);
- } else {
+ else
tabular.setMultiColumn(bv->buffer(), actcell, 1);
- updateLocal(bv, CELL);
- }
+ updateLocal(bv);
break;
}
// we have a selection so this means we just add all this
tabular.setMultiColumn(bv->buffer(), s_start, s_end - s_start + 1);
actcell = s_start;
clearSelection();
- updateLocal(bv, INIT);
+ updateLocal(bv);
break;
}
for (int j = sel_col_start; j <= sel_col_end; ++j)
tabular.setAllLines(
tabular.getCellNumber(i,j), setLines);
- updateLocal(bv, INIT);
+ updateLocal(bv);
break;
case LyXTabular::SET_LONGTABULAR:
tabular.setLongTabular(true);
- updateLocal(bv, INIT); // because this toggles displayed
+ updateLocal(bv); // because this toggles displayed
break;
case LyXTabular::UNSET_LONGTABULAR:
tabular.setLongTabular(false);
- updateLocal(bv, INIT); // because this toggles displayed
+ updateLocal(bv); // because this toggles displayed
break;
case LyXTabular::SET_ROTATE_TABULAR:
for (int i = sel_row_start; i <= sel_row_end; ++i)
for (int j = sel_col_start; j<=sel_col_end; ++j)
tabular.setRotateCell(
- tabular.getCellNumber(i, j),
- true);
+ tabular.getCellNumber(i, j), true);
break;
case LyXTabular::UNSET_ROTATE_CELL:
inset.localDispatch(FuncRequest(bv, LFUN_INSET_EDIT, x, y, button));
if (!the_locking_inset)
return false;
- updateLocal(bv, CELL);
- return (the_locking_inset != 0);
+ updateLocal(bv);
+ return the_locking_inset;
}
}
-void InsetTabular::deleteLyXText(BufferView * bv, bool recursive) const
+void InsetTabular::deleteLyXText(BufferView * /*bv*/, bool /*recursive*/) const
{
- resizeLyXText(bv, recursive);
-}
-
-
-void InsetTabular::resizeLyXText(BufferView * bv, bool force) const
-{
- if (force)
- for (int i = 0; i < tabular.rows(); ++i)
- for (int j = 0; j < tabular.columns(); ++j)
- tabular.getCellInset(i, j).resizeLyXText(bv, true);
- need_update = FULL;
+ //resizeLyXText(bv, recursive);
}
status.setOnOff(tabular.getVAlignment(actcell, flag) == LyXTabular::LYX_VALIGN_BOTTOM);
break;
- case LyXTabular::M_VALIGN_CENTER:
+ case LyXTabular::M_VALIGN_MIDDLE:
flag = false;
- case LyXTabular::VALIGN_CENTER:
- status.setOnOff(tabular.getVAlignment(actcell, flag) == LyXTabular::LYX_VALIGN_CENTER);
+ case LyXTabular::VALIGN_MIDDLE:
+ status.setOnOff(tabular.getVAlignment(actcell, flag) == LyXTabular::LYX_VALIGN_MIDDLE);
break;
case LyXTabular::SET_LONGTABULAR:
}
-void InsetTabular::getLabelList(std::vector<string> & list) const
+void InsetTabular::getLabelList(Buffer const & buffer,
+ std::vector<string> & list) const
{
- tabular.getLabelList(list);
+ tabular.getLabelList(buffer, list);
}
swap(sel_row_start, sel_row_end);
delete paste_tabular;
- paste_tabular = new LyXTabular(bv->buffer()->params, this, tabular);
+ paste_tabular = new LyXTabular(tabular);
+ paste_tabular->setOwner(this);
for (int i = 0; i < sel_row_start; ++i)
paste_tabular->deleteRow(0);
true, true);
ostringstream os;
- paste_tabular->ascii(bv->buffer(), os,
- (int)parOwner()->params().depth(), true, '\t');
- bv->stuffClipboard(STRCONV(os.str()));
+ paste_tabular->ascii(*bv->buffer(), os,
+ ownerPar(*bv->buffer(), this).params().depth(), true, '\t');
+ bv->stuffClipboard(os.str());
return true;
}
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);
+ tabular.getCellInset(tabular.getCellNumber(i, j))
+ .clear(bp.tracking_changes);
return true;
}
WordLangTuple InsetTabular::selectNextWordInt(BufferView * bv, float & value) const
{
// when entering this function the inset should be ALWAYS locked!
- Assert(the_locking_inset);
+ BOOST_ASSERT(the_locking_inset);
WordLangTuple word(the_locking_inset->selectNextWordToSpellcheck(bv, value));
if (!word.word().empty())
{
if (the_locking_inset) {
if (the_locking_inset->nextChange(bv, length)) {
- updateLocal(bv, CELL);
+ updateLocal(bv);
return true;
}
if (tabular.isLastCell(actcell))
}
InsetText & inset = tabular.getCellInset(actcell);
if (inset.nextChange(bv, length)) {
- updateLocal(bv, FULL);
+ updateLocal(bv);
return true;
}
while (!tabular.isLastCell(actcell)) {
++actcell;
InsetText & inset = tabular.getCellInset(actcell);
if (inset.nextChange(bv, length)) {
- updateLocal(bv, FULL);
+ updateLocal(bv);
return true;
}
}
int cell = 0;
if (the_locking_inset) {
if (the_locking_inset->searchForward(bv, str, cs, mw)) {
- updateLocal(bv, CELL);
+ updateLocal(bv);
return true;
}
if (tabular.isLastCell(actcell))
}
InsetText & inset = tabular.getCellInset(cell);
if (inset.searchForward(bv, str, cs, mw)) {
- updateLocal(bv, FULL);
+ updateLocal(bv);
return true;
}
while (!tabular.isLastCell(cell)) {
++cell;
InsetText & inset = tabular.getCellInset(cell);
if (inset.searchForward(bv, str, cs, mw)) {
- updateLocal(bv, FULL);
+ updateLocal(bv);
return true;
}
}
int cell = tabular.getNumberOfCells();
if (the_locking_inset) {
if (the_locking_inset->searchBackward(bv, str, cs, mw)) {
- updateLocal(bv, CELL);
+ updateLocal(bv);
return true;
}
cell = actcell;
--cell;
InsetText & inset = tabular.getCellInset(cell);
if (inset.searchBackward(bv, str, cs, mw)) {
- updateLocal(bv, CELL);
+ updateLocal(bv);
return true;
}
}
bool InsetTabular::forceDefaultParagraphs(InsetOld const * in) const
{
- const int cell = tabular.getCellFromInset(in, actcell);
+ const int cell = tabular.getCellFromInset(in);
if (cell != -1)
return tabular.getPWidth(cell).zero();
// well we didn't obviously find it so maybe our owner knows more
- if (owner())
- return owner()->forceDefaultParagraphs(in);
-
- lyxerr << "If we're here there is really something strange going on!"
- << endl;
- return false;
+ BOOST_ASSERT(owner());
+ return owner()->forceDefaultParagraphs(in);
}
int row = 0;
if (usePaste) {
delete paste_tabular;
- paste_tabular = new LyXTabular(bv->buffer()->params,
- this, rows, maxCols);
+ paste_tabular = new LyXTabular(bv->buffer()->params(),
+ rows, maxCols);
+ paste_tabular->setOwner(this);
loctab = paste_tabular;
cols = 0;
} else {
int InsetTabularMailer::string2params(string const & in, InsetTabular & inset)
{
- istringstream data(STRCONV(in));
+ istringstream data(in);
LyXLex lex(0,0);
lex.setStream(data);
if (!lex.isOK())
return -1;
- Buffer const * const buffer = inset.buffer();
- if (buffer)
- inset.read(buffer, lex);
+ 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.
string const InsetTabularMailer::params2string(InsetTabular const & inset)
{
- Buffer const * const buffer = inset.buffer();
- if (!buffer)
- return string();
+ Buffer const & buffer = inset.buffer();
ostringstream data;
data << name_ << " \\active_cell " << inset.getActCell() << '\n';
inset.write(buffer, data);
data << "\\end_inset\n";
- return STRCONV(data.str());
+ return data.str();
}
projects / lyx.git / blobdiff