///
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); }
};
///
BOX_PARBOX = 1,
///
- BOX_MINIPAGE = 2
+ BOX_MINIPAGE = 2,
+ ///
+ BOX_VARWIDTH = 3
};
enum CaptionType {
///
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;
///
///
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
///