drawCellSelection(pi.pain, nx, y, i, j, cell);
}
- tabular.getCellInset(cell)->draw(pi, cx, y);
+ tabular.getCellInset(cell).draw(pi, cx, y);
drawCellLines(pi.pain, nx, y, i, cell);
nx += tabular.getWidthOfColumn(cell);
++cell;
if (!inset)
return false;
oldcell = -1;
- if (inset == tabular.getCellInset(actcell)) {
+ if (inset == &tabular.getCellInset(actcell)) {
lyxerr[Debug::INSETTEXT] << "OK" << endl;
- the_locking_inset = tabular.getCellInset(actcell);
+ the_locking_inset = &tabular.getCellInset(actcell);
resetPos(bv);
return true;
} else if (!the_locking_inset) {
int const n = tabular.getNumberOfCells();
int const id = inset->id();
for (int i = 0; i < n; ++i) {
- InsetText * in = tabular.getCellInset(i);
+ InsetText * in = &tabular.getCellInset(i);
if (inset == in) {
actcell = i;
the_locking_inset = in;
}
if (inset_hit && bv->theLockingInset()) {
- if (!bv->lockInset(static_cast<UpdatableInset*>
- (tabular.getCellInset(actcell))))
- {
+ if (!bv->lockInset(&tabular.getCellInset(actcell))) {
lyxerr[Debug::INSETS] << "Cannot lock inset" << endl;
return;
}
// 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)) {
+ the_locking_inset == &tabular.getCellInset(actcell)) {
int maxAsc = 0;
int maxDesc = 0;
for (int j = 0; j < tabular.columns(); ++j) {
MetricsInfo m = mi;
m.base.textwidth =
tabular.column_info[j].p_width.inPixels(mi.base.textwidth);
- tabular.getCellInset(actrow, j)->metrics(m, dim);
+ tabular.getCellInset(actrow, j).metrics(m, dim);
maxAsc = max(dim.asc, maxAsc);
maxDesc = max(dim.des, maxDesc);
}
MetricsInfo m = mi;
m.base.textwidth =
tabular.column_info[j].p_width.inPixels(mi.base.textwidth);
- tabular.getCellInset(cell)->metrics(m, dim);
+ tabular.getCellInset(cell).metrics(m, dim);
maxAsc = max(maxAsc, dim.asc);
maxDesc = max(maxDesc, dim.des);
changed = tabular.setWidthOfCell(cell, dim.wid) || changed;
++actcell;
}
if (lock) {
- bool rtl = tabular.getCellInset(actcell)->paragraphs.begin()->
+ bool rtl = tabular.getCellInset(actcell).paragraphs.begin()->
isRightToLeftPar(bv->buffer()->params);
activateCellInset(bv, 0, 0, mouse_button::none, !rtl);
}
--actcell;
}
if (lock) {
- bool rtl = tabular.getCellInset(actcell)->paragraphs.begin()->
+ bool rtl = tabular.getCellInset(actcell).paragraphs.begin()->
isRightToLeftPar(bv->buffer()->params);
activateCellInset(bv, 0, 0, mouse_button::none, !rtl);
}
int sel_col_start;
int sel_col_end;
getSelection(sel_row_start, sel_row_end, sel_col_start, sel_col_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(i, j)->setFont(bv, font, tall, 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(i, j).setFont(bv, font, tall, true);
+
if (!frozen)
unFreezeUndo();
if (selectall)
// until later (see InsetText::do_resize)
unlockInsetInInset(bv, the_locking_inset);
- int cell;
- for (int i = 0; i < tabular.rows(); ++i) {
- cell = tabular.getCellNumber(i,column);
- tabular.getCellInset(cell)->resizeLyXText(bv);
- }
+ for (int i = 0; i < tabular.rows(); ++i)
+ tabular.getCellInset(i, column).resizeLyXText(bv);
updateLocal(bv, INIT);
}
// until later (see InsetText::do_resize)
unlockInsetInInset(bv, the_locking_inset);
- for (int i = 0; i < tabular.rows(); ++i) {
- tabular.getCellInset(tabular.getCellNumber(i, column))->
- resizeLyXText(bv);
- }
+ for (int i = 0; i < tabular.rows(); ++i)
+ tabular.getCellInset(i, column).resizeLyXText(bv);
+
updateLocal(bv, INIT);
}
}
bool InsetTabular::activateCellInset(BufferView * bv, int x, int y,
mouse_button::state button, bool behind)
{
- UpdatableInset * inset =
- static_cast<UpdatableInset*>(tabular.getCellInset(actcell));
+ UpdatableInset & inset = tabular.getCellInset(actcell);
if (behind) {
#warning metrics?
- x = inset->x() + inset->width();
- y = inset->descent();
+ x = inset.x() + inset.width();
+ y = inset.descent();
}
//inset_x = cursorx_ - top_x + tabular.getBeginningOfTextInCell(actcell);
//inset_y = cursory_;
- inset->localDispatch(FuncRequest(bv, LFUN_INSET_EDIT, x, y, button));
+ inset.localDispatch(FuncRequest(bv, LFUN_INSET_EDIT, x, y, button));
if (!the_locking_inset)
return false;
updateLocal(bv, CELL);
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);
- }
- }
- }
+ 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;
}
void InsetTabular::openLayoutDialog(BufferView * bv) const
{
if (the_locking_inset) {
- InsetTabular * i = static_cast<InsetTabular *>
+ InsetTabular * inset = static_cast<InsetTabular *>
(the_locking_inset->getFirstLockingInsetOfType(TABULAR_CODE));
- if (i) {
- i->openLayoutDialog(bv);
+ if (inset) {
+ inset->openLayoutDialog(bv);
return;
}
}
return false;
for (int r1 = 0, r2 = actrow;
- (r1 < paste_tabular->rows()) && (r2 < tabular.rows());
+ r1 < paste_tabular->rows() && r2 < tabular.rows();
++r1, ++r2) {
- for(int c1 = 0, c2 = actcol;
- (c1 < paste_tabular->columns()) && (c2 < tabular.columns());
+ for (int c1 = 0, c2 = actcol;
+ c1 < paste_tabular->columns() && c2 < tabular.columns();
++c1, ++c2) {
- if (paste_tabular->isPartOfMultiColumn(r1,c1) &&
- tabular.isPartOfMultiColumn(r2,c2))
+ if (paste_tabular->isPartOfMultiColumn(r1, c1) &&
+ tabular.isPartOfMultiColumn(r2, c2))
continue;
- if (paste_tabular->isPartOfMultiColumn(r1,c1)) {
+ if (paste_tabular->isPartOfMultiColumn(r1, c1)) {
--c2;
continue;
}
- if (tabular.isPartOfMultiColumn(r2,c2)) {
+ if (tabular.isPartOfMultiColumn(r2, c2)) {
--c1;
continue;
}
- int const n1 = paste_tabular->getCellNumber(r1, c1);
- int const n2 = tabular.getCellNumber(r2, c2);
- *(tabular.getCellInset(n2)) = *(paste_tabular->getCellInset(n1));
- tabular.getCellInset(n2)->setOwner(this);
- tabular.getCellInset(n2)->deleteLyXText(bv);
- tabular.getCellInset(n2)->markNew();
+ InsetText & inset = tabular.getCellInset(r2, c2);
+ inset = paste_tabular->getCellInset(r1, c1);
+ inset.setOwner(this);
+ inset.deleteLyXText(bv);
+ inset.markNew();
}
}
return true;
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);
- }
- }
+ 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;
}
ParagraphList * InsetTabular::getParagraphs(int i) const
{
return (i < tabular.getNumberOfCells())
- ? tabular.getCellInset(i)->getParagraphs(0)
+ ? tabular.getCellInset(i).getParagraphs(0)
: 0;
}
for (int i = 0; i < tabular.rows(); ++i) {
for (int j = 0; j < tabular.columns(); ++j) {
- Inset * inset = tabular.getCellInset(i, j)->getInsetFromID(id_arg);
+ Inset * inset = tabular.getCellInset(i, j).getInsetFromID(id_arg);
if (inset)
return inset;
}
}
// otherwise we have to lock the next inset and ask for it's selecttion
tabular.getCellInset(actcell)
- ->localDispatch(FuncRequest(bv, LFUN_INSET_EDIT));
+ .localDispatch(FuncRequest(bv, LFUN_INSET_EDIT));
WordLangTuple word(selectNextWordInt(bv, value));
nodraw(false);
if (!word.word().empty())
// otherwise we have to lock the next inset and ask for it's selecttion
++actcell;
tabular.getCellInset(actcell)
- ->localDispatch(FuncRequest(bv, LFUN_INSET_EDIT));
+ .localDispatch(FuncRequest(bv, LFUN_INSET_EDIT));
return selectNextWordInt(bv, value);
}
void InsetTabular::markErased()
{
for (int cell = 0; cell < tabular.getNumberOfCells(); ++cell)
- tabular.getCellInset(cell)->markErased();
+ tabular.getCellInset(cell).markErased();
}
return false;
++actcell;
}
- InsetText * inset = tabular.getCellInset(actcell);
- if (inset->nextChange(bv, length)) {
+ InsetText & inset = tabular.getCellInset(actcell);
+ if (inset.nextChange(bv, length)) {
updateLocal(bv, FULL);
return true;
}
while (!tabular.isLastCell(actcell)) {
++actcell;
- inset = tabular.getCellInset(actcell);
- if (inset->nextChange(bv, length)) {
+ InsetText & inset = tabular.getCellInset(actcell);
+ if (inset.nextChange(bv, length)) {
updateLocal(bv, FULL);
return true;
}
return false;
cell = actcell + 1;
}
- InsetText * inset = tabular.getCellInset(cell);
- if (inset->searchForward(bv, str, cs, mw)) {
+ InsetText & inset = tabular.getCellInset(cell);
+ if (inset.searchForward(bv, str, cs, mw)) {
updateLocal(bv, FULL);
return true;
}
while (!tabular.isLastCell(cell)) {
++cell;
- inset = tabular.getCellInset(cell);
- if (inset->searchForward(bv, str, cs, mw)) {
+ InsetText & inset = tabular.getCellInset(cell);
+ if (inset.searchForward(bv, str, cs, mw)) {
updateLocal(bv, FULL);
return true;
}
while (cell) {
--cell;
- InsetText * inset = tabular.getCellInset(cell);
- if (inset->searchBackward(bv, str, cs, mw)) {
+ InsetText & inset = tabular.getCellInset(cell);
+ if (inset.searchBackward(bv, str, cs, mw)) {
updateLocal(bv, CELL);
return true;
}
case '\t':
// we can only set this if we are not too far right
if (cols < columns) {
- InsetText * ti = loctab->getCellInset(cell);
- LyXFont const font = ti->getLyXText(bv)->
- getFont(bv->buffer(), ti->paragraphs.begin(), 0);
- ti->setText(buf.substr(op, p - op), font);
+ InsetText & inset = loctab->getCellInset(cell);
+ LyXFont const font = inset.getLyXText(bv)->
+ getFont(bv->buffer(), inset.paragraphs.begin(), 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 * ti = loctab->getCellInset(cell);
- LyXFont const font = ti->getLyXText(bv)->
- getFont(bv->buffer(), ti->paragraphs.begin(), 0);
- ti->setText(buf.substr(op, p - op), font);
+ InsetText & inset = tabular.getCellInset(cell);
+ LyXFont const font = inset.getLyXText(bv)->
+ getFont(bv->buffer(), inset.paragraphs.begin(), 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 * ti = loctab->getCellInset(cell);
- LyXFont const font = ti->getLyXText(bv)->
- getFont(bv->buffer(), ti->paragraphs.begin(), 0);
- ti->setText(buf.substr(op, len - op), font);
+ InsetText & inset = loctab->getCellInset(cell);
+ LyXFont const font = inset.getLyXText(bv)->
+ getFont(bv->buffer(), inset.paragraphs.begin(), 0);
+ inset.setText(buf.substr(op, len - op), font);
}
return true;
{
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);
- }
- }
+ for (int i = 0; i < rows; ++i)
+ for (int j = 0; j < columns; ++j)
+ tabular.getCellInset(i, j).addPreview(loader);
}
#include <config.h>
-// temporary until verified (08/08/2001 Jug)
-#define SPECIAL_COLUM_HANDLING 1
-
#include "tabular.h"
+#include "LaTeXFeatures.h"
+#include "Lsstream.h"
+#include "buffer.h"
#include "debug.h"
+#include "gettext.h"
+#include "lyxlex.h"
#include "vspace.h"
-#include "layout.h"
-#include "buffer.h"
-#include "BufferView.h"
-#include "frontends/Painter.h"
-#include "LaTeXFeatures.h"
+
#include "insets/insettabular.h"
#include "insets/insettext.h"
+
+#include "support/LAssert.h"
+#include "support/LIstream.h"
#include "support/lstrings.h"
#include "support/lyxmanip.h"
-#include "support/LAssert.h"
+#include "support/tostr.h"
+
#include "frontends/Alert.h"
-#include "gettext.h"
-#include "Lsstream.h"
-#include "tabular_funcs.h"
-#include "lyxlex.h"
+#include "frontends/Painter.h"
#include <algorithm>
#include <cstdlib>
namespace {
- int const WIDTH_OF_LINE = 5;
+int const WIDTH_OF_LINE = 5;
+
+string const write_attribute(string const & name, string const & t)
+{
+ return t.empty() ? t : " " + name + "=\"" + t + "\"";
+}
+
+
+string const write_attribute(string const & name, bool const & b)
+{
+ // we write only true attribute values so we remove a bit of the
+ // file format bloat for tabulars.
+ return b ? write_attribute(name, tostr(b)) : string();
+}
+
+
+string const write_attribute(string const & name, int const & i)
+{
+ // we write only true attribute values so we remove a bit of the
+ // file format bloat for tabulars.
+ return i ? write_attribute(name, tostr(i)) : string();
+}
+
+
+string const write_attribute(string const & name, LyXLength const & value)
+{
+ // we write only the value if we really have one same reson as above.
+ return value.zero() ? string() : write_attribute(name, value.asString());
+}
+
+
+string const tostr(LyXAlignment const & num)
+{
+ switch (num) {
+ case LYX_ALIGN_NONE:
+ return "none";
+ case LYX_ALIGN_BLOCK:
+ return "block";
+ case LYX_ALIGN_LEFT:
+ return "left";
+ case LYX_ALIGN_CENTER:
+ return "center";
+ case LYX_ALIGN_RIGHT:
+ return "right";
+ case LYX_ALIGN_LAYOUT:
+ return "layout";
+ case LYX_ALIGN_SPECIAL:
+ return "special";
+ }
+ return string();
+}
+
+
+string const tostr(LyXTabular::VAlignment const & num)
+{
+ switch (num) {
+ case LyXTabular::LYX_VALIGN_TOP:
+ return "top";
+ case LyXTabular::LYX_VALIGN_CENTER:
+ return "center";
+ case LyXTabular::LYX_VALIGN_BOTTOM:
+ return "bottom";
+ }
+ return string();
+}
+
+
+string const tostr(LyXTabular::BoxType const & num)
+{
+ switch (num) {
+ case LyXTabular::BOX_NONE:
+ return "none";
+ case LyXTabular::BOX_PARBOX:
+ return "parbox";
+ case LyXTabular::BOX_MINIPAGE:
+ return "minipage";
+ }
+ return string();
+}
+
+// I would have liked a fromstr template a lot better. (Lgb)
+bool string2type(string const str, LyXAlignment & num)
+{
+ if (str == "none")
+ num = LYX_ALIGN_NONE;
+ else if (str == "block")
+ num = LYX_ALIGN_BLOCK;
+ else if (str == "left")
+ num = LYX_ALIGN_LEFT;
+ else if (str == "center")
+ num = LYX_ALIGN_CENTER;
+ else if (str == "right")
+ num = LYX_ALIGN_RIGHT;
+ else
+ return false;
+ return true;
+}
+
+
+bool string2type(string const str, LyXTabular::VAlignment & num)
+{
+ if (str == "top")
+ num = LyXTabular::LYX_VALIGN_TOP;
+ else if (str == "center")
+ num = LyXTabular::LYX_VALIGN_CENTER;
+ else if (str == "bottom")
+ num = LyXTabular::LYX_VALIGN_BOTTOM;
+ else
+ return false;
+ return true;
+}
+
+
+bool string2type(string const str, LyXTabular::BoxType & num)
+{
+ if (str == "none")
+ num = LyXTabular::BOX_NONE;
+ else if (str == "parbox")
+ num = LyXTabular::BOX_PARBOX;
+ else if (str == "minipage")
+ num = LyXTabular::BOX_MINIPAGE;
+ else
+ return false;
+ return true;
+}
+
+
+bool string2type(string const str, bool & num)
+{
+ if (str == "true")
+ num = true;
+ else if (str == "false")
+ num = false;
+ else
+ return false;
+ return true;
+}
+
+
+bool getTokenValue(string const & str, const char * token, string & ret)
+{
+ ret.erase();
+ size_t token_length = strlen(token);
+ string::size_type pos = str.find(token);
+
+ if (pos == string::npos || pos + token_length + 1 >= str.length()
+ || str[pos + token_length] != '=')
+ return false;
+ pos += token_length + 1;
+ char ch = str[pos];
+ if ((ch != '"') && (ch != '\'')) { // only read till next space
+ ret += ch;
+ ch = ' ';
+ }
+ while ((pos < str.length() - 1) && (str[++pos] != ch))
+ ret += str[pos];
+
+ return true;
+}
+
+
+bool getTokenValue(string const & str, const char * token, int & num)
+{
+ string tmp;
+ num = 0;
+ if (!getTokenValue(str, token, tmp))
+ return false;
+ num = strToInt(tmp);
+ return true;
+}
+
+
+bool getTokenValue(string const & str, const char * token, LyXAlignment & num)
+{
+ string tmp;
+ if (!getTokenValue(str, token, tmp))
+ return false;
+ return string2type(tmp, num);
+}
+
+
+bool getTokenValue(string const & str, const char * token,
+ LyXTabular::VAlignment & num)
+{
+ string tmp;
+ if (!getTokenValue(str, token, tmp))
+ return false;
+ return string2type(tmp, num);
+}
+
+
+bool getTokenValue(string const & str, const char * token,
+ LyXTabular::BoxType & num)
+{
+ string tmp;
+ if (!getTokenValue(str, token, tmp))
+ return false;
+ return string2type(tmp, num);
+}
+
+
+bool getTokenValue(string const & str, const char * token, bool & flag)
+{
+ // set the flag always to false as this should be the default for bools
+ // not in the file-format.
+ flag = false;
+ string tmp;
+ if (!getTokenValue(str, token, tmp))
+ return false;
+ return string2type(tmp, flag);
+}
+
+
+bool getTokenValue(string const & str, const char * token, LyXLength & len)
+{
+ // set the lenght to be zero() as default as this it should be if not
+ // in the file format.
+ len = LyXLength();
+ string tmp;
+ if (!getTokenValue(str, token, tmp))
+ return false;
+ return isValidLength(tmp, &len);
+}
+
+
+void l_getline(istream & is, string & str)
+{
+ str.erase();
+ while (str.empty()) {
+ getline(is, str);
+ if (!str.empty() && str[str.length() - 1] == '\r')
+ str.erase(str.length() - 1);
+ }
+}
} // namespace
owner_ = inset;
cur_cell = -1;
init(bp, lt.rows_, lt.columns_, <);
-#if 0
-#ifdef WITH_WARNINGS
-#warning Jürgen, can you make it the other way round. So that copy assignment depends on the copy constructor and not the other way. (Lgb)
-#endif
- operator=(lt);
-#endif
}
}
-LyXTabular & LyXTabular::operator=(LyXTabular const & lt)
-{
-#if 0
-#warning This whole method should look like this: (Lgb)
-
- LyXTabular tmp(lt);
- tmp.swap(*this);
-#else
- // If this and lt is not of the same size we have a serious bug
- // So then it is ok to throw an exception, or for now
- // call abort()
- Assert(rows_ == lt.rows_ && columns_ == lt.columns_);
- cur_cell = -1;
- cell_info = lt.cell_info;
- row_info = lt.row_info;
- column_info = lt.column_info;
- setLongTabular(lt.is_long_tabular);
- rotate = lt.rotate;
-
- Reinit();
-#endif
- return *this;
-}
-
-
-LyXTabular * LyXTabular::clone(BufferParams const & bp,
- InsetTabular * inset)
-{
- LyXTabular * result = new LyXTabular(bp, inset, *this);
-#if 0
- // don't know if this is good but I need to Clone also
- // the text-insets here, this is for the Undo-facility!
- for (int i = 0; i < rows_; ++i) {
- for (int j = 0; j < columns_; ++j) {
- result->cell_info[i][j].inset = cell_info[i][j].inset;
- result->cell_info[i][j].inset.setOwner(inset);
- }
- }
-#endif
- return result;
-}
-
-
// activates all lines and sets all widths to 0
void LyXTabular::init(BufferParams const & bp,
int rows_arg, int columns_arg, LyXTabular const * lt)
void LyXTabular::deleteRow(int row)
{
- if (rows_ == 1) return; // Not allowed to delete last row
+ // Not allowed to delete last row
+ if (rows_ == 1)
+ return;
- row_info.erase(row_info.begin() + row); //&row_info[row]);
- cell_info.erase(cell_info.begin() + row); //&cell_info[row]);
+ row_info.erase(row_info.begin() + row);
+ cell_info.erase(cell_info.begin() + row);
--rows_;
Reinit();
}
{
c_info[i][column + 1].multicolumn = CELL_PART_OF_MULTICOLUMN;
}
- if ((column + 2) >= columns_ ||
+ if (column + 2 >= columns_ ||
c_info[i][column + 2].multicolumn != CELL_PART_OF_MULTICOLUMN)
{
c_info[i][column + 1].multicolumn = LyXTabular::CELL_NORMAL;
void LyXTabular::deleteColumn(int column)
{
- // Similar to deleteRow
- //if (!(columns_ - 1))
- //return;
- if (columns_ == 1) return; // Not allowed to delete last column
+ // Not allowed to delete last column
+ if (columns_ == 1)
+ return;
column_info.erase(column_info.begin() + column);
- for (int i = 0; i < rows_; ++i) {
+ for (int i = 0; i < rows_; ++i)
cell_info[i].erase(cell_info[i].begin() + column);
- }
--columns_;
Reinit();
}
}
}
- for (int i = 0; i < columns_; ++i) {
+ for (int i = 0; i < columns_; ++i)
calculate_width_of_column(i);
- }
+
calculate_width_of_tabular();
set_row_column_number_info();
{
numberofcells = -1;
for (int row = 0; row < rows_; ++row) {
- for (int column = 0; column<columns_; ++column) {
+ for (int column = 0; column < columns_; ++column) {
if (cell_info[row][column].multicolumn
!= LyXTabular::CELL_PART_OF_MULTICOLUMN)
++numberofcells;
continue;
// now set the right line of multicolumns right for oldformat read
if (oldformat &&
- cell_info[row][column].multicolumn==CELL_BEGIN_OF_MULTICOLUMN)
+ cell_info[row][column].multicolumn == CELL_BEGIN_OF_MULTICOLUMN)
{
- int cn=cells_in_multicolumn(cell_info[row][column].cellno);
+ int cn = cells_in_multicolumn(cell_info[row][column].cellno);
cell_info[row][column].right_line =
cell_info[row][column+cn-1].right_line;
}
{
int const row = row_of_cell(cell);
int result = 0;
- for (int i = 0; i < columns_; ++i) {
+ for (int i = 0; i < columns_; ++i)
if (cell_info[row][i].multicolumn != LyXTabular::CELL_PART_OF_MULTICOLUMN)
++result;
- }
return result;
}
// returns 1 if there is a topline, returns 0 if not
bool LyXTabular::topLine(int cell, bool onlycolumn) const
{
- int const row = row_of_cell(cell);
-
if (!onlycolumn && isMultiColumn(cell))
- return cellinfo_of_cell(cell)->top_line;
- return row_info[row].top_line;
+ return cellinfo_of_cell(cell).top_line;
+ return row_info[row_of_cell(cell)].top_line;
}
bool LyXTabular::bottomLine(int cell, bool onlycolumn) const
{
- // no bottom line underneath non-existent cells if you please
- // Isn't that a programming error? Is so this should
- // be an Assert instead. (Lgb)
- if (cell >= numberofcells)
- return false;
-
if (!onlycolumn && isMultiColumn(cell))
- return cellinfo_of_cell(cell)->bottom_line;
+ return cellinfo_of_cell(cell).bottom_line;
return row_info[row_of_cell(cell)].bottom_line;
}
if (!onlycolumn && isMultiColumn(cell) &&
(isFirstCellInRow(cell) || isMultiColumn(cell-1)))
{
-#ifdef SPECIAL_COLUM_HANDLING
- if (cellinfo_of_cell(cell)->align_special.empty())
- return cellinfo_of_cell(cell)->left_line;
- return prefixIs(ltrim(cellinfo_of_cell(cell)->align_special), "|");
-#else
- return cellinfo_of_cell(cell)->left_line;
-#endif
+ if (cellinfo_of_cell(cell).align_special.empty())
+ return cellinfo_of_cell(cell).left_line;
+ return prefixIs(ltrim(cellinfo_of_cell(cell).align_special), "|");
}
-#ifdef SPECIAL_COLUM_HANDLING
if (column_info[column_of_cell(cell)].align_special.empty())
return column_info[column_of_cell(cell)].left_line;
return prefixIs(ltrim(column_info[column_of_cell(cell)].align_special), "|");
-#else
- return column_info[column_of_cell(cell)].left_line;
-#endif
}
if (!onlycolumn && isMultiColumn(cell) &&
(isLastCellInRow(cell) || isMultiColumn(cell+1)))
{
-#ifdef SPECIAL_COLUM_HANDLING
- if (cellinfo_of_cell(cell)->align_special.empty())
- return cellinfo_of_cell(cell)->right_line;
- return suffixIs(rtrim(cellinfo_of_cell(cell)->align_special), "|");
-#else
- return cellinfo_of_cell(cell)->right_line;
-#endif
+ if (cellinfo_of_cell(cell).align_special.empty())
+ return cellinfo_of_cell(cell).right_line;
+ return suffixIs(rtrim(cellinfo_of_cell(cell).align_special), "|");
}
-#ifdef SPECIAL_COLUM_HANDLING
if (column_info[column_of_cell(cell)].align_special.empty())
return column_info[right_column_of_cell(cell)].right_line;
return suffixIs(rtrim(column_info[column_of_cell(cell)].align_special), "|");
-#else
- return column_info[right_column_of_cell(cell)].right_line;
-#endif
}
bool LyXTabular::topAlreadyDrawn(int cell) const
{
int row = row_of_cell(cell);
- if ((row > 0) && !getAdditionalHeight(row)) {
+ if (row > 0 && !getAdditionalHeight(row)) {
int column = column_of_cell(cell);
--row;
while (column
LyXTabular::CELL_PART_OF_MULTICOLUMN));
if (getAdditionalWidth(cell_info[row][column].cellno))
return false;
-#ifdef SPECIAL_COLUM_HANDLING
return rightLine(cell_info[row][column].cellno);
-#else
- return rightLine(cell_info[row][column].cellno, true);
-#endif
}
return false;
}
leftLine(cell_info[row][col+1].cellno)) // column_info[col+1].left_line)
{
return WIDTH_OF_LINE;
- } else {
- return 0;
}
+ return 0;
}
int const column1 = column_of_cell(cell);
int const column2 = right_column_of_cell(cell);
int result = 0;
- for (int i = column1; i <= column2; ++i) {
+ for (int i = column1; i <= column2; ++i)
result += column_info[i].width_of_column;
- }
return result;
}
cell_info[row][i].width_of_cell = 0;
}
// set the width to MAX_WIDTH until width > 0
- int width = (new_width + 2 * WIDTH_OF_LINE);
+ int width = new_width + 2 * WIDTH_OF_LINE;
int i = column1;
for (; i < column2 && width > column_info[i].width_of_column; ++i) {
cell_info[row][i].width_of_cell = column_info[i].width_of_column;
// we only have to update multicolumns which do not have this
// column as their last column!
if (mc == CELL_BEGIN_OF_MULTICOLUMN ||
- ((mc == CELL_PART_OF_MULTICOLUMN) &&
- (nmc == CELL_PART_OF_MULTICOLUMN)))
+ (mc == CELL_PART_OF_MULTICOLUMN &&
+ nmc == CELL_PART_OF_MULTICOLUMN))
{
int const cellno = cell_info[row][column].cellno;
setWidthOfMulticolCell(cellno,
- getWidthOfCell(cellno)-(2 * WIDTH_OF_LINE));
+ getWidthOfCell(cellno) - 2 * WIDTH_OF_LINE);
}
}
}
int width = 0;
int add_width = 0;
-#ifdef SPECIAL_COLUM_HANDLING
if (rightLine(cell_info[row][column1].cellno, true) &&
- (column1 < columns_-1) &&
+ column1 < columns_ - 1 &&
leftLine(cell_info[row][column1+1].cellno, true))
-#else
- if (column_info[column1].right_line && (column1 < columns_-1) &&
- column_info[column1+1].left_line) // additional width
-#endif
{
// additional width
add_width = WIDTH_OF_LINE;
}
- if (getWidthOfCell(cell) == (new_width+2*WIDTH_OF_LINE+add_width)) {
+ if (getWidthOfCell(cell) == new_width + 2 * WIDTH_OF_LINE + add_width) {
return false;
}
if (isMultiColumn(cell, true)) {
}
-bool LyXTabular::setAlignment(int cell, LyXAlignment align, bool onlycolumn)
+void LyXTabular::setAlignment(int cell, LyXAlignment align, bool onlycolumn)
{
if (!isMultiColumn(cell) || onlycolumn)
column_info[column_of_cell(cell)].alignment = align;
if (!onlycolumn)
- cellinfo_of_cell(cell)->alignment = align;
- return true;
+ cellinfo_of_cell(cell).alignment = align;
}
-bool LyXTabular::setVAlignment(int cell, VAlignment align, bool onlycolumn)
+void LyXTabular::setVAlignment(int cell, VAlignment align, bool onlycolumn)
{
if (!isMultiColumn(cell) || onlycolumn)
column_info[column_of_cell(cell)].valignment = align;
if (!onlycolumn)
- cellinfo_of_cell(cell)->valignment = align;
- return true;
+ cellinfo_of_cell(cell).valignment = align;
}
-bool LyXTabular::setColumnPWidth(int cell, LyXLength const & width)
+void LyXTabular::setColumnPWidth(int cell, LyXLength const & width)
{
- bool flag = !width.zero();
int const j = column_of_cell(cell);
column_info[j].p_width = width;
- // This should not ne necessary anymore
- // if (flag) // do this only if there is a width
- // setAlignment(cell, LYX_ALIGN_LEFT);
for (int i = 0; i < rows_; ++i) {
- int c = getCellNumber(i, j);
- flag = !getPWidth(c).zero(); // because of multicolumns!
- getCellInset(c)->setAutoBreakRows(flag);
+ int const cell = getCellNumber(i, j);
+ // because of multicolumns
+ getCellInset(cell).setAutoBreakRows(!getPWidth(cell).zero());
}
- return true;
}
{
bool const flag = !width.zero();
- cellinfo_of_cell(cell)->p_width = width;
+ cellinfo_of_cell(cell).p_width = width;
if (isMultiColumn(cell)) {
- getCellInset(cell)->setAutoBreakRows(flag);
+ getCellInset(cell).setAutoBreakRows(flag);
return true;
}
return false;
}
-bool LyXTabular::setAlignSpecial(int cell, string const & special,
+void LyXTabular::setAlignSpecial(int cell, string const & special,
LyXTabular::Feature what)
{
if (what == SET_SPECIAL_MULTI)
- cellinfo_of_cell(cell)->align_special = special;
+ cellinfo_of_cell(cell).align_special = special;
else
column_info[column_of_cell(cell)].align_special = special;
- return true;
}
-bool LyXTabular::setAllLines(int cell, bool line)
+void LyXTabular::setAllLines(int cell, bool line)
{
setTopLine(cell, line);
setBottomLine(cell, line);
setRightLine(cell, line);
setLeftLine(cell, line);
- return true;
}
-bool LyXTabular::setTopLine(int cell, bool line, bool onlycolumn)
+void LyXTabular::setTopLine(int cell, bool line, bool onlycolumn)
{
int const row = row_of_cell(cell);
-
if (onlycolumn || !isMultiColumn(cell))
row_info[row].top_line = line;
else
- cellinfo_of_cell(cell)->top_line = line;
- return true;
+ cellinfo_of_cell(cell).top_line = line;
}
-bool LyXTabular::setBottomLine(int cell, bool line, bool onlycolumn)
+void LyXTabular::setBottomLine(int cell, bool line, bool onlycolumn)
{
if (onlycolumn || !isMultiColumn(cell))
row_info[row_of_cell(cell)].bottom_line = line;
else
- cellinfo_of_cell(cell)->bottom_line = line;
- return true;
+ cellinfo_of_cell(cell).bottom_line = line;
}
-bool LyXTabular::setLeftLine(int cell, bool line, bool onlycolumn)
+void LyXTabular::setLeftLine(int cell, bool line, bool onlycolumn)
{
if (onlycolumn || !isMultiColumn(cell))
column_info[column_of_cell(cell)].left_line = line;
else
- cellinfo_of_cell(cell)->left_line = line;
- return true;
+ cellinfo_of_cell(cell).left_line = line;
}
-bool LyXTabular::setRightLine(int cell, bool line, bool onlycolumn)
+void LyXTabular::setRightLine(int cell, bool line, bool onlycolumn)
{
if (onlycolumn || !isMultiColumn(cell))
column_info[right_column_of_cell(cell)].right_line = line;
else
- cellinfo_of_cell(cell)->right_line = line;
- return true;
+ cellinfo_of_cell(cell).right_line = line;
}
LyXAlignment LyXTabular::getAlignment(int cell, bool onlycolumn) const
{
if (!onlycolumn && isMultiColumn(cell))
- return cellinfo_of_cell(cell)->alignment;
- else
- return column_info[column_of_cell(cell)].alignment;
+ return cellinfo_of_cell(cell).alignment;
+ return column_info[column_of_cell(cell)].alignment;
}
LyXTabular::getVAlignment(int cell, bool onlycolumn) const
{
if (!onlycolumn && isMultiColumn(cell))
- return cellinfo_of_cell(cell)->valignment;
- else
- return column_info[column_of_cell(cell)].valignment;
+ return cellinfo_of_cell(cell).valignment;
+ return column_info[column_of_cell(cell)].valignment;
}
LyXLength const LyXTabular::getPWidth(int cell) const
{
if (isMultiColumn(cell))
- return cellinfo_of_cell(cell)->p_width;
+ return cellinfo_of_cell(cell).p_width;
return column_info[column_of_cell(cell)].p_width;
}
LyXLength const LyXTabular::getMColumnPWidth(int cell) const
{
if (isMultiColumn(cell))
- return cellinfo_of_cell(cell)->p_width;
+ return cellinfo_of_cell(cell).p_width;
return LyXLength();
}
string const LyXTabular::getAlignSpecial(int cell, int what) const
{
if (what == SET_SPECIAL_MULTI)
- return cellinfo_of_cell(cell)->align_special;
+ return cellinfo_of_cell(cell).align_special;
return column_info[column_of_cell(cell)].align_special;
}
int const column1 = column_of_cell(cell);
int const column2 = right_column_of_cell(cell);
int result = 0;
- for (int i = column1; i <= column2; ++i) {
+ for (int i = column1; i <= column2; ++i)
result += cell_info[row][i].width_of_cell;
- }
return result;
}
return cell_info[row][0].cellno;
}
+
bool LyXTabular::isLastCellInRow(int cell) const
{
- return (right_column_of_cell(cell) == (columns_ - 1));
+ return right_column_of_cell(cell) == columns_ - 1;
}
}
-bool LyXTabular::calculate_width_of_column(int column)
+void LyXTabular::calculate_width_of_column(int column)
{
- int const old_column_width = column_info[column].width_of_column;
int maximum = 0;
-
- for (int i = 0; i < rows_; ++i) {
+ for (int i = 0; i < rows_; ++i)
maximum = max(cell_info[i][column].width_of_cell, maximum);
- }
column_info[column].width_of_column = maximum;
- return (column_info[column].width_of_column != old_column_width);
}
//
// Calculate the columns regarding ONLY the normal cells and if this
// column is inside a multicolumn cell then use it only if its the last
-// column of this multicolumn cell as this gives an added with to the
+// column of this multicolumn cell as this gives an added width to the
// column, all the rest should be adapted!
//
bool LyXTabular::calculate_width_of_column_NMC(int column)
for (int i = 0; i < rows_; ++i) {
int cell = getCellNumber(i, column);
bool ismulti = isMultiColumn(cell, true);
- if ((!ismulti || (column == right_column_of_cell(cell))) &&
- (cell_info[i][column].width_of_cell > max))
+ if ((!ismulti || column == right_column_of_cell(cell)) &&
+ cell_info[i][column].width_of_cell > max)
{
max = cell_info[i][column].width_of_cell;
}
}
column_info[column].width_of_column = max;
- return (column_info[column].width_of_column != old_column_width);
+ return column_info[column].width_of_column != old_column_width;
}
void LyXTabular::calculate_width_of_tabular()
{
width_of_tabular = 0;
- for (int i = 0; i < columns_; ++i) {
+ for (int i = 0; i < columns_; ++i)
width_of_tabular += column_info[i].width_of_column;
- }
}
{
if (cell >= numberofcells)
return rows_ - 1;
- else if (cell < 0)
+ if (cell < 0)
return 0;
return rowofcell[cell];
}
{
if (cell >= numberofcells)
return columns_ - 1;
- else if (cell < 0)
+ if (cell < 0)
return 0;
return columnofcell[cell];
}
{
int const row = row_of_cell(cell);
int column = column_of_cell(cell);
- while (column < (columns_ - 1) &&
+ while (column < columns_ - 1 &&
cell_info[row][column + 1].multicolumn == LyXTabular::CELL_PART_OF_MULTICOLUMN)
++column;
return column;
void LyXTabular::setHeaderFooterRows(int hr, int fhr, int fr, int lfr)
{
// set header info
- while(hr > 0) {
+ while (hr > 0) {
row_info[--hr].endhead = true;
}
// set firstheader info
- if (fhr && (fhr < rows_)) {
+ if (fhr && fhr < rows_) {
if (row_info[fhr].endhead) {
- while(fhr > 0) {
+ while (fhr > 0) {
row_info[--fhr].endfirsthead = true;
row_info[fhr].endhead = false;
}
} else if (row_info[fhr - 1].endhead) {
endfirsthead.empty = true;
} else {
- while((fhr > 0) && !row_info[--fhr].endhead) {
+ while (fhr > 0 && !row_info[--fhr].endhead) {
row_info[fhr].endfirsthead = true;
}
}
}
// set footer info
- if (fr && (fr < rows_)) {
+ if (fr && fr < rows_) {
if (row_info[fr].endhead && row_info[fr-1].endhead) {
- while((fr > 0) && !row_info[--fr].endhead) {
+ while (fr > 0 && !row_info[--fr].endhead) {
row_info[fr].endfoot = true;
row_info[fr].endhead = false;
}
} else if (row_info[fr].endfirsthead && row_info[fr-1].endfirsthead) {
- while((fr > 0) && !row_info[--fr].endfirsthead) {
+ while (fr > 0 && !row_info[--fr].endfirsthead) {
row_info[fr].endfoot = true;
row_info[fr].endfirsthead = false;
}
} else if (!row_info[fr - 1].endhead && !row_info[fr - 1].endfirsthead) {
- while((fr > 0) && !row_info[--fr].endhead &&
+ while (fr > 0 && !row_info[--fr].endhead &&
!row_info[fr].endfirsthead)
{
row_info[fr].endfoot = true;
}
}
// set lastfooter info
- if (lfr && (lfr < rows_)) {
+ if (lfr && lfr < rows_) {
if (row_info[lfr].endhead && row_info[lfr - 1].endhead) {
- while((lfr > 0) && !row_info[--lfr].endhead) {
+ while (lfr > 0 && !row_info[--lfr].endhead) {
row_info[lfr].endlastfoot = true;
row_info[lfr].endhead = false;
}
} else if (row_info[lfr].endfirsthead &&
row_info[lfr - 1].endfirsthead)
{
- while((lfr > 0) && !row_info[--lfr].endfirsthead) {
+ while (lfr > 0 && !row_info[--lfr].endfirsthead) {
row_info[lfr].endlastfoot = true;
row_info[lfr].endfirsthead = false;
}
} else if (row_info[lfr].endfoot
&& row_info[lfr - 1].endfoot) {
- while((lfr > 0) && !row_info[--lfr].endfoot) {
+ while (lfr > 0 && !row_info[--lfr].endfoot) {
row_info[lfr].endlastfoot = true;
row_info[lfr].endfoot = false;
}
&& !row_info[fr - 1].endfirsthead &&
!row_info[fr - 1].endfoot)
{
- while((lfr > 0) &&
+ while (lfr > 0 &&
!row_info[--lfr].endhead && !row_info[lfr].endfirsthead &&
!row_info[lfr].endfoot)
{
bool LyXTabular::isMultiColumn(int cell, bool real) const
{
return (!real || column_of_cell(cell) != right_column_of_cell(cell)) &&
- (cellinfo_of_cell(cell)->multicolumn != LyXTabular::CELL_NORMAL);
+ cellinfo_of_cell(cell).multicolumn != LyXTabular::CELL_NORMAL;
}
-LyXTabular::cellstruct * LyXTabular::cellinfo_of_cell(int cell) const
+LyXTabular::cellstruct & LyXTabular::cellinfo_of_cell(int cell) const
{
- int const row = row_of_cell(cell);
- int const column = column_of_cell(cell);
- return &cell_info[row][column];
+ return cell_info[row_of_cell(cell)][column_of_cell(cell)];
}
void LyXTabular::setMultiColumn(Buffer * buffer, int cell, int number)
{
- cellinfo_of_cell(cell)->multicolumn = CELL_BEGIN_OF_MULTICOLUMN;
- cellinfo_of_cell(cell)->alignment = column_info[column_of_cell(cell)].alignment;
- cellinfo_of_cell(cell)->top_line = row_info[row_of_cell(cell)].top_line;
- cellinfo_of_cell(cell)->bottom_line = row_info[row_of_cell(cell)].bottom_line;
- cellinfo_of_cell(cell)->right_line = column_info[column_of_cell(cell+number-1)].right_line;
-#if 1
+ cellstruct & cs = cellinfo_of_cell(cell);
+ cs.multicolumn = CELL_BEGIN_OF_MULTICOLUMN;
+ cs.alignment = column_info[column_of_cell(cell)].alignment;
+ cs.top_line = row_info[row_of_cell(cell)].top_line;
+ cs.bottom_line = row_info[row_of_cell(cell)].bottom_line;
+ cs.right_line = column_info[column_of_cell(cell+number-1)].right_line;
for (int i = 1; i < number; ++i) {
- cellinfo_of_cell(cell + i)->multicolumn = CELL_PART_OF_MULTICOLUMN;
- cellinfo_of_cell(cell)->inset.appendParagraphs(buffer,
- cellinfo_of_cell(cell+i)->inset.paragraphs);
- cellinfo_of_cell(cell + i)->inset.clear(false);
- }
-#else
- for (number--; number > 0; --number) {
- cellinfo_of_cell(cell + number)->multicolumn = CELL_PART_OF_MULTICOLUMN;
+ cellstruct & cs1 = cellinfo_of_cell(cell + i);
+ cs1.multicolumn = CELL_PART_OF_MULTICOLUMN;
+ cs.inset.appendParagraphs(buffer, cs1.inset.paragraphs);
+ cs1.inset.clear(false);
}
-#endif
set_row_column_number_info();
}
int column = column_of_cell(cell);
int result = 1;
++column;
- while ((column < columns_) &&
+ while (column < columns_ &&
cell_info[row][column].multicolumn == CELL_PART_OF_MULTICOLUMN)
{
++result;
if (cell_info[row][column].multicolumn == CELL_BEGIN_OF_MULTICOLUMN) {
cell_info[row][column].multicolumn = CELL_NORMAL;
++column;
- while ((column < columns_) &&
- (cell_info[row][column].multicolumn ==CELL_PART_OF_MULTICOLUMN))
+ while (column < columns_ &&
+ cell_info[row][column].multicolumn == CELL_PART_OF_MULTICOLUMN)
{
cell_info[row][column].multicolumn = CELL_NORMAL;
++column;
void LyXTabular::setRotateCell(int cell, bool flag)
{
- cellinfo_of_cell(cell)->rotate = flag;
+ cellinfo_of_cell(cell).rotate = flag;
}
bool LyXTabular::getRotateCell(int cell) const
{
- return cellinfo_of_cell(cell)->rotate;
+ return cellinfo_of_cell(cell).rotate;
}
{
if (rotate)
return true;
- for (int i = 0; i < rows_; ++i) {
- for (int j = 0; j < columns_; ++j) {
+ for (int i = 0; i < rows_; ++i)
+ for (int j = 0; j < columns_; ++j)
if (cell_info[i][j].rotate)
return true;
- }
- }
return false;
}
int LyXTabular::getCellNumber(int row, int column) const
{
-#if 0
- if (column >= columns_)
- column = columns_ - 1;
- else if (column < 0)
- column = 0;
- if (row >= rows_)
- row = rows_ - 1;
- else if (row < 0)
- row = 0;
-#else
Assert(column >= 0 || column < columns_ || row >= 0 || row < rows_);
-#endif
return cell_info[row][column].cellno;
}
void LyXTabular::setUsebox(int cell, BoxType type)
{
- cellinfo_of_cell(cell)->usebox = type;
+ cellinfo_of_cell(cell).usebox = type;
}
LyXTabular::BoxType LyXTabular::getUsebox(int cell) const
{
if (column_info[column_of_cell(cell)].p_width.zero() &&
- !(isMultiColumn(cell) && !cellinfo_of_cell(cell)->p_width.zero()))
+ !(isMultiColumn(cell) && !cellinfo_of_cell(cell).p_width.zero()))
return BOX_NONE;
- if (cellinfo_of_cell(cell)->usebox > 1)
- return cellinfo_of_cell(cell)->usebox;
+ if (cellinfo_of_cell(cell).usebox > 1)
+ return cellinfo_of_cell(cell).usebox;
return useParbox(cell);
}
bool LyXTabular::haveLTHead() const
{
- for (int i = 0; i < rows_; ++i) {
+ for (int i = 0; i < rows_; ++i)
if (row_info[i].endhead)
return true;
- }
return false;
}
{
if (endfirsthead.empty)
return false;
- for (int i = 0; i < rows_; ++i) {
+ for (int i = 0; i < rows_; ++i)
if (row_info[i].endfirsthead)
return true;
- }
return false;
}
bool LyXTabular::haveLTFoot() const
{
- for (int i = 0; i < rows_; ++i) {
+ for (int i = 0; i < rows_; ++i)
if (row_info[i].endfoot)
return true;
- }
return false;
}
{
if (endlastfoot.empty)
return false;
- for (int i = 0; i < rows_; ++i) {
+ for (int i = 0; i < rows_; ++i)
if (row_info[i].endlastfoot)
return true;
- }
return false;
}
int LyXTabular::getHeightOfTabular() const
{
int height = 0;
-
for (int row = 0; row < rows_; ++row)
height += getAscentOfRow(row) + getDescentOfRow(row) +
getAdditionalHeight(row);
bool LyXTabular::isPartOfMultiColumn(int row, int column) const
{
- if ((row >= rows_) || (column >= columns_))
+ if (row >= rows_ || column >= columns_)
return false;
- return (cell_info[row][column].multicolumn == CELL_PART_OF_MULTICOLUMN);
+ return cell_info[row][column].multicolumn == CELL_PART_OF_MULTICOLUMN;
}
int LyXTabular::TeXTopHLine(ostream & os, int row) const
{
- if ((row < 0) || (row >= rows_))
+ if (row < 0 || row >= rows_)
return 0;
int const fcell = getFirstCellInRow(row);
if (topLine(i))
++tmp;
}
- if (tmp == (n - fcell)) {
+ if (tmp == n - fcell) {
os << "\\hline ";
} else if (tmp) {
for (int i = fcell; i < n; ++i) {
int LyXTabular::TeXBottomHLine(ostream & os, int row) const
{
- if ((row < 0) || (row >= rows_))
+ if (row < 0 || row >= rows_)
return 0;
int const fcell = getFirstCellInRow(row);
if (bottomLine(i))
++tmp;
}
- if (tmp == (n - fcell)) {
+ if (tmp == n - fcell) {
os << "\\hline";
} else if (tmp) {
for (int i = fcell; i < n; ++i) {
}
if (isMultiColumn(cell)) {
os << "\\multicolumn{" << cells_in_multicolumn(cell) << "}{";
- if (!cellinfo_of_cell(cell)->align_special.empty()) {
- os << cellinfo_of_cell(cell)->align_special << "}{";
+ if (!cellinfo_of_cell(cell).align_special.empty()) {
+ os << cellinfo_of_cell(cell).align_special << "}{";
} else {
if (leftLine(cell) &&
(isFirstCellInRow(cell) ||
- (!isMultiColumn(cell-1) && !leftLine(cell, true) &&
- !rightLine(cell-1, true))))
+ (!isMultiColumn(cell - 1) && !leftLine(cell, true) &&
+ !rightLine(cell - 1, true))))
{
os << '|';
}
ret += TeXTopHLine(os, i);
for (int j = 0; j < columns_; ++j) {
- if (isPartOfMultiColumn(i,j))
+ if (isPartOfMultiColumn(i, j))
continue;
ret += TeXCellPreamble(os, cell);
- InsetText * inset = getCellInset(cell);
+ InsetText & inset = getCellInset(cell);
- bool rtl = inset->paragraphs.begin()->isRightToLeftPar(buf->params) &&
- !inset->paragraphs.begin()->empty() && getPWidth(cell).zero();
+ bool rtl = inset.paragraphs.begin()->isRightToLeftPar(buf->params) &&
+ !inset.paragraphs.begin()->empty() && getPWidth(cell).zero();
if (rtl)
os << "\\R{";
- ret += inset->latex(buf, os, runparams);
+ ret += inset.latex(buf, os, runparams);
if (rtl)
os << '}';
}
os << '>';
- ret += getCellInset(cell)->docbook(buf, os, true);
+ ret += getCellInset(cell).docbook(buf, os, true);
os << "</entry>\n";
++cell;
}
bool onlydata) const
{
ostringstream sstr;
- int ret = getCellInset(cell)->ascii(buf, sstr, 0);
+ int ret = getCellInset(cell).ascii(buf, sstr, 0);
if (onlydata) {
os << sstr.str();
if (isMultiColumn(cell, true))
continue;
ostringstream sstr;
- getCellInset(cell)->ascii(buf, sstr, 0);
+ getCellInset(cell).ascii(buf, sstr, 0);
if (clen[j] < sstr.str().length())
clen[j] = sstr.str().length();
}
if (!isMultiColumn(cell, true) || isPartOfMultiColumn(i, j))
continue;
ostringstream sstr;
- getCellInset(cell)->ascii(buf, sstr, 0);
+ getCellInset(cell).ascii(buf, sstr, 0);
int len = int(sstr.str().length());
int const n = cells_in_multicolumn(cell);
- for (int k = j; (len > 0) && (k < (j + n - 1)); ++k)
+ for (int k = j; len > 0 && k < j + n - 1; ++k)
len -= clen[k];
if (len > int(clen[j + n - 1]))
clen[j + n - 1] = len;
}
int cell = 0;
for (int i = 0; i < rows_; ++i) {
- if (!onlydata) {
- if (asciiTopHLine(os, i, clen)) {
- for (int j = 0; j < depth; ++j)
- os << " ";
- }
- }
+ if (!onlydata && asciiTopHLine(os, i, clen))
+ for (int j = 0; j < depth; ++j)
+ os << " ";
for (int j = 0; j < columns_; ++j) {
- if (isPartOfMultiColumn(i,j))
+ if (isPartOfMultiColumn(i, j))
continue;
if (onlydata && j > 0)
os << delim;
if (!onlydata) {
for (int j = 0; j < depth; ++j)
os << " ";
- if (asciiBottomHLine(os, i, clen)) {
+ if (asciiBottomHLine(os, i, clen))
for (int j = 0; j < depth; ++j)
os << " ";
- }
}
}
return ret;
}
-InsetText * LyXTabular::getCellInset(int cell) const
+InsetText & LyXTabular::getCellInset(int cell) const
{
cur_cell = cell;
- return & cell_info[row_of_cell(cell)][column_of_cell(cell)].inset;
+ return cell_info[row_of_cell(cell)][column_of_cell(cell)].inset;
}
-InsetText * LyXTabular::getCellInset(int row, int column) const
+InsetText & LyXTabular::getCellInset(int row, int column) const
{
cur_cell = getCellNumber(row, column);
- return & cell_info[row][column].inset;
+ return cell_info[row][column].inset;
}
{
// is this inset part of the tabular?
if (!inset || inset->owner() != owner_) {
- lyxerr[Debug::INSETTEXT]
- << "this is not a cell of the tabular!" << endl;
- return -1;
+ lyxerr << "this is not a cell of the tabular!" << endl;
+ Assert(0);
}
const int save_cur_cell = cur_cell;
int cell = cur_cell;
- if (getCellInset(cell) != inset) {
+ if (&getCellInset(cell) != inset) {
cell = maybe_cell;
- if (cell == -1 || getCellInset(cell) != inset) {
+ if (cell == -1 || &getCellInset(cell) != inset) {
cell = -1;
}
}
if (cell == -1) {
for (cell = getNumberOfCells(); cell >= 0; --cell) {
- if (getCellInset(cell) == inset)
+ if (&getCellInset(cell) == inset)
break;
}
lyxerr[Debug::INSETTEXT]
if (getVAlignment(cell) != LYX_VALIGN_TOP ||
(!getPWidth(cell).zero() && !isMultiColumn(cell)))
features.require("array");
- getCellInset(cell)->validate(features);
+ getCellInset(cell).validate(features);
}
}
{
for (int i = 0; i < rows_; ++i)
for (int j = 0; j < columns_; ++j)
- getCellInset(i, j)->getLabelList(list);
+ getCellInset(i, j).getLabelList(list);
}
LyXTabular::BoxType LyXTabular::useParbox(int cell) const
{
- ParagraphList const & parlist = getCellInset(cell)->paragraphs;
+ ParagraphList const & parlist = getCellInset(cell).paragraphs;
ParagraphList::const_iterator cit = parlist.begin();
ParagraphList::const_iterator end = parlist.end();
- for (; cit != end; ++cit) {
- for (int i = 0; i < cit->size(); ++i) {
+ for (; cit != end; ++cit)
+ for (int i = 0; i < cit->size(); ++i)
if (cit->isNewline(i))
return BOX_PARBOX;
- }
- }
+
return BOX_NONE;
}
projects / features.git / commitdiff