X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsettabular.h;h=21c7a728fa05cdd924df6f3402e71d32007f97d4;hb=e28331ed63062dea10d0a21b9ec12034b4b17b9a;hp=1cba92dfde61dbff35daeb06ac98028f65085fa3;hpb=d194cfffa5f68f425cff20770956f81c74cf9d0f;p=lyx.git diff --git a/src/insets/insettabular.h b/src/insets/insettabular.h index 1cba92dfde..21c7a728fa 100644 --- a/src/insets/insettabular.h +++ b/src/insets/insettabular.h @@ -10,10 +10,7 @@ */ -// 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) @@ -27,10 +24,7 @@ // 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 @@ -40,41 +34,47 @@ #include "inset.h" #include "tabular.h" +#include "mailinset.h" + +namespace lyx { class FuncStatus; class LyXLex; -class Painter; class BufferView; class Buffer; class BufferParams; class Paragraph; class CursorSlice; +namespace frontend { class Painter; } -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 clone() const; - /// void read(Buffer const &, LyXLex &); /// void write(Buffer const &, std::ostream &) const; /// - void metrics(MetricsInfo &, Dimension &) const; + bool metrics(MetricsInfo &, Dimension &) const; /// void draw(PainterInfo & pi, int x, int y) const; /// - std::string const editMessage() const; + void drawSelection(PainterInfo & pi, int x, int y) const; /// - bool insetAllowed(InsetOld::Code) const { return true; } + virtual docstring const editMessage() const; /// - bool isTextInset() const { return true; } + EDITABLE editable() const { return HIGHLY_EDITABLE; } + /// + bool insetAllowed(InsetBase::Code) const { return true; } + /// + bool allowSpellCheck() const { return true; } + /// + bool canTrackChanges() const { return true; } /** returns true if, when outputing LaTeX, font changes should be closed before generating this inset. This is needed for insets that may contain several paragraphs */ @@ -82,23 +82,21 @@ public: /// bool display() const { return tabular.isLongTabular(); } /// - int latex(Buffer const &, std::ostream &, + int latex(Buffer const &, odocstream &, OutputParams const &) const; /// - int plaintext(Buffer const &, std::ostream &, + int plaintext(Buffer const &, odocstream &, OutputParams const &) const; /// - int linuxdoc(Buffer const &, std::ostream &, - OutputParams const &) const; - /// - int docbook(Buffer const &, std::ostream &, + int docbook(Buffer const &, odocstream &, OutputParams const &) const; /// 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(BufferView const & bv, CursorSlice const & sl, + bool boundary, int & x, int & y) const; /// bool tabularFeatures(LCursor & cur, std::string const & what); /// @@ -108,26 +106,29 @@ public: void openLayoutDialog(BufferView *) const; /// bool showInsetDialog(BufferView *) const; - /// Appends \c list with all labels found within this inset. - void getLabelList(Buffer const &, std::vector & list) const; /// number of cells - size_t nargs() const; + size_t nargs() const { return tabular.getNumberOfCells(); } /// - InsetText const & cell(int) const; + boost::shared_ptr cell(idx_type) const; /// - InsetText & cell(int); + boost::shared_ptr cell(idx_type); /// LyXText * getText(int) const; - /// - void markErased(); + /// set the change for the entire inset + void setChange(Change const & change); + /// accept the changes within the inset + void acceptChanges(); + /// reject the changes within the inset + void rejectChanges(); - // 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; + void addPreview(graphics::PreviewLoader &) const; /// Buffer const & buffer() const; @@ -137,7 +138,7 @@ public: /// 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; } @@ -148,32 +149,34 @@ public: 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 doClone() const; + /// - void drawCellSelection(PainterInfo &, int x, int baseline, - int row, int column, int cell) const; + void drawCellLines(frontend::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 removeTabularRow(); /// - bool hasPasteBuffer() const; - /// bool copySelection(LCursor & cur); /// bool pasteSelection(LCursor & cur); @@ -182,25 +185,27 @@ private: /// 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); + bool insertPlaintextString(BufferView &, docstring const & buf, bool usePaste); /// are we operating on several cells? bool tablemode(LCursor & cur) const; + /// return the "Manhattan distance" to nearest corner + int dist(BufferView &, idx_type cell, int x, int y) const; + /// return the cell nearest to x, y + idx_type getNearestCell(BufferView &, 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_; }; -#include "mailinset.h" - - class InsetTabularMailer : public MailInset { public: /// @@ -211,8 +216,8 @@ public: 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: @@ -224,4 +229,6 @@ private: std::string const featureAsString(LyXTabular::Feature feature); +} // namespace lyx + #endif