#include "BufferView.h"
#include "undo_funcs.h"
#include "lyxlength.h"
+#include "ParagraphParameters.h"
#include "frontends/Dialogs.h"
#include "frontends/Alert.h"
#include <map>
//#include <signal.h>
+
+using std::vector;
using std::ostream;
using std::ifstream;
using std::max;
// for now make it always display as display() inset
// just for test!!!
the_locking_inset = 0;
+ old_locking_inset = 0;
locked = false;
oldcell = -1;
actrow = actcell = 0;
need_update = INIT;
in_update = false;
in_reset_pos = false;
+ inset_x = 0;
+ inset_y = 0;
}
{
tabular.reset(new LyXTabular(this, *(tab.tabular), same_id));
the_locking_inset = 0;
+ old_locking_inset = 0;
locked = false;
oldcell = -1;
actrow = actcell = 0;
need_update = INIT;
in_update = false;
in_reset_pos = false;
+ inset_x = 0;
+ inset_y = 0;
}
float dx = nx + tabular->GetBeginningOfTextInCell(cell);
float cx = dx;
tabular->GetCellInset(cell)->draw(bv, font, baseline, dx, false);
+ //
+ // Here we use rectangular backgroundColor patches to clean up
+ // within a cell around the cell's red inset box. As follows:
+ //
+ // +--------------------+
+ // | C | The rectangles are A, B and C
+ // | A |------------| B | below, origin top left (tx, ty),
+ // | | inset box | | dimensions w(idth), h(eight).
+ // +---+------------+---+ x grows rightward, y downward
+ // | D |
+ // +--------------------+
+ //
+#if 0
// clear only if we didn't have a change
if (bv->text->status() != LyXText::CHANGED_IN_DRAW) {
+#endif
// clear before the inset
- pain.fillRectangle(
- nx + 1,
- baseline - tabular->GetAscentOfRow(i) + 1,
- int(cx - nx - 1),
- tabular->GetAscentOfRow(i) +
- tabular->GetDescentOfRow(i) - 1,
- backgroundColor());
+ int tx, ty, w, h;
+ tx = nx + 1;
+ ty = baseline - tabular->GetAscentOfRow(i) + 1;
+ w = int(cx - nx - 1);
+ h = tabular->GetAscentOfRow(i) +
+ tabular->GetDescentOfRow(i) - 1;
+ pain.fillRectangle(tx, ty, w, h, backgroundColor());
// clear behind the inset
- pain.fillRectangle(
- int(cx + the_locking_inset->width(bv,font) + 1),
- baseline - tabular->GetAscentOfRow(i) + 1,
- tabular->GetWidthOfColumn(cell) -
+ tx = int(cx + the_locking_inset->width(bv,font) + 1);
+ ty = baseline - tabular->GetAscentOfRow(i) + 1;
+ w = tabular->GetWidthOfColumn(cell) -
tabular->GetBeginningOfTextInCell(cell) -
the_locking_inset->width(bv,font) -
- tabular->GetAdditionalWidth(cell) - 1,
- tabular->GetAscentOfRow(i) +
- tabular->GetDescentOfRow(i) - 1,
- backgroundColor());
+ tabular->GetAdditionalWidth(cell) - 1;
+ h = tabular->GetAscentOfRow(i) + tabular->GetDescentOfRow(i) - 1;
+ pain.fillRectangle(tx, ty, w, h, backgroundColor());
// clear below the inset
- pain.fillRectangle(
- nx + 1,
- baseline + the_locking_inset->descent(bv, font) + 1,
- tabular->GetWidthOfColumn(cell) -
- tabular->GetAdditionalWidth(cell) - 1,
- tabular->GetAscentOfRow(i) +
- tabular->GetDescentOfRow(i) -
- the_locking_inset->ascent(bv, font) -
- the_locking_inset->descent(bv, font) -
- TEXT_TO_INSET_OFFSET - 1,
- backgroundColor());
+ tx = nx + 1;
+ ty = baseline + the_locking_inset->descent(bv, font) + 1;
+ w = tabular->GetWidthOfColumn(cell) -
+ tabular->GetAdditionalWidth(cell) - 1;
+ h = tabular->GetDescentOfRow(i) -
+ the_locking_inset->descent(bv, font) - 1;
+ pain.fillRectangle(tx, ty, w, h, backgroundColor());
+ // clear above the inset
+ tx = nx + 1;
+ ty = baseline - tabular->GetAscentOfRow(i) + 1;
+ w = tabular->GetWidthOfColumn(cell) -
+ tabular->GetAdditionalWidth(cell) - 1;
+ h = tabular->GetAscentOfRow(i) - the_locking_inset->ascent(bv, font);
+ pain.fillRectangle(tx, ty, w, h, backgroundColor());
+#if 0
}
+#endif
}
x -= ADD_TO_TABULAR_WIDTH;
x += width(bv, font);
void InsetTabular::drawCellLines(Painter & pain, int x, int baseline,
- int row, int cell) const
+ int row, int cell) const
{
int x2 = x + tabular->GetWidthOfColumn(cell);
bool on_off;
}
if (need_update < what) // only set this if it has greater update
need_update = what;
+#if 0 // maybe this should not be done!
if ((what == INIT) && hasSelection()) {
clearSelection();
}
+#endif
// Dirty Cast! (Lgb)
if (need_update != NONE) {
bv->updateInset(const_cast<InsetTabular *>(this), mark_dirty);
}
if (in->getInsetFromID(id)) {
actcell = i;
- the_locking_inset = in;
- locked = true;
- resetPos(bv);
+ in->edit(bv);
return the_locking_inset->lockInsetInInset(bv, inset);
}
}
{
if (!the_locking_inset)
return 0;
-
return inset_y + the_locking_inset->insetInInsetY();
}
{
bool ret = false;
if (the_locking_inset)
- ret = the_locking_inset->insetButtonRelease(bv, x, y, button);
+ ret = the_locking_inset->insetButtonRelease(bv, x - inset_x,
+ y - inset_y, button);
if (button == 3 && !ret) {
bv->owner()->getDialogs()->showTabular(this);
return true;
int const ocell = actcell;
// if we are starting a selection, only select
// the current cell at the beginning
- if (hasSelection()) {
+ if (hasSelection()) {
moveDown(bv, false);
+ 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);
}
- 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));
updateLocal(bv, SELECTION, false);
}
break;
// the current cell at the beginning
if (hasSelection()) {
moveUp(bv, false);
+ if ((ocell == sel_cell_end) ||
+ (tabular->column_of_cell(ocell)>tabular->column_of_cell(actcell)))
+ setSelection(start, tabular->GetCellAbove(sel_cell_end));
+ else
+ setSelection(start, tabular->GetLastCellAbove(sel_cell_end));
+ } else {
+ setSelection(start, start);
}
- if ((ocell == sel_cell_end) ||
- (tabular->column_of_cell(ocell)>tabular->column_of_cell(actcell)))
- setSelection(start, tabular->GetCellAbove(sel_cell_end));
- else
- setSelection(start, tabular->GetLastCellAbove(sel_cell_end));
updateLocal(bv, SELECTION, false);
}
break;
case LFUN_HOMESEL:
case LFUN_END:
case LFUN_ENDSEL:
+ case LFUN_BEGINNINGBUF:
+ case LFUN_BEGINNINGBUFSEL:
+ case LFUN_ENDBUF:
+ case LFUN_ENDBUFSEL:
break;
case LFUN_LAYOUT_TABULAR:
bv->owner()->getDialogs()->showTabular(this);
while (p < len &&
((p = clip.find_first_of("\t\n", p)) != string::npos)) {
- switch(clip[p]) {
+ switch (clip[p]) {
case '\t':
++cols;
break;
(p = clip.find_first_of("\t\n", p)) != string::npos) {
if (p >= len)
break;
- switch(clip[p]) {
+ switch (clip[p]) {
case '\t':
paste_tabular->GetCellInset(cell)->setText(clip.substr(op, p-op));
++cols;
int InsetTabular::latex(Buffer const * buf, ostream & os,
- bool fragile, bool fp) const
+ bool fragile, bool fp) const
{
- return tabular->Latex(buf, os, fragile, fp);
+ return tabular->latex(buf, os, fragile, fp);
}
-int InsetTabular::ascii(Buffer const * buf, ostream & os, int) const
+int InsetTabular::ascii(Buffer const * buf, ostream & os, int ll) const
{
- // This should be changed to a real ascii export
- return tabular->Ascii(buf, os);
+ if (ll > 0)
+ return tabular->ascii(buf, os, (int)parOwner()->params().depth(),
+ false,0);
+ return tabular->ascii(buf, os, 0, false,0);
}
int InsetTabular::linuxdoc(Buffer const * buf, ostream & os) const
{
- return tabular->Ascii(buf,os);
+ os << "<![CDATA[";
+ int const ret = tabular->ascii(buf,os,
+ (int)parOwner()->params().depth(),
+ false, 0);
+ os << "]]>";
+ return ret;
}
os << "<informaltable>\n";
ret++;
}
- ret+= tabular->DocBook(buf,os);
+ ret+= tabular->docBook(buf,os);
if (!master) {
os << "</informaltable>\n";
ret++;
void InsetTabular::toggleInsetCursor(BufferView * bv)
{
+ if (nodraw()) {
+ if (isCursorVisible())
+ bv->hideLockedInsetCursor();
+ return;
+ }
if (the_locking_inset) {
the_locking_inset->toggleInsetCursor(bv);
return;
void InsetTabular::showInsetCursor(BufferView * bv, bool show)
{
+ if (nodraw())
+ return;
if (!isCursorVisible()) {
LyXFont font; // = GetFont(par, cursor.pos);
void InsetTabular::resetPos(BufferView * bv) const
{
- if (!locked || nodraw())
- return;
#warning This should be fixed in the right manner (20011128 Jug)
// fast hack to fix infinite repaintings!
if (in_reset_pos)
return;
- in_reset_pos = true;
-
- actcol = tabular->column_of_cell(actcell);
int cell = 0;
+ actcol = tabular->column_of_cell(actcell);
actrow = 0;
cursor_.y(0);
for (; (cell < actcell) && !tabular->IsLastRow(cell); ++cell) {
++actrow;
}
}
+ if (!locked || nodraw()) {
+ if (the_locking_inset)
+ inset_y = cursor_.y();
+ return;
+ }
+ // we need this only from here on!!!
+ in_reset_pos = true;
static int const offset = ADD_TO_TABULAR_WIDTH + 2;
int new_x = getCellXPos(actcell);
int old_x = cursor_.x();
return true;
}
+static void checkLongtableSpecial(LyXTabular::ltType & ltt,
+ string const & special, bool & flag)
+{
+ if (special == "dl_above") {
+ ltt.topDL = flag;
+ ltt.set = false;
+ } else if (special == "dl_below") {
+ ltt.bottomDL = flag;
+ ltt.set = false;
+ } else if (special == "empty") {
+ ltt.empty = flag;
+ ltt.set = false;
+ } else if (flag) {
+ ltt.empty = false;
+ ltt.set = true;
+ }
+}
+
void InsetTabular::tabularFeatures(BufferView * bv,
LyXTabular::Feature feature,
bv->text->cursor.par(),
bv->text->cursor.par()->next());
- LyXTabular::ltType ltt;
- int row = ltt.row = tabular->row_of_cell(actcell);
+ int row = tabular->row_of_cell(actcell);
int column = tabular->column_of_cell(actcell);
bool flag = true;
-
+ LyXTabular::ltType ltt;
+
switch (feature) {
case LyXTabular::SET_PWIDTH:
{
bool const update = (tmplen != vallen);
tabular->SetColumnPWidth(actcell, vallen);
if (update) {
+ int cell;
for (int i = 0; i < tabular->rows(); ++i) {
- tabular->GetCellInset(tabular->GetCellNumber(i, column))->
- resizeLyXText(bv);
+ cell = tabular->GetCellNumber(i,column);
+ tabular->GetCellInset(cell)->resizeLyXText(bv);
}
updateLocal(bv, INIT, true);
}
break;
}
case LyXTabular::UNSET_LTFIRSTHEAD:
- ltt.row = 0;
+ flag = false;
case LyXTabular::SET_LTFIRSTHEAD:
- tabular->SetLTHead(ltt, true);
+ (void)tabular->GetRowOfLTFirstHead(row, ltt);
+ checkLongtableSpecial(ltt, value, flag);
+ tabular->SetLTHead(row, flag, ltt, true);
break;
case LyXTabular::UNSET_LTHEAD:
- ltt.row = 0;
+ flag = false;
case LyXTabular::SET_LTHEAD:
- tabular->SetLTHead(ltt, false);
+ (void)tabular->GetRowOfLTHead(row, ltt);
+ checkLongtableSpecial(ltt, value, flag);
+ tabular->SetLTHead(row, flag, ltt, false);
break;
case LyXTabular::UNSET_LTFOOT:
- ltt.row = 0;
+ flag = false;
case LyXTabular::SET_LTFOOT:
- tabular->SetLTFoot(ltt, false);
+ (void)tabular->GetRowOfLTFoot(row, ltt);
+ checkLongtableSpecial(ltt, value, flag);
+ tabular->SetLTFoot(row, flag, ltt, false);
break;
case LyXTabular::UNSET_LTLASTFOOT:
- ltt.row = 0;
+ flag = false;
case LyXTabular::SET_LTLASTFOOT:
- tabular->SetLTFoot(ltt, true);
+ (void)tabular->GetRowOfLTLastFoot(row, ltt);
+ checkLongtableSpecial(ltt, value, flag);
+ tabular->SetLTFoot(row, flag, ltt, true);
break;
case LyXTabular::SET_LTNEWPAGE:
{
- bool what = !tabular->GetLTNewPage(actcell);
- tabular->SetLTNewPage(actcell, what);
+ bool what = !tabular->GetLTNewPage(row);
+ tabular->SetLTNewPage(row, what);
break;
}
// dummy stuff just to avoid warnings
if (len.zero())
return -1;
-#ifdef WITH_WARNINGS
-#warning Remove use of VSpace as soon as LyXLength::inPixels exists (JMarc)
-#endif
- return VSpace(len).inPixels(bv);
+ return len.inPixels(latexTextWidth(bv), bv->text->defaultHeight());
}
int InsetTabular::getMaxWidth(BufferView * bv,
UpdatableInset const * inset) const
{
- int cell = tabular->cur_cell;
- if (tabular->GetCellInset(cell) != inset) {
- cell = actcell;
- if (tabular->GetCellInset(cell) != inset) {
-
- lyxerr[Debug::INSETTEXT] << "Actcell not equal to actual cell!\n";
- cell = -1;
- }
- }
-
- int const n = tabular->GetNumberOfCells();
+ int cell = tabular->GetCellFromInset(inset, actcell);
if (cell == -1) {
- for (cell = 0; cell < n; ++cell) {
- if (tabular->GetCellInset(cell) == inset)
- break;
- }
- }
-
- if (cell >= n) {
- lyxerr << "Own inset not found, shouldn't really happen!\n";
+ lyxerr << "Own inset not found, shouldn't really happen!"
+ << endl;
return -1;
}
//
-// functions returns:
-// 0 ... disabled
-// 1 ... enabled
-// 2 ... toggled on
-// 3 ... toggled off
+// function returns an object as defined in func_status.h:
+// states OK, Unknown, Disabled, On, Off.
//
-func_status::value_type InsetTabular::getStatus(string const & what) const
+FuncStatus InsetTabular::getStatus(string const & what) const
{
int action = LyXTabular::LAST_ACTION;
- func_status::value_type status = func_status::OK;
+ FuncStatus status;
int i = 0;
for (; tabularFeature[i].action != LyXTabular::LAST_ACTION; ++i) {
break;
}
}
- if (action == LyXTabular::LAST_ACTION)
- return func_status::Unknown;
-
+ if (action == LyXTabular::LAST_ACTION) {
+ status.clear();
+ return status.unknown(true);
+ }
+
string const argument = frontStrip(what.substr(tabularFeature[i].feature.length()));
int sel_row_start;
case LyXTabular::SET_MPWIDTH:
case LyXTabular::SET_SPECIAL_COLUMN:
case LyXTabular::SET_SPECIAL_MULTI:
- status |= func_status::Disabled;
- return status;
+ return status.disabled(true);
case LyXTabular::APPEND_ROW:
case LyXTabular::APPEND_COLUMN:
case LyXTabular::DELETE_COLUMN:
case LyXTabular::SET_ALL_LINES:
case LyXTabular::UNSET_ALL_LINES:
- status |= func_status::OK;
- return status;
+ return status.clear();
case LyXTabular::MULTICOLUMN:
- if (tabular->IsMultiColumn(actcell))
- status |= func_status::ToggleOn;
- else
- status |= func_status::ToggleOff;
+ status.setOnOff(tabular->IsMultiColumn(actcell));
break;
case LyXTabular::M_TOGGLE_LINE_TOP:
flag = false;
case LyXTabular::TOGGLE_LINE_TOP:
- if (tabular->TopLine(actcell, flag))
- status |= func_status::ToggleOn;
- else
- status |= func_status::ToggleOff;
+ status.setOnOff(tabular->TopLine(actcell, flag));
break;
case LyXTabular::M_TOGGLE_LINE_BOTTOM:
flag = false;
case LyXTabular::TOGGLE_LINE_BOTTOM:
- if (tabular->BottomLine(actcell, flag))
- status |= func_status::ToggleOn;
- else
- status |= func_status::ToggleOff;
+ status.setOnOff(tabular->BottomLine(actcell, flag));
break;
case LyXTabular::M_TOGGLE_LINE_LEFT:
flag = false;
case LyXTabular::TOGGLE_LINE_LEFT:
- if (tabular->LeftLine(actcell, flag))
- status |= func_status::ToggleOn;
- else
- status |= func_status::ToggleOff;
+ status.setOnOff(tabular->LeftLine(actcell, flag));
break;
case LyXTabular::M_TOGGLE_LINE_RIGHT:
flag = false;
case LyXTabular::TOGGLE_LINE_RIGHT:
- if (tabular->RightLine(actcell, flag))
- status |= func_status::ToggleOn;
- else
- status |= func_status::ToggleOff;
+ status.setOnOff(tabular->RightLine(actcell, flag));
break;
case LyXTabular::M_ALIGN_LEFT:
flag = false;
case LyXTabular::ALIGN_LEFT:
- if (tabular->GetAlignment(actcell, flag) == LYX_ALIGN_LEFT)
- status |= func_status::ToggleOn;
- else
- status |= func_status::ToggleOff;
+ status.setOnOff(tabular->GetAlignment(actcell, flag) == LYX_ALIGN_LEFT);
break;
case LyXTabular::M_ALIGN_RIGHT:
flag = false;
case LyXTabular::ALIGN_RIGHT:
- if (tabular->GetAlignment(actcell, flag) == LYX_ALIGN_RIGHT)
- status |= func_status::ToggleOn;
- else
- status |= func_status::ToggleOff;
+ status.setOnOff(tabular->GetAlignment(actcell, flag) == LYX_ALIGN_RIGHT);
break;
case LyXTabular::M_ALIGN_CENTER:
flag = false;
case LyXTabular::ALIGN_CENTER:
- if (tabular->GetAlignment(actcell, flag) == LYX_ALIGN_CENTER)
- status |= func_status::ToggleOn;
- else
- status |= func_status::ToggleOff;
+ status.setOnOff(tabular->GetAlignment(actcell, flag) == LYX_ALIGN_CENTER);
break;
case LyXTabular::M_VALIGN_TOP:
flag = false;
case LyXTabular::VALIGN_TOP:
- if (tabular->GetVAlignment(actcell, flag) == LyXTabular::LYX_VALIGN_TOP)
- status |= func_status::ToggleOn;
- else
- status |= func_status::ToggleOff;
+ status.setOnOff(tabular->GetVAlignment(actcell, flag) == LyXTabular::LYX_VALIGN_TOP);
break;
case LyXTabular::M_VALIGN_BOTTOM:
flag = false;
case LyXTabular::VALIGN_BOTTOM:
- if (tabular->GetVAlignment(actcell, flag) == LyXTabular::LYX_VALIGN_BOTTOM)
- status |= func_status::ToggleOn;
- else
- status |= func_status::ToggleOff;
+ status.setOnOff(tabular->GetVAlignment(actcell, flag) == LyXTabular::LYX_VALIGN_BOTTOM);
break;
case LyXTabular::M_VALIGN_CENTER:
flag = false;
case LyXTabular::VALIGN_CENTER:
- if (tabular->GetVAlignment(actcell, flag) == LyXTabular::LYX_VALIGN_CENTER)
- status |= func_status::ToggleOn;
- else
- status |= func_status::ToggleOff;
+ status.setOnOff(tabular->GetVAlignment(actcell, flag) == LyXTabular::LYX_VALIGN_CENTER);
break;
case LyXTabular::SET_LONGTABULAR:
- if (tabular->IsLongTabular())
- status |= func_status::ToggleOn;
- else
- status |= func_status::ToggleOff;
+ status.setOnOff(tabular->IsLongTabular());
break;
case LyXTabular::UNSET_LONGTABULAR:
- if (!tabular->IsLongTabular())
- status |= func_status::ToggleOn;
- else
- status |= func_status::ToggleOff;
+ status.setOnOff(!tabular->IsLongTabular());
break;
case LyXTabular::SET_ROTATE_TABULAR:
- if (tabular->GetRotateTabular())
- status |= func_status::ToggleOn;
- else
- status |= func_status::ToggleOff;
+ status.setOnOff(tabular->GetRotateTabular());
break;
case LyXTabular::UNSET_ROTATE_TABULAR:
- if (!tabular->GetRotateTabular())
- status |= func_status::ToggleOn;
- else
- status |= func_status::ToggleOff;
+ status.setOnOff(!tabular->GetRotateTabular());
break;
case LyXTabular::SET_ROTATE_CELL:
- if (tabular->GetRotateCell(actcell))
- status |= func_status::ToggleOn;
- else
- status |= func_status::ToggleOff;
+ status.setOnOff(tabular->GetRotateCell(actcell));
break;
case LyXTabular::UNSET_ROTATE_CELL:
- if (!tabular->GetRotateCell(actcell))
- status |= func_status::ToggleOn;
- else
- status |= func_status::ToggleOff;
+ status.setOnOff(!tabular->GetRotateCell(actcell));
break;
case LyXTabular::SET_USEBOX:
- if (strToInt(argument) == tabular->GetUsebox(actcell))
- status |= func_status::ToggleOn;
- else
- status |= func_status::ToggleOff;
+ status.setOnOff(strToInt(argument) == tabular->GetUsebox(actcell));
break;
case LyXTabular::SET_LTFIRSTHEAD:
- if (tabular->GetRowOfLTHead(actcell, dummyltt))
- status |= func_status::ToggleOn;
- else
- status |= func_status::ToggleOff;
+ status.setOnOff(tabular->GetRowOfLTHead(sel_row_start, dummyltt));
break;
case LyXTabular::SET_LTHEAD:
- if (tabular->GetRowOfLTHead(actcell, dummyltt))
- status |= func_status::ToggleOn;
- else
- status |= func_status::ToggleOff;
+ status.setOnOff(tabular->GetRowOfLTHead(sel_row_start, dummyltt));
break;
case LyXTabular::SET_LTFOOT:
- if (tabular->GetRowOfLTFoot(actcell, dummyltt))
- status |= func_status::ToggleOn;
- else
- status |= func_status::ToggleOff;
+ status.setOnOff(tabular->GetRowOfLTFoot(sel_row_start, dummyltt));
break;
case LyXTabular::SET_LTLASTFOOT:
- if (tabular->GetRowOfLTFoot(actcell, dummyltt))
- status |= func_status::ToggleOn;
- else
- status |= func_status::ToggleOff;
+ status.setOnOff(tabular->GetRowOfLTFoot(sel_row_start, dummyltt));
break;
case LyXTabular::SET_LTNEWPAGE:
- if (tabular->GetLTNewPage(actcell))
- status |= func_status::ToggleOn;
- else
- status |= func_status::ToggleOff;
+ status.setOnOff(tabular->GetLTNewPage(sel_row_start));
break;
default:
- status = func_status::Disabled;
+ status.clear();
+ status.disabled(true);
break;
}
return status;
}
-std::vector<string> const InsetTabular::getLabelList() const
+vector<string> const InsetTabular::getLabelList() const
{
return tabular->getLabelList();
}
true, true);
ostringstream sstr;
- paste_tabular->Ascii(bv->buffer(), sstr);
+ paste_tabular->ascii(bv->buffer(), sstr,
+ (int)parOwner()->params().depth(), true, '\t');
bv->stuffClipboard(sstr.str().c_str());
return true;
}
}
-bool InsetTabular::isRightToLeft(BufferView *bv )
+bool InsetTabular::isRightToLeft(BufferView * bv)
{
return bv->getParentLanguage(this)->RightToLeft();
}
string const
InsetTabular::selectNextWordToSpellcheck(BufferView * bv, float & value) const
{
+ nodraw(true);
if (the_locking_inset) {
string const str(the_locking_inset->selectNextWordToSpellcheck(bv, value));
- if (!str.empty())
+ if (!str.empty()) {
+ nodraw(false);
return str;
+ }
if (tabular->IsLastCell(actcell)) {
bv->unlockInset(const_cast<InsetTabular *>(this));
+ nodraw(false);
return string();
}
++actcell;
}
- nodraw(true);
// otherwise we have to lock the next inset and ask for it's selecttion
UpdatableInset * inset =
static_cast<UpdatableInset*>(tabular->GetCellInset(actcell));
bool InsetTabular::searchForward(BufferView * bv, string const & str,
- bool const & cs, bool const & mw)
+ bool cs, bool mw)
{
+ nodraw(true);
if (the_locking_inset) {
- if (the_locking_inset->searchForward(bv, str, cs, mw))
+ if (the_locking_inset->searchForward(bv, str, cs, mw)) {
+ nodraw(false);
+ updateLocal(bv, CELL, false);
return true;
+ }
if (tabular->IsLastCell(actcell)) {
+ nodraw(false);
bv->unlockInset(const_cast<InsetTabular *>(this));
return false;
}
UpdatableInset * inset =
static_cast<UpdatableInset*>(tabular->GetCellInset(actcell));
inset->edit(bv);
-#if 0
- bool const res = searchForward(bv, str, cs, mw);
- updateLocal(bv, NONE, false);
- bv->updateInset(const_cast<InsetTabular *>(this), false);
- return res;
-#else
- return searchForward(bv, str, cs, mw);
-#endif
+ bool const ret = searchForward(bv, str, cs, mw);
+ nodraw(false);
+ updateLocal(bv, CELL, false);
+ return ret;
}
bool InsetTabular::searchBackward(BufferView * bv, string const & str,
- bool const & cs, bool const & mw)
+ bool cs, bool mw)
{
+ nodraw(true);
if (the_locking_inset) {
- if (the_locking_inset->searchBackward(bv, str, cs, mw))
+ if (the_locking_inset->searchBackward(bv, str, cs, mw)) {
+ nodraw(false);
+ updateLocal(bv, CELL, false);
return true;
+ }
if (!actcell) { // we are already in the first cell
+ nodraw(false);
bv->unlockInset(const_cast<InsetTabular *>(this));
return false;
}
UpdatableInset * inset =
static_cast<UpdatableInset*>(tabular->GetCellInset(actcell));
inset->edit(bv, false);
-#if 0
- bool const res = searchBackward(bv, str, cs, mw);
- bv->updateInset(const_cast<InsetTabular *>(this), false);
- return res;
-#else
- return searchBackward(bv, str, cs, mw);
-#endif
+ bool const ret = searchBackward(bv, str, cs, mw);
+ nodraw(false);
+ updateLocal(bv, CELL, false);
+ return ret;
}
return the_locking_inset->insetAllowed(code);
return false;
}
+
+
+bool InsetTabular::forceDefaultParagraphs(Inset const * in) const
+{
+ const int cell = tabular->GetCellFromInset(in, actcell);
+
+ 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);
+ // if we're here there is really something strange going on!!!
+ return false;
+}