{
public:
///
- InsetTableCell(Buffer * buf);
+ explicit InsetTableCell(Buffer * buf);
///
InsetCode lyxCode() const { return CELL_CODE; }
///
///
void toggleFixedWidth(bool fw) { isFixedWidth = fw; }
///
+ void toggleMultiCol(bool m) { isMultiColumn = m; }
+ ///
+ void toggleMultiRow(bool m) { isMultiRow = m; }
+ ///
void setContentAlignment(LyXAlignment al) {contentAlign = al; }
/// writes the contents of the cell as a string, optionally
/// descending into insets
///
void addToToc(DocIterator const & di, bool output_active,
UpdateType utype, TocBackend & backend) const;
+ ///
+ void metrics(MetricsInfo &, Dimension &) const;
private:
/// unimplemented
InsetTableCell();
/// unimplemented
void operator=(InsetTableCell const &);
// FIXME
- // This boolean is supposed to track whether the cell has had its
- // width explicitly set. We need to know this to determine whether
+ // These booleans are supposed to track whether the cell has had its
+ // width explicitly set and whether it is part of a multicolumn, respectively.
+ // We need to know this to determine whether
// layout changes and paragraph customization are allowed---that is,
// we need it in forcePlainLayout() and allowParagraphCustomization().
// Unfortunately, that information is not readily available in
// --rgh
///
bool isFixedWidth;
+ ///
+ bool isMultiColumn;
+ ///
+ bool isMultiRow;
// FIXME: Here the thoughts from the comment above also apply.
///
LyXAlignment contentAlign;
/// Is the width forced to some value?
bool hasFixedWidth() const { return isFixedWidth; }
/// Can the cell contain several paragraphs?
- /** FIXME this is wrong for multirows, that are limited to one
- * paragraph. However, we cannot test for this (see the big
- * comment above).
- */
- bool allowMultiPar() const { return isFixedWidth; }
+ bool allowMultiPar() const { return !isMultiRow && (!isMultiColumn || isFixedWidth); }
};
///FIXME: remove
TOGGLE_LINE_RIGHT,
///
+ SET_LTRIM_TOP,
+ ///
+ SET_RTRIM_TOP,
+ ///
+ SET_LTRIM_BOTTOM,
+ ///
+ SET_RTRIM_BOTTOM,
+ ///
+ TOGGLE_LTRIM_TOP,
+ ///
+ TOGGLE_RTRIM_TOP,
+ ///
+ TOGGLE_LTRIM_BOTTOM,
+ ///
+ TOGGLE_RTRIM_BOTTOM,
+ ///
ALIGN_LEFT,
///
ALIGN_RIGHT,
///
SET_ALL_LINES,
///
+ RESET_FORMAL_DEFAULT,
+ ///
UNSET_ALL_LINES,
///
TOGGLE_LONGTABULAR,
///
SET_TABULAR_WIDTH,
///
+ SET_INNER_LINES,
+ ///
LAST_ACTION
};
///
/// Returns true if there is a topline, returns false if not
bool bottomLine(idx_type cell) const;
/// Returns true if there is a topline, returns false if not
- bool leftLine(idx_type cell) const;
+ /// If \p ignore_bt is true, we return the state as if booktabs was
+ /// not used
+ bool leftLine(idx_type cell, bool const ignore_bt = false) const;
/// Returns true if there is a topline, returns false if not
- bool rightLine(idx_type cell) const;
+ /// If \p ignore_bt is true, we return the state as if booktabs was
+ /// not used
+ bool rightLine(idx_type cell, bool const ignore_bt = false) const;
+ /// Returns whether the top line is trimmed left and/or right
+ std::pair<bool, bool> topLineTrim(idx_type const cell) const;
+ /// Returns whether the bottom line is trimmed left and/or right
+ std::pair<bool, bool> bottomLineTrim(idx_type const cell) const;
/// return space occupied by the second horizontal line and
/// interline space above row \p row in pixels
///
void setBottomLine(idx_type cell, bool line);
///
+ void setTopLineLTrim(idx_type cell, bool val);
+ ///
+ void setBottomLineLTrim(idx_type cell, bool val);
+ ///
+ void setTopLineRTrim(idx_type cell, bool val);
+ ///
+ void setBottomLineRTrim(idx_type cell, bool val);
+ ///
+ void setTopLineTrim(idx_type cell, std::pair<bool, bool>);
+ ///
+ void setBottomLineTrim(idx_type cell, std::pair<bool, bool>);
+ ///
void setLeftLine(idx_type cell, bool line);
///
void setRightLine(idx_type cell, bool line);
///
void appendRow(row_type row);
///
- void deleteRow(row_type row);
+ void deleteRow(row_type row, bool const force = false);
///
void copyRow(row_type row);
///
///
void appendColumn(col_type column);
///
- void deleteColumn(col_type column);
+ void deleteColumn(col_type column, bool const force = false);
///
void copyColumn(col_type column);
///
void insertColumn(col_type column, bool copy);
///
- idx_type getFirstCellInRow(row_type row) const;
+ idx_type getFirstCellInRow(row_type row, bool const ct = false) const;
+ ///
+ idx_type getLastCellInRow(row_type row, bool const ct = false) const;
+ ///
+ idx_type getFirstRow(bool const ct = false) const;
///
- idx_type getLastCellInRow(row_type row) const;
+ idx_type getLastRow(bool const ct = false) const;
///
idx_type numberOfCellsInRow(row_type row) const;
///
///
bool hasVarwidthColumn() const;
///
- idx_type setMultiColumn(idx_type cell, idx_type number,
+ bool isVTypeColumn(col_type cell) const;
+ ///
+ idx_type setMultiColumn(Cursor & cur, idx_type cell, idx_type number,
bool const right_border);
///
void unsetMultiColumn(idx_type cell);
///
bool hasMultiRow(row_type r) const;
///
- idx_type setMultiRow(idx_type cell, idx_type number,
+ idx_type setMultiRow(Cursor & cur, idx_type cell, idx_type number,
bool const bottom_border,
LyXAlignment const halign);
///
///
bool getLTNewPage(row_type row) const;
///
- idx_type setLTCaption(row_type row, bool what);
+ idx_type setLTCaption(Cursor & cur, row_type row, bool what);
///
bool ltCaption(row_type row) const;
///
class CellData {
public:
///
- CellData(Buffer *);
+ explicit CellData(Buffer *);
///
CellData(CellData const &);
///
///
bool right_line;
///
+ bool top_line_rtrimmed;
+ ///
+ bool top_line_ltrimmed;
+ ///
+ bool bottom_line_rtrimmed;
+ ///
+ bool bottom_line_ltrimmed;
+ ///
BoxType usebox;
///
int rotate;
bool newpage;
/// caption
bool caption;
+ ///
+ Change change;
};
///
typedef std::vector<RowData> row_vector;
docstring decimal_point;
///
bool varwidth;
+ ///
+ Change change;
};
///
typedef std::vector<ColumnData> column_vector;
///
bool setFixedWidth(row_type r, col_type c);
/// return true of update is needed
- bool updateColumnWidths();
+ bool updateColumnWidths(MetricsInfo & mi);
///
idx_type columnSpan(idx_type cell) const;
///
idx_type rowSpan(idx_type cell) const;
///
- BoxType useParbox(idx_type cell) const;
+ BoxType useBox(idx_type cell) const;
///
// helper function for Latex
///
- void TeXTopHLine(otexstream &, row_type row, std::string const & lang,
+ void TeXTopHLine(otexstream &, row_type row, std::list<col_type>,
std::list<col_type>) const;
///
- void TeXBottomHLine(otexstream &, row_type row, std::string const & lang,
+ void TeXBottomHLine(otexstream &, row_type row, std::list<col_type>,
std::list<col_type>) const;
///
void TeXCellPreamble(otexstream &, idx_type cell, bool & ismulticol, bool & ismultirow,
///
void TeXCellPostamble(otexstream &, idx_type cell, bool ismulticol, bool ismultirow) const;
///
- void TeXLongtableHeaderFooter(otexstream &, OutputParams const &, std::list<col_type>) const;
+ void TeXLongtableHeaderFooter(otexstream &, OutputParams const &, std::list<col_type>,
+ std::list<col_type>) const;
///
bool isValidRow(row_type const row) const;
///
void TeXRow(otexstream &, row_type const row,
- OutputParams const &, std::list<col_type>) const;
+ OutputParams const &, std::list<col_type>, std::list<col_type>) const;
///
// helper functions for plain text
///
///
Text * getText(int) const;
+ /// does the inset contain changes ?
+ bool isChanged() const;
/// set the change for the entire inset
void setChange(Change const & change);
/// accept the changes within the inset
projects / lyx.git / blobdiff