* This file is part of LyX, the document processor.
* Licence details can be found in the file COPYING.
*
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
* \author Matthias Ettrich
- * \author José Matos
+ * \author José Matos
* \author Jean-Marc Lasgouttes
* \author Angus Leeming
* \author John Levon
- * \author André Pönitz
- * \author Jürgen Vigna
+ * \author André Pönitz
+ * \author Jürgen Vigna
*
* Full author contact details are available in file CREDITS.
*/
for (row_type r = 0; r < nrows; ++r) {
cell_info[r].insert(cell_info[r].begin() + c + 1,
CellData(buffer()));
+#if 0
+// FIXME: This code does not work. It deletes the cell's content and
+// it triggers an assertion if the cursor is at pos > 0.
if (cell_info[r][c].multicolumn == CELL_BEGIN_OF_MULTICOLUMN)
cell_info[r][c + 1].multicolumn = CELL_PART_OF_MULTICOLUMN;
else
cell_info[r][c + 1].multicolumn = cell_info[r][c].multicolumn;
+#endif
}
updateIndexes();
for (row_type r = 0; r < nrows; ++r) {
rowofcell[i] = row;
columnofcell[i] = column;
setFixedWidth(row, column);
+ updateContentAlignment(row, column);
++i;
}
}
column_info[cellColumn(cell)].alignment = align;
if (!onlycolumn)
cellInfo(cell).alignment = align;
+ cellInset(cell).get()->setContentAlignment(align);
}
bool Tabular::setFixedWidth(row_type r, col_type c)
{
- if (!column_info[c].p_width.zero() ||
- (cell_info[r][c].multicolumn != CELL_NORMAL &&
- !cell_info[r][c].p_width.zero())) {
+ bool const multicol = cell_info[r][c].multicolumn != CELL_NORMAL;
+ if ((!column_info[c].p_width.zero() && !multicol)
+ || (multicol && !cell_info[r][c].p_width.zero())) {
cell_info[r][c].inset->toggleFixedWidth(true);
return true;
}
}
+void Tabular::updateContentAlignment(row_type r, col_type c)
+{
+ cell_info[r][c].inset->setContentAlignment(
+ getAlignment(cellIndex(r, c)));
+}
+
+
bool Tabular::setMColumnPWidth(Cursor & cur, idx_type cell,
Length const & width)
{
}
-int Tabular::TeXTopHLine(odocstream & os, row_type row) const
+int Tabular::TeXTopHLine(odocstream & os, row_type row, string const lang) const
{
- // FIXME: assert or return 0 as in TeXBottomHLine()?
- LASSERT(row != npos, /**/);
- LASSERT(row < row_info.size(), /**/);
+ // we only output complete row lines and the 1st row here, the rest
+ // is done in Tabular::TeXBottomHLine(...)
- idx_type const fcell = getFirstCellInRow(row);
- idx_type const n = numberOfCellsInRow(fcell) + fcell;
- idx_type tmp = 0;
-
- for (idx_type i = fcell; i < n; ++i) {
- if (topLine(i))
- ++tmp;
+ // get for each column the topline (if any)
+ col_type const ncols = column_info.size();
+ vector<bool> topline;
+ col_type nset = 0;
+ for (col_type c = 0; c < ncols; ++c) {
+ topline.push_back(topLine(cellIndex(row, c)));
+ if (topline[c])
+ ++nset;
}
- if (use_booktabs && row == 0) {
- if (topLine(fcell))
- os << "\\toprule ";
- } else if (tmp == n - fcell) {
- os << (use_booktabs ? "\\midrule " : "\\hline ");
- } else if (tmp) {
- for (idx_type i = fcell; i < n; ++i) {
- if (topLine(i)) {
- os << (use_booktabs ? "\\cmidrule{" : "\\cline{")
- << cellColumn(i) + 1
- << '-'
- << cellRightColumn(i) + 1
- << "} ";
+
+ // do nothing if empty first row, or incomplete row line after
+ if ((row == 0 && nset == 0) || (row > 0 && nset != ncols))
+ return 0;
+
+ // only output complete row lines and the 1st row's clines
+ if (nset == ncols) {
+ if (use_booktabs) {
+ os << (row == 0 ? "\\toprule " : "\\midrule ");
+ } else {
+ os << "\\hline ";
+ }
+ } else if (row == 0) {
+ for (col_type c = 0; c < ncols; ++c) {
+ if (topline[c]) {
+ //babel makes the "-" character an active one, so we have to suppress this here
+ //see http://groups.google.com/group/comp.text.tex/browse_thread/thread/af769424a4a0f289#
+ if (lang == "slovak" || lang == "czech")
+ os << (use_booktabs ? "\\expandafter\\cmidrule\\expandafter{\\expandafter" :
+ "\\expandafter\\cline\\expandafter{\\expandafter")
+ << c + 1 << "\\string-";
+ else
+ os << (use_booktabs ? "\\cmidrule{" : "\\cline{") << c + 1 << '-';
+ // get to last column of line span
+ while (c < ncols && topline[c])
+ ++c;
+ os << c << "} ";
}
}
- } else {
- return 0;
}
os << "\n";
return 1;
}
-int Tabular::TeXBottomHLine(odocstream & os, row_type row) const
+int Tabular::TeXBottomHLine(odocstream & os, row_type row, string const lang) const
{
- // FIXME: return 0 or assert as in TeXTopHLine()?
- if (row == npos || row >= row_info.size())
- return 0;
+ // we output bottomlines of row r and the toplines of row r+1
+ // if the latter do not span the whole tabular
- idx_type const fcell = getFirstCellInRow(row);
- idx_type const n = numberOfCellsInRow(fcell) + fcell;
- idx_type tmp = 0;
+ // get the bottomlines of row r, and toplines in next row
+ bool lastrow = row == row_info.size() - 1;
+ col_type const ncols = column_info.size();
+ vector<bool> bottomline, topline;
+ bool nextrowset = true;
+ for (col_type c = 0; c < ncols; ++c) {
+ bottomline.push_back(bottomLine(cellIndex(row, c)));
+ topline.push_back(!lastrow && topLine(cellIndex(row + 1, c)));
+ nextrowset &= topline[c];
+ }
- for (idx_type i = fcell; i < n; ++i) {
- if (bottomLine(i))
- ++tmp;
+ // combine this row's bottom lines and next row's toplines if necessary
+ col_type nset = 0;
+ for (col_type c = 0; c < ncols; ++c) {
+ if (!nextrowset)
+ bottomline[c] = bottomline[c] || topline[c];
+ if (bottomline[c])
+ ++nset;
}
- if (use_booktabs && row == row_info.size() - 1) {
- if (bottomLine(fcell))
- os << "\\bottomrule";
- } else if (tmp == n - fcell) {
- os << (use_booktabs ? "\\midrule" : "\\hline");
- } else if (tmp) {
- for (idx_type i = fcell; i < n; ++i) {
- if (bottomLine(i)) {
- os << (use_booktabs ? "\\cmidrule{" : "\\cline{")
- << cellColumn(i) + 1
- << '-'
- << cellRightColumn(i) + 1
- << "} ";
+
+ // do nothing if empty, OR incomplete row line with a topline in next row
+ if (nset == 0 || (nextrowset && nset != ncols))
+ return 0;
+
+ if (nset == ncols) {
+ if (use_booktabs)
+ os << (lastrow ? "\\bottomrule" : "\\midrule");
+ else
+ os << "\\hline";
+ } else {
+ for (col_type c = 0; c < ncols; ++c) {
+ if (bottomline[c]) {
+ //babel makes the "-" character an active one, so we have to suppress this here
+ //see http://groups.google.com/group/comp.text.tex/browse_thread/thread/af769424a4a0f289#
+ if (lang == "slovak" || lang == "czech")
+ os << (use_booktabs ? "\\expandafter\\cmidrule\\expandafter{\\expandafter" :
+ "\\expandafter\\cline\\expandafter{\\expandafter")
+ << c + 1 << "\\string-";
+ else
+ os << (use_booktabs ? "\\cmidrule{" : "\\cline{") << c + 1 << '-';
+ // get to last column of line span
+ while (c < ncols && bottomline[c])
+ ++c;
+ os << c << "} ";
}
}
- } else {
- return 0;
}
os << "\n";
return 1;
os << cellInfo(cell).align_special;
} else {
if (!getPWidth(cell).zero()) {
+ switch (align) {
+ case LYX_ALIGN_LEFT:
+ os << ">{\\raggedright}";
+ break;
+ case LYX_ALIGN_RIGHT:
+ os << ">{\\raggedleft}";
+ break;
+ case LYX_ALIGN_CENTER:
+ os << ">{\\centering}";
+ break;
+ default:
+ break;
+ }
switch (valign) {
case LYX_VALIGN_TOP:
os << 'p';
OutputParams const & runparams) const
{
idx_type cell = cellIndex(i, 0);
- int ret = TeXTopHLine(os, i);
+ shared_ptr<InsetTableCell> inset = cellInset(cell);
+ Paragraph const & par = inset->paragraphs().front();
+ string const lang = par.getParLanguage(buffer().params())->lang();
+
+ //output the top line
+ int ret = TeXTopHLine(os, i, lang);
+
if (row_info[i].top_space_default) {
if (use_booktabs)
os << "\\addlinespace\n";
&& getPWidth(cell).zero();
if (rtl) {
- if (par.getParLanguage(buffer().params())->lang() ==
- "farsi")
+ string const lang =
+ par.getParLanguage(buffer().params())->lang();
+ if (lang == "farsi")
os << "\\textFR{";
- else if (par.getParLanguage(buffer().params())->lang() == "arabic_arabi")
+ else if (lang == "arabic_arabi")
os << "\\textAR{";
- // currently, remaning RTL languages are arabic_arabtex and hebrew
+ // currently, remaning RTL languages are
+ // arabic_arabtex and hebrew
else
os << "\\R{";
}
- ret += inset->latex(os, runparams);
+ // pass to the OutputParams that we are in a cell and
+ // which alignment we have set.
+ // InsetNewline needs this context information.
+ OutputParams newrp(runparams);
+ newrp.inTableCell = (getAlignment(cell) == LYX_ALIGN_BLOCK)
+ ? OutputParams::PLAIN
+ : OutputParams::ALIGNED;
+ ret += inset->latex(os, newrp);
+ runparams.encoding = newrp.encoding;
if (rtl)
os << '}';
}
os << '\n';
++ret;
- ret += TeXBottomHLine(os, i);
+
+ //output the bottom line
+ ret += TeXBottomHLine(os, i, lang);
+
if (row_info[i].interline_space_default) {
if (use_booktabs)
os << "\\addlinespace\n";
if (needRotating())
features.require("rotating");
for (idx_type cell = 0; cell < numberofcells; ++cell) {
- if (getVAlignment(cell) != LYX_VALIGN_TOP ||
- (!getPWidth(cell).zero() && !isMultiColumn(cell)))
+ if (getVAlignment(cell) != LYX_VALIGN_TOP
+ || !getPWidth(cell).zero())
features.require("array");
cellInset(cell)->validate(features);
}
/////////////////////////////////////////////////////////////////////
InsetTableCell::InsetTableCell(Buffer & buf)
- : InsetText(buf), isFixedWidth(false)
+ : InsetText(buf), isFixedWidth(false),
+ contentAlign(LYX_ALIGN_CENTER)
{}
return !isFixedWidth;
}
+
bool InsetTableCell::allowParagraphCustomization(idx_type) const
{
return isFixedWidth;
}
+
bool InsetTableCell::getStatus(Cursor & cur, FuncRequest const & cmd,
FuncStatus & status) const
{
dim.wid = tabular.width() + 2 * ADD_TO_TABULAR_WIDTH;
}
+bool InsetTabular::isCellSelected(Cursor & cur, row_type row, col_type col)
+ const
+{
+ if (&cur.inset() == this && cur.selection()) {
+ if (cur.selIsMultiCell()) {
+ row_type rs, re;
+ col_type cs, ce;
+ getSelection(cur, rs, re, cs, ce);
+
+ if (col >= cs && col <= ce && row >= rs && row <= re)
+ return true;
+ } else
+ if (col == tabular.cellColumn(cur.idx())
+ && row == tabular.cellRow(cur.idx())) {
+ CursorSlice const & beg = cur.selBegin();
+ CursorSlice const & end = cur.selEnd();
+
+ if (end.lastpos() > 0 && end.pos() == end.lastpos()
+ && beg.pos() == 0)
+ return true;
+ }
+ }
+ return false;
+}
+
void InsetTabular::draw(PainterInfo & pi, int x, int y) const
{
//lyxerr << "InsetTabular::draw: " << x << " " << y << endl;
BufferView * bv = pi.base.bv;
+ Cursor & cur = pi.base.bv->cursor();
// FIXME: As the full backrgound is painted in drawSelection(),
// we have no choice but to do a full repaint for the Text cells.
x += ADD_TO_TABULAR_WIDTH;
bool const original_drawing_state = pi.pain.isDrawingEnabled();
+ bool const original_selection_state = pi.selected;
idx_type idx = 0;
first_visible_cell = Tabular::npos;
if (first_visible_cell == Tabular::npos)
first_visible_cell = idx;
+ pi.selected |= isCellSelected(cur, i, j);
int const cx = nx + tabular.getBeginningOfTextInCell(idx);
// Cache the Inset position.
bv->coordCache().insets().add(cell(idx).get(), cx, y);
}
nx += tabular.columnWidth(idx);
++idx;
+ pi.selected = original_selection_state;
}
if (i + 1 < tabular.row_info.size())
int const w = tabular.width();
int const h = tabular.height();
int yy = y - tabular.rowAscent(0);
- pi.pain.fillRectangle(x, yy, w, h, backgroundColor());
+ pi.pain.fillRectangle(x, yy, w, h, pi.backgroundColor(this));
if (!cur.selection())
return;
if (cur.selIsMultiCell()) {
- row_type rs, re;
- col_type cs, ce;
- getSelection(cur, rs, re, cs, ce);
y -= tabular.rowAscent(0);
for (row_type j = 0; j < tabular.row_info.size(); ++j) {
int const a = tabular.rowAscent(j);
idx_type const cell =
tabular.cellIndex(j, i);
int const w = tabular.columnWidth(cell);
- if (i >= cs && i <= ce && j >= rs && j <= re)
+ if (isCellSelected(cur, j, i))
pi.pain.fillRectangle(xx, y, w, h,
Color_selection);
xx += w;
{
//lyxerr << "InsetTabular::edit: " << this << endl;
cur.finishUndo();
- cur.selection() = false;
+ cur.setSelection(false);
cur.push(*this);
if (front) {
if (isRightToLeft(cur))
void InsetTabular::updateLabels(ParIterator const & it)
{
// In a longtable, tell captions what the current float is
- Counters & cnts = buffer().params().documentClass().counters();
+ Counters & cnts = buffer().masterBuffer()->params().documentClass().counters();
string const saveflt = cnts.current_float();
if (tabular.is_long_tabular)
cnts.current_float("table");
it2.forwardPos();
size_t const end = it2.nargs();
for ( ; it2.idx() < end; it2.top().forwardIdx())
- lyx::updateLabels(buffer(), it2);
+ buffer().updateLabels(it2);
//reset afterwards
if (tabular.is_long_tabular)
cur.resetAnchor();
cur.idx() = tabular.getLastCellInRow(r);
cur.pos() = cur.lastpos();
- cur.selection() = true;
+ cur.setSelection(true);
bvcur = cur;
rowselect_ = true;
break;
cur.resetAnchor();
cur.idx() = tabular.cellIndex(tabular.row_info.size() - 1, c);
cur.pos() = cur.lastpos();
- cur.selection() = true;
+ cur.setSelection(true);
bvcur = cur;
colselect_ = true;
break;
cur.pit() = 0;
cur.pos() = 0;
bvcur.setCursor(cur);
- bvcur.selection() = true;
+ bvcur.setSelection(true);
break;
}
// select (additional) column
cur.pit() = 0;
cur.pos() = 0;
bvcur.setCursor(cur);
- bvcur.selection() = true;
+ bvcur.setSelection(true);
break;
}
// only update if selection changes
cur.noUpdate();
setCursorFromCoordinates(cur, cmd.x, cmd.y);
bvcur.setCursor(cur);
- bvcur.selection() = true;
+ bvcur.setSelection(true);
// if this is a multicell selection, we just set the cursor to
// the beginning of the cell's text.
if (bvcur.selIsMultiCell()) {
- bvcur.pit() = 0;
- bvcur.pos() = 0;
+ bvcur.pit() = bvcur.lastpit();
+ bvcur.pos() = bvcur.lastpos();
}
}
break;
case LFUN_CELL_BACKWARD:
movePrevCell(cur);
- cur.selection() = false;
+ cur.setSelection(false);
break;
case LFUN_CELL_FORWARD:
moveNextCell(cur);
- cur.selection() = false;
+ cur.setSelection(false);
break;
case LFUN_CHAR_FORWARD_SELECT:
cmd = FuncRequest(LFUN_FINISHED_FORWARD);
cur.undispatched();
}
+ if (cur.selIsMultiCell()) {
+ cur.pit() = cur.lastpit();
+ cur.pos() = cur.lastpos();
+ return;
+ }
break;
case LFUN_UP_SELECT:
cmd = FuncRequest(LFUN_UP);
cur.undispatched();
}
+ if (cur.selIsMultiCell()) {
+ cur.pit() = cur.lastpit();
+ cur.pos() = cur.lastpos();
+ return;
+ }
break;
// case LFUN_SCREEN_DOWN: {
cell(cur.idx())->dispatch(cur, cmd);
break;
+ case LFUN_SELF_INSERT:
+ if (cur.selIsMultiCell()) {
+ cur.recordUndoInset(DELETE_UNDO);
+ cutSelection(cur);
+ }
+ cell(cur.idx())->dispatch(cur, cmd);
+ break;
+
case LFUN_CHAR_DELETE_BACKWARD:
case LFUN_CHAR_DELETE_FORWARD:
if (cur.selIsMultiCell()) {
case LFUN_FONT_EMPH:
case LFUN_FONT_BOLD:
+ case LFUN_FONT_BOLDSYMBOL:
case LFUN_FONT_ROMAN:
case LFUN_FONT_NOUN:
case LFUN_FONT_ITAL:
Inset * InsetTabular::editXY(Cursor & cur, int x, int y)
{
//lyxerr << "InsetTabular::editXY: " << this << endl;
- cur.selection() = false;
+ cur.setSelection(false);
cur.push(*this);
cur.idx() = getNearestCell(cur.bv(), x, y);
resetPos(cur);
BufferView & bv = cur.bv();
int const maxwidth = bv.workWidth();
- if (&cur.inset() != this) {
+ int const scx_old = scx_;
+ int const i = cur.find(this);
+ if (i == -1) {
scx_ = 0;
} else {
int const X1 = 0;
int const X2 = maxwidth;
int const offset = ADD_TO_TABULAR_WIDTH + 2;
- int const x1 = xo(cur.bv()) + cellXPos(cur.idx()) + offset;
- int const x2 = x1 + tabular.columnWidth(cur.idx());
+ int const x1 = xo(cur.bv()) + cellXPos(cur[i].idx()) + offset;
+ int const x2 = x1 + tabular.columnWidth(cur[i].idx());
if (x1 < X1)
scx_ = X1 + 20 - x1;
scx_ = 0;
}
- cur.updateFlags(Update::Force | Update::FitCursor);
+ // only update if offset changed
+ if (scx_ != scx_old)
+ cur.updateFlags(Update::Force | Update::FitCursor);
}
return;
++cur.idx();
}
+
+ cur.boundary(false);
+
+ if (cur.selIsMultiCell()) {
+ cur.pit() = cur.lastpit();
+ cur.pos() = cur.lastpos();
+ resetPos(cur);
+ return;
+ }
+
cur.pit() = 0;
cur.pos() = 0;
- cur.boundary(false);
// in visual mode, place cursor at extreme left or right
return;
--cur.idx();
}
+
+ if (cur.selIsMultiCell()) {
+ cur.pit() = cur.lastpit();
+ cur.pos() = cur.lastpos();
+ resetPos(cur);
+ return;
+ }
+
cur.pit() = cur.lastpit();
cur.pos() = cur.lastpos();
}
- // FIXME: this accesses the position cache before it is initialized
- //resetPos(cur);
+ resetPos(cur);
}
cur.idx() = tabular.cellIndex(sel_row_start, column);
cur.pit() = 0;
cur.pos() = 0;
- cur.selection() = false;
+ cur.setSelection(false);
break;
case Tabular::DELETE_COLUMN:
cur.idx() = tabular.cellIndex(row, sel_col_start);
cur.pit() = 0;
cur.pos() = 0;
- cur.selection() = false;
+ cur.setSelection(false);
break;
case Tabular::COPY_ROW:
cur.idx() = s_start;
cur.pit() = 0;
cur.pos() = 0;
- cur.selection() = false;
+ cur.setSelection(false);
break;
}
cur.idx() = tabular.setLTCaption(row, !tabular.ltCaption(row));
cur.pit() = 0;
cur.pos() = 0;
- cur.selection() = false;
+ cur.setSelection(false);
break;
case Tabular::SET_BOOKTABS:
projects / features.git / blobdiff