* This file is part of LyX, the document processor.
* Licence details can be found in the file COPYING.
*
- * \author Jürgen Vigna
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
* \author Matthias Ettrich
- * \author André Pönitz
- * \author Jürgen Vigna
+ * \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 INSETTABULAR_H
-#define INSETTABULAR_H
+#ifndef INSET_TABULAR_H
+#define INSET_TABULAR_H
#include "Inset.h"
-#include "MailInset.h"
-#include "Length.h"
#include "InsetText.h"
+#include "Layout.h"
+#include "Length.h"
-
-#include <boost/shared_ptr.hpp>
+#include "support/shared_ptr.h"
#include <iosfwd>
#include <vector>
namespace lyx {
+class Buffer;
+class BufferView;
+class CompletionList;
+class CursorSlice;
+class InsetTableCell;
class FuncStatus;
class Lexer;
-class BufferView;
-class Buffer;
-class BufferParams;
class Paragraph;
-class CursorSlice;
+class XHTMLStream;
namespace frontend { class Painter; }
//
// A helper struct for tables
//
-class Tabular {
+class Tabular {
public:
///
enum Feature {
///
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,
///
ALIGN_BLOCK,
///
+ ALIGN_DECIMAL,
+ ///
VALIGN_TOP,
///
VALIGN_BOTTOM,
///
VALIGN_MIDDLE,
///
- M_TOGGLE_LINE_TOP,
- ///
- M_TOGGLE_LINE_BOTTOM,
- ///
- M_TOGGLE_LINE_LEFT,
- ///
- M_TOGGLE_LINE_RIGHT,
- ///
M_ALIGN_LEFT,
///
M_ALIGN_RIGHT,
///
MULTICOLUMN,
///
+ MULTIROW,
+ ///
SET_ALL_LINES,
///
UNSET_ALL_LINES,
///
SET_LTNEWPAGE,
///
+ TOGGLE_LTCAPTION,
+ ///
SET_SPECIAL_COLUMN,
///
- SET_SPECIAL_MULTI,
+ SET_SPECIAL_MULTICOLUMN,
+ ///
+ SET_SPECIAL_MULTIROW,
///
SET_BOOKTABS,
///
///
SET_INTERLINE_SPACE,
///
+ SET_BORDER_LINES,
+ ///
+ TABULAR_VALIGN_TOP,
+ ///
+ TABULAR_VALIGN_MIDDLE,
+ ///
+ TABULAR_VALIGN_BOTTOM,
+ ///
+ LONGTABULAR_ALIGN_LEFT,
+ ///
+ LONGTABULAR_ALIGN_CENTER,
+ ///
+ LONGTABULAR_ALIGN_RIGHT,
+ ///
+ SET_DECIMAL_POINT,
+ ///
LAST_ACTION
};
///
///
CELL_BEGIN_OF_MULTICOLUMN,
///
- CELL_PART_OF_MULTICOLUMN
+ CELL_PART_OF_MULTICOLUMN,
+ ///
+ CELL_BEGIN_OF_MULTIROW,
+ ///
+ CELL_PART_OF_MULTIROW
};
///
///
LYX_VALIGN_TOP = 0,
///
- LYX_VALIGN_BOTTOM = 1,
+ LYX_VALIGN_MIDDLE = 1,
+ ///
+ LYX_VALIGN_BOTTOM = 2
+
+ };
+ ///
+ enum HAlignment {
+ ///
+ LYX_LONGTABULAR_ALIGN_LEFT = 0,
///
- LYX_VALIGN_MIDDLE = 2
+ LYX_LONGTABULAR_ALIGN_CENTER = 1,
+ ///
+ LYX_LONGTABULAR_ALIGN_RIGHT = 2
};
enum BoxType {
static const idx_type npos = static_cast<idx_type>(-1);
/// constructor
- Tabular(BufferParams const &, col_type columns_arg,
- row_type rows_arg);
+ Tabular(Buffer * buf, col_type columns_arg, row_type rows_arg);
/// Returns true if there is a topline, returns false if not
- bool topLine(idx_type cell, bool wholerow = false) const;
+ bool topLine(idx_type cell) const;
/// Returns true if there is a topline, returns false if not
- bool bottomLine(idx_type cell, bool wholerow = false) const;
+ bool bottomLine(idx_type cell) const;
/// Returns true if there is a topline, returns false if not
- bool leftLine(idx_type cell, bool wholecolumn = false) const;
+ bool leftLine(idx_type cell) const;
/// Returns true if there is a topline, returns false if not
- bool rightLine(idx_type cell, bool wholecolumn = false) const;
-
- ///
- bool topAlreadyDrawn(idx_type cell) const;
- ///
- bool leftAlreadyDrawn(idx_type cell) const;
- ///
- bool isLastRow(idx_type cell) const;
+ bool rightLine(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 getWidthOfColumn(idx_type cell) const;
+ int cellWidth(idx_type cell) const;
+ ///
+ int cellHeight(idx_type cell) const;
+ ///
+ int width() const;
///
- int getWidthOfTabular() const;
+ int height() const;
///
- int getAscentOfRow(row_type row) const;
+ row_type nrows() const {return row_info.size();}
///
- int getDescentOfRow(row_type row) const;
+ col_type ncols() const {return column_info.size();}
///
- int getHeightOfTabular() const;
+ int rowAscent(row_type row) const;
///
- void setAscentOfRow(row_type row, int height);
+ int rowDescent(row_type row) const;
///
- void setDescentOfRow(row_type row, int height);
+ void setRowAscent(row_type row, int height);
///
- void setWidthOfCell(idx_type cell, int new_width);
+ void setRowDescent(row_type row, int height);
///
- void setAllLines(idx_type cell, bool line);
+ void setTopLine(idx_type cell, bool line);
///
- void setTopLine(idx_type cell, bool line, bool wholerow = false);
+ void setBottomLine(idx_type cell, bool line);
///
- void setBottomLine(idx_type cell, bool line, bool wholerow = false);
+ void setLeftLine(idx_type cell, bool line);
///
- void setLeftLine(idx_type cell, bool line, bool wholecolumn = false);
+ void setRightLine(idx_type cell, bool line);
///
- void setRightLine(idx_type cell, bool line, bool wholecolumn = false);
+ bool rowTopLine(row_type row) const;
///
+ bool rowBottomLine(row_type row) const;
+ ///
+ bool columnLeftLine(col_type column) const;
+ ///
+ bool columnRightLine(col_type column) const;
+
void setAlignment(idx_type cell, LyXAlignment align,
bool onlycolumn = false);
///
///
Length const getPWidth(idx_type cell) const;
///
- Length const getColumnPWidth(idx_type cell) const;
- ///
- Length const getMColumnPWidth(idx_type cell) const;
- ///
- docstring const getAlignSpecial(idx_type cell, int what) const;
+ int textHOffset(idx_type cell) const;
///
- int getWidthOfCell(idx_type cell) const;
+ int textVOffset(idx_type cell) const;
///
- int getBeginningOfTextInCell(idx_type cell) const;
- ///
- void appendRow(BufferParams const &, idx_type cell);
+ void appendRow(idx_type cell);
///
void deleteRow(row_type row);
///
- void copyRow(BufferParams const &, row_type);
+ void copyRow(row_type);
///
- void appendColumn(BufferParams const &, idx_type cell);
+ void appendColumn(idx_type cell);
///
void deleteColumn(col_type column);
///
- void copyColumn(BufferParams const &, col_type);
- ///
- bool isFirstCellInRow(idx_type cell) const;
+ void copyColumn(col_type);
///
idx_type getFirstCellInRow(row_type row) const;
///
- bool isLastCellInRow(idx_type cell) const;
- ///
idx_type getLastCellInRow(row_type row) const;
///
- idx_type getNumberOfCells() const;
+ idx_type numberOfCellsInRow(row_type row) const;
///
- idx_type numberOfCellsInRow(idx_type cell) const;
+ void write(std::ostream &) const;
///
- void write(Buffer const &, std::ostream &) const;
+ void read(Lexer &);
///
- void read(Buffer const &, Lexer &);
+ int latex(odocstream &, OutputParams const &) const;
///
- int latex(Buffer const &, odocstream &, OutputParams const &) const;
- //
- int docbook(Buffer const & buf, odocstream & os, OutputParams const &) const;
+ int docbook(odocstream & os, OutputParams const &) const;
+ ///
+ docstring xhtml(XHTMLStream & os, OutputParams const &) const;
///
- void plaintext(Buffer const &, odocstream &,
+ void plaintext(odocstream &,
OutputParams const & runparams, int const depth,
- bool onlydata, unsigned char delim) const;
+ bool onlydata, char_type delim) const;
///
bool isMultiColumn(idx_type cell) const;
///
- bool isMultiColumnReal(idx_type cell) const;
+ idx_type setMultiColumn(idx_type cell, idx_type number);
///
- void setMultiColumn(Buffer *, 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;
///
- row_type row_of_cell(idx_type cell) const;
- ///
- col_type column_of_cell(idx_type cell) const;
- ///
- col_type right_column_of_cell(idx_type cell) const;
+ bool isPartOfMultiRow(row_type row, col_type column) const;
///
- void setBookTabs(bool);
+ bool isMultiRow(idx_type cell) const;
///
- bool useBookTabs() const;
+ idx_type setMultiRow(idx_type cell, idx_type number);
///
- void setLongTabular(bool);
+ void unsetMultiRow(idx_type cell);
///
- bool isLongTabular() const;
+ row_type cellRow(idx_type cell) const;
///
- void setRotateTabular(bool);
- ///
- bool getRotateTabular() const;
+ col_type cellColumn(idx_type cell) const;
///
void setRotateCell(idx_type cell, bool);
///
///
bool isLastCell(idx_type cell) const;
///
- idx_type getCellAbove(idx_type cell) const;
- ///
- idx_type getCellBelow(idx_type cell) const;
+ idx_type cellAbove(idx_type cell) const;
///
- idx_type getLastCellAbove(idx_type cell) const;
+ idx_type cellBelow(idx_type cell) const;
///
- idx_type getLastCellBelow(idx_type cell) const;
- ///
- idx_type getCellNumber(row_type row, col_type column) const;
+ idx_type cellIndex(row_type row, col_type column) const;
///
void setUsebox(idx_type cell, BoxType);
///
///
bool getLTNewPage(row_type row) const;
///
+ idx_type setLTCaption(row_type row, bool what);
+ ///
+ bool ltCaption(row_type row) const;
+ ///
bool haveLTHead() const;
///
bool haveLTFirstHead() const;
///
bool haveLTLastFoot() const;
///
+ bool haveLTCaption() const;
+ ///
// end longtable support
///
- boost::shared_ptr<InsetText> getCellInset(idx_type cell) const;
+ shared_ptr<InsetTableCell> cellInset(idx_type cell) const;
///
- boost::shared_ptr<InsetText> getCellInset(row_type row,
+ shared_ptr<InsetTableCell> cellInset(row_type row,
col_type column) const;
///
void setCellInset(row_type row, col_type column,
- boost::shared_ptr<InsetText>) const;
+ shared_ptr<InsetTableCell>) const;
/// Search for \param inset in the tabular, with the
///
- idx_type getCellFromInset(Inset const * inset) const;
- ///
- row_type rows() const { return rows_; }
- ///
- col_type columns() const { return columns_;}
- ///
void validate(LaTeXFeatures &) const;
- ///
//private:
+ // FIXME Now that cells have an InsetTableCell as their insets, rather
+ // than an InsetText, it'd be possible to reverse the relationship here,
+ // so that cell_vector was a vector<InsetTableCell> rather than a
+ // vector<CellData>, and an InsetTableCell had a CellData as a member,
+ // or perhaps just had its members as members.
///
- class cellstruct {
+ class CellData {
public:
///
- cellstruct(BufferParams const &);
+ CellData(Buffer *);
///
- cellstruct(cellstruct const &);
+ CellData(CellData const &);
///
- cellstruct & operator=(cellstruct);
+ CellData & operator=(CellData);
///
- void swap(cellstruct & rhs);
+ void swap(CellData & rhs);
///
idx_type cellno;
///
- int width_of_cell;
+ int width;
///
int multicolumn;
///
+ int multirow;
+ ///
LyXAlignment alignment;
///
VAlignment valignment;
+ /// width of the part before the decimal
+ int decimal_hoffset;
+ /// width of the decimal part
+ int decimal_width;
+ ///
+ int voffset;
///
bool top_line;
///
///
Length p_width; // this is only set for multicolumn!!!
///
- boost::shared_ptr<InsetText> inset;
+ shared_ptr<InsetTableCell> inset;
};
- cellstruct & cellinfo_of_cell(idx_type cell) const;
+ CellData & cellInfo(idx_type cell) const;
///
- typedef std::vector<cellstruct> cell_vector;
+ typedef std::vector<CellData> cell_vector;
///
typedef std::vector<cell_vector> cell_vvector;
///
- class rowstruct {
+ class RowData {
public:
///
- rowstruct();
+ RowData();
///
- int ascent_of_row;
+ int ascent;
///
- int descent_of_row;
- ///
- bool top_line;
- ///
- bool bottom_line;
+ int descent;
/// Extra space between the top line and this row
Length top_space;
/// Ignore top_space if true and use the default top space
bool endfoot;
/// row of endlastfoot
bool endlastfoot;
- /// row for a pagebreak
+ /// row for a newpage
bool newpage;
+ /// caption
+ bool caption;
};
///
- typedef std::vector<rowstruct> row_vector;
+ typedef std::vector<RowData> row_vector;
///
- class columnstruct {
+ class ColumnData {
public:
///
- columnstruct();
+ ColumnData();
///
LyXAlignment alignment;
///
VAlignment valignment;
///
- bool left_line;
- ///
- bool right_line;
- ///
- int width_of_column;
+ int width;
///
Length p_width;
///
docstring align_special;
+ ///
+ docstring decimal_point;
};
///
- typedef std::vector<columnstruct> column_vector;
+ typedef std::vector<ColumnData> column_vector;
- ///
- row_type rows_;
- ///
- col_type columns_;
///
idx_type numberofcells;
///
///
mutable cell_vvector cell_info;
///
- int width_of_tabular;
- ///
bool use_booktabs;
///
bool rotate;
+ ///
+ VAlignment tabular_valignment;
//
// for long tabulars
+ ///
+ HAlignment longtabular_alignment;
//
bool is_long_tabular;
/// endhead data
ltType endlastfoot;
///
- void init(BufferParams const &, row_type rows_arg,
+ void init(Buffer *, row_type rows_arg,
col_type columns_arg);
///
- void set_row_column_number_info();
- /// Returns true if a complete update is necessary, otherwise false
- bool setWidthOfMulticolCell(idx_type cell, int new_width);
+ void updateIndexes();
///
- void recalculateMulticolumnsOfColumn(col_type column);
- /// Returns true if change
- void calculate_width_of_column(col_type column);
+ bool setFixedWidth(row_type r, col_type c);
+ /// return true of update is needed
+ bool updateColumnWidths();
///
- bool calculate_width_of_column_NMC(col_type column); // no multi cells
+ idx_type columnSpan(idx_type cell) const;
///
- void calculate_width_of_tabular();
- ///
- void delete_column(col_type column);
- ///
- idx_type cells_in_multicolumn(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 TeXTopHLine(odocstream &, row_type row) const;
+ int TeXTopHLine(odocstream &, row_type row, std::string const lang) const;
///
- int TeXBottomHLine(odocstream &, row_type row) const;
+ int TeXBottomHLine(odocstream &, row_type row, std::string const lang) const;
///
- int TeXCellPreamble(odocstream &, idx_type cell) const;
+ int TeXCellPreamble(odocstream &, idx_type cell, bool & ismulticol, bool & ismultirow) const;
///
- int TeXCellPostamble(odocstream &, idx_type cell) const;
+ int TeXCellPostamble(odocstream &, idx_type cell, bool ismulticol, bool ismultirow) const;
///
- int TeXLongtableHeaderFooter(odocstream &, Buffer const & buf,
- OutputParams const &) const;
+ int TeXLongtableHeaderFooter(odocstream &, OutputParams const &) const;
///
bool isValidRow(row_type const row) const;
///
- int TeXRow(odocstream &, row_type const row, Buffer const & buf,
+ int TeXRow(odocstream &, row_type const row,
OutputParams const &) const;
///
// helper functions for plain text
bool plaintextBottomHLine(odocstream &, row_type row,
std::vector<unsigned int> const &) const;
///
- void plaintextPrintCell(Buffer const &, odocstream &,
+ void plaintextPrintCell(odocstream &,
OutputParams const &,
idx_type cell, row_type row, col_type column,
std::vector<unsigned int> const &,
bool onlydata) const;
/// auxiliary function for docbook
- int docbookRow(Buffer const & buf, odocstream & os, row_type,
- OutputParams const &) const;
+ int docbookRow(odocstream & os, row_type, OutputParams const &) const;
+ ///
+ docstring xhtmlRow(XHTMLStream & xs, row_type, OutputParams const &) const;
+
+ /// change associated Buffer
+ void setBuffer(Buffer & buffer);
+ /// retrieve associated Buffer
+ Buffer & buffer() const { return *buffer_; }
private:
- /// renumber cells after structural changes
- void fixCellNums();
-};
+ Buffer * buffer_;
+}; // Tabular
-class InsetTabular : public Inset {
+///
+class InsetTableCell : public InsetText
+{
public:
///
- InsetTabular(Buffer const &, row_type rows = 1,
+ InsetTableCell(Buffer * buf);
+ ///
+ InsetCode lyxCode() const { return CELL_CODE; }
+ ///
+ Inset * clone() { return new InsetTableCell(*this); }
+ ///
+ bool getStatus(Cursor & cur, FuncRequest const & cmd,
+ FuncStatus & status) const;
+ ///
+ void toggleFixedWidth(bool fw) { isFixedWidth = fw; }
+ ///
+ void setContentAlignment(LyXAlignment al) {contentAlign = al; }
+ /// writes the contents of the cell as a string, optionally
+ /// descending into insets
+ docstring asString(bool intoInsets = true);
+ ///
+ docstring xhtml(XHTMLStream &, OutputParams const &) 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
+ // layout changes and paragraph customization are allowed---that is,
+ // we need it in forcePlainLayout() and allowParagraphCustomization().
+ // Unfortunately, that information is not readily available in
+ // InsetTableCell. In the case of multicolumn cells, it is present
+ // in CellData, and so would be available here if CellData were to
+ // become a member of InsetTableCell. But in the other case, it isn't
+ // even available there, but is held in Tabular::ColumnData.
+ // So, the present solution uses this boolean to track the information
+ // we need to track, and tries to keep it updated. This is not ideal,
+ // but the other solutions are no better. These are:
+ // (i) Keep a pointer in InsetTableCell to the table;
+ // (ii) Find the table by iterating over the Buffer's insets.
+ // Solution (i) raises the problem of updating the pointer when an
+ // InsetTableCell is copied, and we'd therefore need a copy constructor
+ // in InsetTabular and then in Tabular, which seems messy, given how
+ // complicated those classes are. Solution (ii) involves a lot of
+ // iterating, since this information is needed quite often, and so may
+ // be quite slow.
+ // So, well, if someone can do better, please do!
+ // --rgh
+ ///
+ bool isFixedWidth;
+ // FIXME: Here the thoughts from the comment above also apply.
+ ///
+ LyXAlignment contentAlign;
+ /// should paragraph indendation be omitted in any case?
+ bool neverIndent() const { return true; }
+ ///
+ LyXAlignment contentAlignment() const { return contentAlign; }
+ ///
+ virtual bool usePlainLayout() const { return true; }
+ ///
+ virtual bool forcePlainLayout(idx_type = 0) const;
+ ///
+ virtual bool allowParagraphCustomization(idx_type = 0) const;
+ /// Is the width forced to some value?
+ bool hasFixedWidth() const { return isFixedWidth; }
+};
+
+
+class InsetTabular : public Inset
+{
+public:
+ ///
+ InsetTabular(Buffer *, row_type rows = 1,
col_type columns = 1);
///
~InsetTabular();
///
- void read(Buffer const &, Lexer &);
+ void setBuffer(Buffer & buffer);
+
+ ///
+ static void string2params(std::string const &, InsetTabular &);
///
- void write(Buffer const &, std::ostream &) const;
+ static std::string params2string(InsetTabular const &);
///
- bool metrics(MetricsInfo &, Dimension &) const;
+ void read(Lexer &);
+ ///
+ void write(std::ostream &) const;
+ ///
+ void metrics(MetricsInfo &, Dimension &) const;
///
void draw(PainterInfo & pi, int x, int y) const;
///
void drawSelection(PainterInfo & pi, int x, int y) const;
///
- virtual docstring const editMessage() const;
+ bool editable() const { return true; }
///
- EDITABLE editable() const { return HIGHLY_EDITABLE; }
+ bool hasSettings() const { return true; }
///
- bool insetAllowed(Inset::Code) const { return true; }
+ bool insetAllowed(InsetCode code) const;
///
bool allowSpellCheck() const { return true; }
///
insets that may contain several paragraphs */
bool noFontChange() const { return true; }
///
- DisplayType display() const { return tabular.isLongTabular() ? AlignCenter : Inline; }
+ DisplayType display() const;
+ ///
+ int latex(odocstream &, OutputParams const &) const;
///
- int latex(Buffer const &, odocstream &,
- OutputParams const &) const;
+ int plaintext(odocstream &, OutputParams const &) const;
///
- int plaintext(Buffer const &, odocstream &,
- OutputParams const &) const;
+ int docbook(odocstream &, OutputParams const &) const;
///
- int docbook(Buffer const &, odocstream &,
- OutputParams const &) const;
+ docstring xhtml(XHTMLStream &, OutputParams const &) const;
///
void validate(LaTeXFeatures & features) const;
///
- Code lyxCode() const { return Inset::TABULAR_CODE; }
+ InsetCode lyxCode() const { return TABULAR_CODE; }
+ ///
+ docstring contextMenu(BufferView const & bv, int x, int y) const;
/// get offset of this cursor slice relative to our upper left corner
void cursorPos(BufferView const & bv, CursorSlice const & sl,
bool boundary, int & x, int & y) 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.getNumberOfCells(); }
+ size_t nargs() const { return tabular.numberofcells; }
///
- boost::shared_ptr<InsetText const> cell(idx_type) const;
+ shared_ptr<InsetTableCell const> cell(idx_type) const;
///
- boost::shared_ptr<InsetText> cell(idx_type);
+ shared_ptr<InsetTableCell> cell(idx_type);
///
Text * getText(int) const;
/// set the change for the entire inset
void setChange(Change const & change);
/// accept the changes within the inset
- void acceptChanges(BufferParams const & bparams);
+ void acceptChanges();
/// reject the changes within the inset
- void rejectChanges(BufferParams const & bparams);
+ void rejectChanges();
// this should return true if we have a "normal" cell, otherwise false.
// "normal" means without width set!
/// should all paragraphs be output with "Standard" layout?
- bool forceDefaultParagraphs(idx_type cell = 0) const;
-
+ virtual bool allowParagraphCustomization(idx_type cell = 0) const;
///
- void addPreview(graphics::PreviewLoader &) const;
-
+ virtual bool forcePlainLayout(idx_type cell = 0) const;
///
- Buffer const & buffer() const;
+ void addPreview(DocIterator const & inset_pos,
+ graphics::PreviewLoader &) const;
- /// set the owning buffer
- void buffer(Buffer const * buf);
/// lock cell with given index
- void edit(Cursor & cur, bool left);
+ void edit(Cursor & cur, bool front, EntryDirection entry_from);
+ /// get table row from x coordinate
+ int rowFromY(Cursor & cur, int y) const;
+ /// get table column from y coordinate
+ int columnFromX(Cursor & cur, int x) const;
///
Inset * editXY(Cursor & cur, int x, int y);
/// can we go further down on mouse click?
- bool descendable() const { return true; }
+ bool descendable(BufferView const &) const { return true; }
+ /// Update the counters of this inset and of its contents
+ void updateBuffer(ParIterator const &, UpdateType);
+ ///
+ void addToToc(DocIterator const &);
+ ///
+ bool completionSupported(Cursor const &) const;
+ ///
+ bool inlineCompletionSupported(Cursor const & cur) const;
+ ///
+ bool automaticInlineCompletion() const;
+ ///
+ bool automaticPopupCompletion() const;
+ ///
+ bool showCompletionCursor() const;
+ ///
+ CompletionList const * createCompletionList(Cursor const & cur) const;
+ ///
+ docstring completionPrefix(Cursor const & cur) const;
+ ///
+ bool insertCompletion(Cursor & cur, docstring const & s, bool finished);
+ ///
+ void completionPosAndDim(Cursor const &, int & x, int & y, Dimension & dim) const;
+ ///
+ virtual bool usePlainLayout() const { return true; }
+
+ ///
+ InsetTabular * asInsetTabular() { return this; }
+ ///
+ InsetTabular const * asInsetTabular() const { return this; }
+ ///
+ bool isRightToLeft(Cursor & cur) const;
+ /// writes the cells between stidx and enidx as a string, optionally
+ /// descending into the insets
+ docstring asString(idx_type stidx, idx_type enidx, bool intoInsets = true);
+
+ /// Returns whether the cell in the specified row and column is selected.
+ bool isCellSelected(Cursor & cur, row_type row, col_type col) const;
//
// Public structures and variables
///
mutable Tabular tabular;
-protected:
+private:
///
InsetTabular(InsetTabular const &);
///
- virtual void doDispatch(Cursor & cur, FuncRequest & cmd);
+ void doDispatch(Cursor & cur, FuncRequest & cmd);
///
bool getStatus(Cursor & cur, FuncRequest const & cmd, FuncStatus &) const;
///
int scroll() const { return scx_; }
-
-private:
- virtual std::auto_ptr<Inset> doClone() const;
+ ///
+ Inset * clone() const { return new InsetTabular(*this); }
///
void drawCellLines(frontend::Painter &, int x, int y, row_type row,
- idx_type cell, bool erased) const;
+ idx_type cell, Change const & change) const;
///
void setCursorFromCoordinates(Cursor & cur, int x, int y) const;
///
- void moveNextCell(Cursor & cur);
+ void moveNextCell(Cursor & cur,
+ EntryDirection entry_from = ENTRY_DIRECTION_IGNORE);
///
- void movePrevCell(Cursor & cur);
+ void movePrevCell(Cursor & cur,
+ EntryDirection entry_from = ENTRY_DIRECTION_IGNORE);
///
- int getCellXPos(idx_type cell) const;
+ int cellXPos(idx_type cell) const;
///
void resetPos(Cursor & cur) const;
///
- void removeTabularRow();
- ///
bool copySelection(Cursor & cur);
///
bool pasteClipboard(Cursor & cur);
///
void cutSelection(Cursor & cur);
///
- bool isRightToLeft(Cursor & cur) const;
- ///
void getSelection(Cursor & cur, row_type & rs, row_type & re,
col_type & cs, col_type & ce) const;
///
bool insertPlaintextString(BufferView &, docstring const & buf, bool usePaste);
- /// are we operating on several cells?
- bool tablemode(Cursor & cur) const;
/// return the "Manhattan distance" to nearest corner
int dist(BufferView &, idx_type cell, int x, int y) const;
row_type row_start, row_type row_end,
col_type col_start, col_type col_end) const;
///
- Buffer const * buffer_;
- ///
mutable idx_type first_visible_cell;
///
mutable int scx_;
- /// Ugly boolean used when this inset is dissolved and
- /// InsetTabularMailer should not be used.
- bool is_deleted_;
-};
-
-
-class InsetTabularMailer : public MailInset {
-public:
- ///
- InsetTabularMailer(InsetTabular const & inset);
- ///
- virtual Inset & inset() const { return inset_; }
- ///
- virtual std::string const & name() const { return name_; }
- ///
- virtual std::string const inset2string(Buffer const &) const;
- ///
- static void string2params(std::string const &, InsetTabular &);
- ///
- static std::string const params2string(InsetTabular const &);
-private:
- ///
- static std::string const name_;
- ///
- InsetTabular & inset_;
+ /// true when selecting rows with the mouse
+ bool rowselect_;
+ /// true when selecting columns with the mouse
+ bool colselect_;
};
std::string const featureAsString(Tabular::Feature feature);
+/// Split cell on decimal symbol
+InsetTableCell splitCell(InsetTableCell & head, docstring const decimal_sym, bool & hassep);
+
} // namespace lyx
-#endif
+#endif // INSET_TABULAR_H
projects / lyx.git / blobdiff