*/
-// This is the rewrite of the tabular (table) support.
-
-// Ideally the tabular support should do as the mathed and use
-// LaTeX in the .lyx file too.
+// This is Juergen's rewrite of the tabular (table) support.
// Things to think of when designing the new tabular support:
// - color support (colortbl, color)
// 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. At least get the code out of the kernel.
-// - colortbl -multirow
-// - hhline -multicolumn
-// - dcolumn
+// kind of an inset. [Done]
// o enhance longtable support
// Lgb
class CursorSlice;
-class InsetTabular : public UpdatableInset {
+class InsetTabular : public InsetOld {
public:
///
- InsetTabular(Buffer const &, int rows = 1, int columns = 1);
- ///
- InsetTabular(InsetTabular const &);
+ InsetTabular(Buffer const &, row_type rows = 1,
+ col_type columns = 1);
///
~InsetTabular();
///
- virtual std::auto_ptr<InsetBase> clone() const;
- ///
void read(Buffer const &, LyXLex &);
///
void write(Buffer const &, std::ostream &) const;
///
void draw(PainterInfo & pi, int x, int y) const;
///
+ void drawSelection(PainterInfo & pi, int x, int y) const;
+ ///
std::string const editMessage() const;
///
- bool insetAllowed(InsetOld::Code) const { return true; }
+ EDITABLE editable() const { return HIGHLY_EDITABLE; }
+ ///
+ bool insetAllowed(InsetBase::Code) const { return true; }
///
bool isTextInset() const { return true; }
/** returns true if, when outputing LaTeX, font changes should
///
void validate(LaTeXFeatures & features) const;
///
- Code lyxCode() const { return InsetOld::TABULAR_CODE; }
- /// get the absolute screen x,y of the cursor
- void getCursorPos(LCursor const & cur, int & x, int & y) const;
+ Code lyxCode() const { return InsetBase::TABULAR_CODE; }
+ /// get offset of this cursor slice relative to our upper left corner
+ void cursorPos(CursorSlice const & sl, bool boundary, int & x, int & y) const;
///
bool tabularFeatures(LCursor & cur, std::string const & what);
///
/// Appends \c list with all labels found within this inset.
void getLabelList(Buffer const &, std::vector<std::string> & list) const;
/// number of cells
- size_t nargs() const;
+ size_t nargs() const { return tabular.getNumberOfCells(); }
///
- InsetText const & cell(int) const;
+ boost::shared_ptr<InsetText const> cell(idx_type) const;
///
- InsetText & cell(int);
+ boost::shared_ptr<InsetText> cell(idx_type);
///
LyXText * getText(int) const;
///
- void markErased();
+ void markErased(bool);
- // this should return true if we have a "normal" cell, otherwise true.
+ // this should return true if we have a "normal" cell, otherwise false.
// "normal" means without width set!
- bool forceDefaultParagraphs(InsetBase const * in) const;
+ /// should all paragraphs be output with "Standard" layout?
+ bool forceDefaultParagraphs(idx_type cell = 0) const;
///
void addPreview(lyx::graphics::PreviewLoader &) const;
/// lock cell with given index
void edit(LCursor & cur, bool left);
///
- InsetBase * editXY(LCursor & cur, int x, int y) const;
+ InsetBase * editXY(LCursor & cur, int x, int y);
/// can we go further down on mouse click?
bool descendable() const { return true; }
protected:
///
- void priv_dispatch(LCursor & cur, FuncRequest & cmd);
+ InsetTabular(InsetTabular const &);
+ ///
+ virtual void doDispatch(LCursor & cur, FuncRequest & cmd);
///
bool getStatus(LCursor & cur, FuncRequest const & cmd, FuncStatus &) const;
-private:
///
- void drawCellLines(Painter &, int x, int baseline,
- int row, int cell) const;
+ int scroll() const { return scx_; }
+
+private:
+ virtual std::auto_ptr<InsetBase> doClone() const;
+
///
- void drawCellSelection(PainterInfo &, int x, int baseline,
- int row, int column, int cell) const;
+ void drawCellLines(Painter &, int x, int y, row_type row,
+ idx_type cell, bool erased) const;
///
- InsetBase * setPos(LCursor & cur, int x, int y) const;
+ void setCursorFromCoordinates(LCursor & cur, int x, int y) const;
///
void moveNextCell(LCursor & cur);
///
void movePrevCell(LCursor & cur);
///
- int getCellXPos(int cell) const;
+ int getCellXPos(idx_type cell) const;
///
void resetPos(LCursor & cur) const;
///
///
void cutSelection(LCursor & cur);
///
- bool isRightToLeft(LCursor & cur);
+ bool isRightToLeft(LCursor & cur) const;
///
- void getSelection(LCursor & cur,
- int & rs, int & re, int & cs, int & ce) const;
+ void getSelection(LCursor & cur, row_type & rs, row_type & re,
+ col_type & cs, col_type & ce) const;
///
bool insertAsciiString(BufferView &, std::string const & buf, bool usePaste);
/// are we operating on several cells?
bool tablemode(LCursor & cur) const;
+ /// return the "Manhattan distance" to nearest corner
+ int dist(idx_type cell, int x, int y) const;
+ /// return the cell nearest to x, y
+ idx_type getNearestCell(int x, int y) const;
+
///
Buffer const * buffer_;
///
- mutable int cursorx_;
+ mutable idx_type first_visible_cell;
///
- mutable int first_visible_cell;
+ mutable int scx_;
};
virtual std::string const & name() const { return name_; }
///
virtual std::string const inset2string(Buffer const &) const;
- /// Returns the active cell if successful, else -1.
- static int string2params(std::string const &, InsetTabular &);
+ ///
+ static void string2params(std::string const &, InsetTabular &);
///
static std::string const params2string(InsetTabular const &);
private:
projects / lyx.git / blobdiff