* \author Matthias Ettrich
* \author André Pönitz
* \author Jürgen Vigna
+ * \author Edwin Leuven
+ * \author Uwe Stöhr
*
* Full author contact details are available in file CREDITS.
*/
-
-// This is Juergen's rewrite of the tabular (table) support.
-
// Things to think of when designing the new tabular support:
// - color support (colortbl, color)
// - decimal alignment (dcloumn)
// - custom lines (hhline)
-// - rotation
-// - multicolumn
-// - multirow
// - column styles
-// This is what I have written about tabular support in the LyX3-Tasks file:
-//
-// o rewrite of table code. Should probably be written as some
-// kind of an inset. [Done]
-// o enhance longtable support
-
-// Lgb
-
#ifndef INSET_TABULAR_H
#define INSET_TABULAR_H
///
COPY_COLUMN,
///
- TOGGLE_LINE_TOP,
+ SET_LINE_TOP,
///
- TOGGLE_LINE_BOTTOM,
+ SET_LINE_BOTTOM,
///
- TOGGLE_LINE_LEFT,
+ SET_LINE_LEFT,
///
+ SET_LINE_RIGHT,
+ ///FIXME: remove
+ TOGGLE_LINE_TOP,
+ ///FIXME: remove
+ TOGGLE_LINE_BOTTOM,
+ ///FIXME: remove
+ TOGGLE_LINE_LEFT,
+ ///FIXME: remove
TOGGLE_LINE_RIGHT,
///
ALIGN_LEFT,
///
MULTICOLUMN,
///
+ MULTIROW,
+ ///
SET_ALL_LINES,
///
UNSET_ALL_LINES,
///
SET_SPECIAL_COLUMN,
///
- SET_SPECIAL_MULTI,
+ SET_SPECIAL_MULTICOLUMN,
+ ///
+ SET_SPECIAL_MULTIROW,
///
SET_BOOKTABS,
///
///
CELL_BEGIN_OF_MULTICOLUMN,
///
- CELL_PART_OF_MULTICOLUMN
+ CELL_PART_OF_MULTICOLUMN,
+ ///
+ CELL_BEGIN_OF_MULTIROW,
+ ///
+ CELL_PART_OF_MULTIROW
};
///
/// Returns true if there is a topline, returns false if not
bool rightLine(idx_type cell) const;
- ///
- bool topAlreadyDrawn(idx_type cell) const;
- ///
- bool leftAlreadyDrawn(idx_type cell) const;
- ///
- bool isLastRow(idx_type cell) const;
-
/// return space occupied by the second horizontal line and
/// interline space above row \p row in pixels
- int getAdditionalHeight(row_type row) const;
+ int interRowSpace(row_type row) const;
///
- int getAdditionalWidth(idx_type cell) const;
+ int interColumnSpace(idx_type cell) const;
/* returns the maximum over all rows */
///
int columnWidth(idx_type cell) const;
///
+ int cellHeight(idx_type cell) const;
+ ///
int width() const;
///
int height() const;
///
+ row_type nrows() const {return row_info.size();}
+ ///
+ col_type ncols() const {return column_info.size();}
+ ///
int rowAscent(row_type row) const;
///
int rowDescent(row_type row) const;
///
void setCellWidth(idx_type cell, int new_width);
///
- void setAllLines(idx_type cell, bool line);
- ///
void setTopLine(idx_type cell, bool line);
///
void setBottomLine(idx_type cell, bool line);
///
int cellWidth(idx_type cell) const;
///
- int getBeginningOfTextInCell(idx_type cell) const;
+ int textHOffset(idx_type cell) const;
+ ///
+ int textVOffset(idx_type cell) const;
///
void appendRow(idx_type cell);
///
///
void copyColumn(col_type);
///
- bool isFirstCellInRow(idx_type cell) const;
- ///
idx_type getFirstCellInRow(row_type row) const;
///
- bool isLastCellInRow(idx_type cell) const;
- ///
idx_type getLastCellInRow(row_type row) const;
///
- idx_type numberOfCellsInRow(idx_type cell) const;
+ idx_type numberOfCellsInRow(row_type row) const;
///
void write(std::ostream &) const;
///
///
bool isMultiColumn(idx_type cell) const;
///
- bool isMultiColumnReal(idx_type cell) const;
- ///
- void setMultiColumn(idx_type cell, idx_type number);
+ idx_type setMultiColumn(idx_type cell, idx_type number);
///
- idx_type unsetMultiColumn(idx_type cell); // returns number of new cells
+ void unsetMultiColumn(idx_type cell);
///
bool isPartOfMultiColumn(row_type row, col_type column) const;
///
+ bool isPartOfMultiRow(row_type row, col_type column) const;
+ ///
+ bool isMultiRow(idx_type cell) const;
+ ///
+ idx_type setMultiRow(idx_type cell, idx_type number);
+ ///
+ void unsetMultiRow(idx_type cell);
+ ///
row_type cellRow(idx_type cell) const;
///
col_type cellColumn(idx_type cell) const;
///
- col_type cellRightColumn(idx_type cell) const;
- ///
void setRotateCell(idx_type cell, bool);
///
bool getRotateCell(idx_type cell) const;
///
int multicolumn;
///
+ int multirow;
+ ///
LyXAlignment alignment;
///
VAlignment valignment;
///
+ int voffset;
+ ///
bool top_line;
///
bool bottom_line;
///
idx_type columnSpan(idx_type cell) const;
///
+ idx_type rowSpan(idx_type cell) const;
+ ///
BoxType useParbox(idx_type cell) const;
///
// helper function for Latex returns number of newlines
///
int TeXBottomHLine(odocstream &, row_type row, std::string const lang) const;
///
- int TeXCellPreamble(odocstream &, idx_type cell, bool & ismulticol) const;
+ int TeXCellPreamble(odocstream &, idx_type cell, bool & ismulticol, bool & ismultirow) const;
///
- int TeXCellPostamble(odocstream &, idx_type cell, bool ismulticol) const;
+ int TeXCellPostamble(odocstream &, idx_type cell, bool ismulticol, bool ismultirow) const;
///
int TeXLongtableHeaderFooter(odocstream &, OutputParams const &) const;
///
///
void tabularFeatures(Cursor & cur, Tabular::Feature feature,
std::string const & val = std::string());
- ///
- void openLayoutDialog(BufferView *) const;
- ///
- bool showInsetDialog(BufferView *) const;
/// number of cells
size_t nargs() const { return tabular.numberofcells; }
///
/// can we go further down on mouse click?
bool descendable(BufferView const &) const { return true; }
/// Update the counters of this inset and of its contents
- void updateLabels(ParIterator const &, UpdateType);
+ void updateBuffer(ParIterator const &, UpdateType);
///
void addToToc(DocIterator const &);
///
void resetPos(Cursor & cur) const;
///
- void removeTabularRow();
- ///
bool copySelection(Cursor & cur);
///
bool pasteClipboard(Cursor & cur);
projects / lyx.git / blobdiff