*
* Full author contact details are available in file CREDITS.
*/
-// This is the rewrite of the tabular (table) support.
-// It will probably be a lot of work.
-// One first goal could be to make the inset read the old table format
-// and just output it again... no viewing at all.
+// This is Juergen's rewrite of the tabular (table) support.
-// When making the internal structure of tabular support I really think
-// that STL containers should be used. This will separate the container from
-// the rest of the code, which is a good thing.
-
-// Ideally the tabular support should do as the mathed and use
-// LaTeX in the .lyx file too.
-
-// Things to think of when desingning the new tabular support:
+// Things to think of when designing the new tabular support:
// - color support (colortbl, color)
// - decimal alignment (dcloumn)
// - custom lines (hhline)
// 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
#include "inset.h"
#include "tabular.h"
-#include "frontends/mouse_state.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<InsetBase> 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 insetUnlock(BufferView *);
- ///
- void updateLocal(BufferView *) const;
+ void drawSelection(PainterInfo & pi, int x, int y) const;
///
- bool lockInsetInInset(BufferView *, UpdatableInset *);
+ virtual docstring const editMessage() const;
///
- bool unlockInsetInInset(BufferView *, UpdatableInset *,
- bool lr = false);
+ EDITABLE editable() const { return HIGHLY_EDITABLE; }
///
- int insetInInsetY() const;
+ bool insetAllowed(InsetBase::Code) const { return true; }
///
- UpdatableInset * getLockingInset() const;
+ bool allowSpellCheck() const { return true; }
///
- UpdatableInset * getFirstLockingInsetOfType(InsetOld::Code);
- ///
- bool insertInset(BufferView *, InsetOld *);
- ///
- bool insetAllowed(InsetOld::Code code) const;
- ///
- bool isTextInset() 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 */
///
bool display() const { return tabular.isLongTabular(); }
///
- int latex(Buffer const &, std::ostream &,
- LatexRunParams const &) const;
+ int latex(Buffer const &, odocstream &,
+ OutputParams const &) const;
///
- int ascii(Buffer const &, std::ostream &,
- LatexRunParams const &) const;
+ int plaintext(Buffer const &, odocstream &,
+ OutputParams const &) const;
///
- int linuxdoc(Buffer const &, std::ostream &,
- LatexRunParams const &) const;
- ///
- int docbook(Buffer const &, std::ostream &,
- LatexRunParams const &) const;
+ int docbook(Buffer const &, odocstream &,
+ OutputParams const &) const;
///
void validate(LaTeXFeatures & features) const;
///
- InsetOld::Code lyxCode() const { return InsetOld::TABULAR_CODE; }
- /// FIXME, document
- void getCursorPos(BufferView *, int & x, int & y) const;
- /// Get the absolute document x,y of the cursor
- virtual void getCursor(BufferView &, int &, int &) 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(BufferView * bv, std::string const & what);
+ bool tabularFeatures(LCursor & cur, std::string const & what);
///
- void tabularFeatures(BufferView * bv, LyXTabular::Feature feature,
+ void tabularFeatures(LCursor & cur, LyXTabular::Feature feature,
std::string const & val = std::string());
///
- int getActCell() const { return actcell; }
- ///
- void setFont(BufferView *, LyXFont const &, bool toggleall = false,
- bool selectall = false);
- ///
- LyXText * getLyXText(BufferView const *,
- bool const recursive = false) const;
- ///
- void deleteLyXText(BufferView *, bool recursive = true) const;
- ///
void openLayoutDialog(BufferView *) const;
///
bool showInsetDialog(BufferView *) const;
+ /// number of cells
+ size_t nargs() const { return tabular.getNumberOfCells(); }
///
- FuncStatus getStatus(std::string const & argument) const;
- /// Appends \c list with all labels found within this inset.
- void getLabelList(Buffer const &, std::vector<std::string> & list) const;
- ///
- int scroll(bool recursive=true) const;
- ///
- void scroll(BufferView *bv, float sx) const {
- UpdatableInset::scroll(bv, sx);
- }
+ boost::shared_ptr<InsetText const> cell(idx_type) const;
///
- void scroll(BufferView *bv, int offset) const {
- UpdatableInset::scroll(bv, offset);
- }
- ///
- ParagraphList * getParagraphs(int) const;
- ///
- int numParagraphs() const;
+ boost::shared_ptr<InsetText> cell(idx_type);
///
LyXText * getText(int) const;
- ///
- LyXCursor const & cursor(BufferView *) const;
- ///
- bool allowSpellcheck() const { return true; }
- ///
- WordLangTuple const
- selectNextWordToSpellcheck(BufferView *, float & value) const;
- ///
- void selectSelectedWord(BufferView *);
-
- void markErased();
- /// find next change
- bool nextChange(BufferView *, lyx::pos_type & length);
- ///
- bool searchForward(BufferView *, std::string const &,
- bool = true, bool = false);
- bool searchBackward(BufferView *, std::string const &,
- bool = true, bool = false);
+ /// 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(InsetOld 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;
- //
- // Public structures and variables
- ///
- mutable LyXTabular tabular;
-
- /// are some cells selected ?
- bool hasSelection() const {
- return has_selection;
- }
-
- ///
- virtual BufferView * view() const;
///
Buffer const & buffer() const;
/// set the owning buffer
- void buffer(Buffer * buf);
-protected:
- ///
- virtual
- DispatchResult
- priv_dispatch(FuncRequest const &, idx_type &, pos_type &);
-private:
+ void buffer(Buffer const * buf);
/// lock cell with given index
- void edit(BufferView * bv, int index);
- ///
- void lfunMousePress(FuncRequest const &);
+ void edit(LCursor & cur, bool left);
///
- // the bool return is used to see if we opened a dialog so that we can
- // check this from an outer inset and open the dialog of the outer inset
- // if that one has one!
- ///
- bool lfunMouseRelease(FuncRequest const &);
- ///
- void lfunMouseMotion(FuncRequest const &);
- ///
- void calculate_dimensions_of_cells(MetricsInfo & mi) const;
- ///
- void drawCellLines(Painter &, int x, int baseline,
- int row, int cell) const;
+ InsetBase * editXY(LCursor & cur, int x, int y);
+ /// can we go further down on mouse click?
+ bool descendable() const { return true; }
+
+ //
+ // Public structures and variables
///
- void drawCellSelection(Painter &, int x, int baseline,
- int row, int column, int cell) const;
+ mutable LyXTabular tabular;
+
+protected:
///
- void fitInsetCursor(BufferView *) const;
+ InsetTabular(InsetTabular const &);
///
- void setPos(BufferView *, int x, int y) const;
+ virtual void doDispatch(LCursor & cur, FuncRequest & cmd);
///
- DispatchResult moveRight(BufferView *, bool lock = true);
+ bool getStatus(LCursor & cur, FuncRequest const & cmd, FuncStatus &) const;
///
- DispatchResult moveLeft(BufferView *, bool lock = true);
+ int scroll() const { return scx_; }
+
+private:
+ virtual std::auto_ptr<InsetBase> doClone() const;
+
///
- DispatchResult moveUp(BufferView *, bool lock = true);
+ void drawCellLines(frontend::Painter &, int x, int y, row_type row,
+ idx_type cell, bool erased) const;
///
- DispatchResult moveDown(BufferView *, bool lock = true);
+ void setCursorFromCoordinates(LCursor & cur, int x, int y) const;
+
///
- bool moveNextCell(BufferView *, bool lock = false);
+ void moveNextCell(LCursor & cur);
///
- bool movePrevCell(BufferView *, bool lock = false);
+ void movePrevCell(LCursor & cur);
///
- int getCellXPos(int cell) const;
+ int getCellXPos(idx_type cell) const;
///
- void resetPos(BufferView *) const;
+ void resetPos(LCursor & cur) const;
///
void removeTabularRow();
///
- void clearSelection() const {
- sel_cell_start = sel_cell_end = 0;
- has_selection = false;
- }
- void setSelection(int start, int end) const {
- sel_cell_start = start;
- sel_cell_end = end;
- has_selection = true;
- }
- ///
- bool activateCellInset(BufferView *, int x = 0, int y = 0,
- mouse_button::state button = mouse_button::none,
- bool behind = false);
- ///
- bool insetHit(BufferView * bv, int x, int y) const;
- ///
- bool hasPasteBuffer() const;
- ///
- bool copySelection(BufferView *);
- ///
- bool pasteSelection(BufferView *);
+ bool copySelection(LCursor & cur);
///
- bool cutSelection(BufferParams const & bp);
+ bool pasteSelection(LCursor & cur);
///
- bool isRightToLeft(BufferView *);
+ void cutSelection(LCursor & cur);
///
- void getSelection(int & scol, int & ecol,
- int & srow, int & erow) const;
+ bool isRightToLeft(LCursor & cur) const;
///
- WordLangTuple selectNextWordInt(BufferView *, float & value) 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;
- //
- // Private structures and variables
- ///
- InsetText * the_locking_inset;
- ///
- InsetText * old_locking_inset;
///
Buffer const * buffer_;
///
- mutable int cursorx_;
- ///
- mutable int cursory_;
- ///
- mutable unsigned int inset_x;
- ///
- mutable unsigned int inset_y;
- /// true if a set of cells are selected
- mutable bool has_selection;
- /// the starting cell selection nr
- mutable int sel_cell_start;
- /// the ending cell selection nr
- mutable int sel_cell_end;
- ///
- mutable int actcell;
- ///
- mutable int oldcell;
- ///
- mutable int actcol;
+ mutable idx_type first_visible_cell;
///
- mutable int actrow;
- ///
- mutable int first_visible_cell;
- ///
- bool no_selection;
- ///
- mutable bool locked;
- ///
- mutable int in_reset_pos;
+ mutable int scx_;
};
-#include "mailinset.h"
-
-
class InsetTabularMailer : public MailInset {
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:
std::string const featureAsString(LyXTabular::Feature feature);
+} // namespace lyx
+
#endif
projects / lyx.git / blobdiff