X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathGrid.h;h=df834491916fef5d0796915fb952818a692aada3;hb=6a21ec854b356fbbc89aaf99b2a23e4c3de4aca6;hp=e99431083eaad9703e35c9929831e94e1d1904d6;hpb=bb5470b5d1ec1b2f7394164686d6035a0c4bce0f;p=lyx.git diff --git a/src/mathed/InsetMathGrid.h b/src/mathed/InsetMathGrid.h index e99431083e..df83449191 100644 --- a/src/mathed/InsetMathGrid.h +++ b/src/mathed/InsetMathGrid.h @@ -13,11 +13,14 @@ #define MATH_GRID_H #include "InsetMathNest.h" -#include "Length.h" +#include "support/Length.h" + +#include namespace lyx { +class BufferView; /** Gridded math inset base class. * This is the base to all grid-like editable math objects @@ -41,16 +44,9 @@ public: /// CellInfo(); /// multicolumn flag - Multicolumn multi_; - /// special multi colums alignment - docstring align_; - /// these should be a per-cell property, but ok to have it here - /// for single-column grids like paragraphs - mutable int glue_; - /// - mutable pos_type begin_; - /// - mutable pos_type end_; + Multicolumn multi; + /// special multi columns alignment + docstring align; }; /// additional per-row information @@ -61,19 +57,19 @@ public: /// int skipPixels(MetricsInfo const & mi) const; /// cached descent - mutable int descent_; + mutable int descent; /// cached ascent - mutable int ascent_; - /// cached offset - mutable int offset_; + mutable int ascent; + /// cached offset for each bufferview + mutable std::map offset; /// how many hlines above this row? - unsigned int lines_; + unsigned int lines; /// parameter to the line break - Length crskip_; + Length crskip; /// extra distance between lines - int skip_; + int skip; /// Is a page break allowed after this row? - bool allow_newpage_; + bool allow_newpage; }; // additional per-row information @@ -82,46 +78,42 @@ public: /// ColInfo(); /// currently possible: 'l', 'c', 'r' - char align_; + char align; /// cached width - mutable int width_; + mutable int width; /// cached offset - mutable int offset_; + mutable int offset; /// how many lines to the left of this column? - unsigned int lines_; + unsigned int lines; /// additional amount to the right to be skipped when drawing - int skip_; + int skip; /// Special alignment. /// This does also contain align_ and lines_ if it is nonempty. /// It needs to be in sync with align_ and lines_ because some /// code only uses align_ and lines_. - docstring special_; + docstring special; }; public: - /// sets nrows and ncols to 1, vertical alingment to 'c' - InsetMathGrid(Buffer * buf); + /// sets nrows and ncols to 1, vertical alignment to 'c' + explicit InsetMathGrid(Buffer * buf); /// Note: columns first! InsetMathGrid(Buffer * buf, col_type m, row_type n); /// InsetMathGrid(Buffer * buf, col_type m, row_type n, char valign, docstring const & halign); /// - void metrics(MetricsInfo & mi, Dimension &) const; + marker_type marker(BufferView const *) const override { return MARKER2; }; /// - void draw(PainterInfo & pi, int x, int y) const; + void metrics(MetricsInfo & mi, Dimension &) const override; /// - void drawWithMargin(PainterInfo & pi, int x, int y, - int lmargin = 0, int rmargin = 0) const; - /// draw decorations. - void drawDecoration(PainterInfo & pi, int x, int y) const - { drawMarkers2(pi, x, y); } + void draw(PainterInfo & pi, int x, int y) const override; /// - void metricsT(TextMetricsInfo const & mi, Dimension & dim) const; + void metricsT(TextMetricsInfo const & mi, Dimension & dim) const override; /// - void drawT(TextPainter & pi, int x, int y) const; + void drawT(TextPainter & pi, int x, int y) const override; /// - void updateBuffer(ParIterator const &, UpdateType); + void updateBuffer(ParIterator const &, UpdateType, bool const deleted = false) override; /// extract number of columns from alignment string static col_type guessColumns(docstring const & halign); /// accepts some LaTeX column codes: p,m,!,@,M,<,> @@ -151,34 +143,36 @@ public: /// CellInfo & cellinfo(idx_type idx) { return cellinfo_[idx]; } /// identifies GridInset - InsetMathGrid * asGridInset() { return this; } + InsetMathGrid * asGridInset() override { return this; } /// identifies GridInset - InsetMathGrid const * asGridInset() const { return this; } + InsetMathGrid const * asGridInset() const override { return this; } + // + bool isTable() const override { return true; } /// - col_type ncols() const; + col_type ncols() const override; /// - row_type nrows() const; + row_type nrows() const override; /// - col_type col(idx_type idx) const; + col_type col(idx_type idx) const override; /// - row_type row(idx_type idx) const; + row_type row(idx_type idx) const override; /// number of columns of cell \p idx col_type ncellcols(idx_type idx) const; /// - bool idxUpDown(Cursor &, bool up) const; - /// - bool idxBackward(Cursor &) const; - /// - bool idxForward(Cursor &) const; + bool idxUpDown(Cursor &, bool up) const override; /// - bool idxFirst(Cursor &) const; + bool idxBackward(Cursor &) const override; /// - bool idxLast(Cursor &) const; + bool idxForward(Cursor &) const override; + // + idx_type firstIdx() const override; + // + idx_type lastIdx() const override; /// - bool idxDelete(idx_type & idx); + bool idxDelete(idx_type & idx) override; /// pulls cell after pressing erase - void idxGlue(idx_type idx); + void idxGlue(idx_type idx) override; /// add a row, one row down virtual void addRow(row_type r); @@ -197,9 +191,9 @@ public: /// swap two columns virtual void swapCol(col_type c); /// - idx_type index(row_type r, col_type c) const; + idx_type index(row_type r, col_type c) const override; /// - bool idxBetween(idx_type idx, idx_type from, idx_type to) const; + bool idxBetween(idx_type idx, idx_type from, idx_type to) const override; /// virtual int defaultColSpace(col_type) { return 0; } /// @@ -207,7 +201,7 @@ public: /// void setDefaults(); /// - virtual bool interpretString(Cursor & cur, docstring const & str); + bool interpretString(Cursor & cur, docstring const & str) override; /// virtual int colsep() const; @@ -219,38 +213,47 @@ public: virtual int vlinesep() const; /// virtual int border() const; + /// + virtual bool handlesMulticolumn() const { return false; } /// - void write(WriteStream & os) const; + void write(WriteStream & os) const override; /// void write(WriteStream & os, row_type beg_row, col_type beg_col, row_type end_row, col_type end_col) const; /// - void normalize(NormalStream &) const; + void normalize(NormalStream &) const override; + /// + //void maple(MapleStream &) const override; + /// + void mathmlize(MathStream &) const override; /// - //void maple(MapleStream &) const; + void htmlize(HtmlStream &) const override; /// - void mathmlize(MathStream &) const; - /// - void htmlize(HtmlStream &) const; + void htmlize(HtmlStream &, std::string const & attrib) const; /// - void htmlize(HtmlStream &, std::string attrib) const; + void validate(LaTeXFeatures & features) const override; /// - //void octave(OctaveStream &) const; + //void octave(OctaveStream &) const override; protected: /// - void doDispatch(Cursor & cur, FuncRequest & cmd); + void doDispatch(Cursor & cur, FuncRequest & cmd) override; /// bool getStatus(Cursor & cur, FuncRequest const & cmd, - FuncStatus & flag) const; + FuncStatus & flag) const override; /// returns x offset of cell compared to inset int cellXOffset(BufferView const &, idx_type idx) const; /// returns y offset of cell compared to inset - int cellYOffset(idx_type idx) const; + int cellYOffset(BufferView const &, idx_type idx) const; /// Width of cell, taking combined columns into account int cellWidth(idx_type idx) const; + /// + virtual int leftMargin() const { return 0; } + /// + virtual int rightMargin() const { return 0; } + /// returns proper 'end of line' code for LaTeX virtual docstring eolString(row_type row, bool fragile, bool latex, bool last_eoln) const; @@ -258,20 +261,29 @@ protected: virtual docstring eocString(col_type col, col_type lastcol) const; /// splits cells and shifts right part to the next cell void splitCell(Cursor & cur); - /// Column alignment for display of cell \p idx. + /// Column alignment for display of cell \p idx. /// Must not be written to file! virtual char displayColAlign(idx_type idx) const; - /// Column spacing for display of column \p col. - /// Must not be written to file! - virtual int displayColSpace(col_type col) const; - - // The following two functions are used in InsetMathHull and - // InsetMathSplit. - /// The value of a fixed col align for a certain hull type - static char colAlign(HullType type, col_type col); - /// The value of a fixed col spacing for a certain hull type - static int colSpace(HullType type, col_type col); + /// Column spacing for display of column \p col. + /// Must not be written to file! + virtual int displayColSpace(col_type col) const; + + // The following two functions are used in InsetMathHull and + // InsetMathSplit. + /// The value of a fixed col align for a certain hull type (can + /// depend on the "indent math" setting). + char colAlign(HullType type, col_type col) const; + /// The value of a fixed col spacing for a certain hull type + static int colSpace(HullType type, col_type col); + + /// positions of vertical and horizontal lines + int vLineHOffset(col_type col, unsigned int line) const; + int hLineVOffset(BufferView const &, row_type row, unsigned int line) const; + + /// + InsetCode lyxCode() const override { return MATH_GRID_CODE; } +private: /// row info. /// rowinfo_[nrows()] is a dummy row used only for hlines. std::vector rowinfo_; @@ -281,13 +293,9 @@ protected: /// cell info std::vector cellinfo_; /// - InsetCode lyxCode() const { return MATH_GRID_CODE; } - -private: - /// - char v_align_; // add approp. type + char v_align_; // FIXME: add approp. type /// - Inset * clone() const; + Inset * clone() const override; };