Assure correct spacing of colored items in mathed

[lyx.git] / src / mathed / InsetMathGrid.h

diff --git a/src/mathed/InsetMathGrid.h b/src/mathed/InsetMathGrid.h
index 05bb52aea99bc74e1e91f8abc0cb4df32b98daa5..1c8efd1814fe3272e5af0410fb493a740349c694 100644 (file)
--- a/src/mathed/InsetMathGrid.h
+++ b/src/mathed/InsetMathGrid.h
@@ -15,9 +15,12 @@
 #include "InsetMathNest.h"
 #include "Length.h"
 
+#include <map>
 
 namespace lyx {
 
+class BufferParams;
+class BufferView;
 
 /** Gridded math inset base class.
  *  This is the base to all grid-like editable math objects
@@ -41,9 +44,9 @@ public:
                ///
                CellInfo();
                /// multicolumn flag
-               Multicolumn multi_;
-               /// special multi colums alignment
-               docstring align_;
+               Multicolumn multi;
+               /// special multi columns alignment
+               docstring align;
        };
 
        /// additional per-row information
@@ -54,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<BufferView const *, int> 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
@@ -75,25 +78,25 @@ 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);
        ///
@@ -110,7 +113,7 @@ public:
        ///
        void drawT(TextPainter & pi, int x, int y) const;
        ///
-       void updateBuffer(ParIterator const &, UpdateType);
+       void updateBuffer(ParIterator const &, UpdateType, bool const deleted = false);
        /// extract number of columns from alignment string
        static col_type guessColumns(docstring const & halign);
        /// accepts some LaTeX column codes: p,m,!,@,M,<,>
@@ -162,10 +165,10 @@ public:
        bool idxBackward(Cursor &) const;
        ///
        bool idxForward(Cursor &) const;
-       ///
-       bool idxFirst(Cursor &) const;
-       ///
-       bool idxLast(Cursor &) const;
+       //
+       idx_type firstIdx() const;
+       //
+       idx_type lastIdx() const;
        ///
        bool idxDelete(idx_type & idx);
        /// pulls cell after pressing erase
@@ -225,7 +228,7 @@ public:
        //void maple(MapleStream &) const;
        ///
        void mathmlize(MathStream &) const;
-       /// 
+       ///
        void htmlize(HtmlStream &) const;
        ///
        void htmlize(HtmlStream &, std::string attrib) const;
@@ -243,7 +246,7 @@ protected:
        /// 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;
        ///
@@ -267,15 +270,20 @@ protected:
 
        // 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 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(row_type row, unsigned int line) const;
+       int hLineVOffset(BufferView const &, row_type row, unsigned int line) const;
+
+       ///
+       InsetCode lyxCode() const { return MATH_GRID_CODE; }
 
+private:
        /// row info.
        /// rowinfo_[nrows()] is a dummy row used only for hlines.
        std::vector<RowInfo> rowinfo_;
@@ -284,10 +292,6 @@ protected:
        std::vector<ColInfo> colinfo_;
        /// cell info
        std::vector<CellInfo> cellinfo_;
-       ///
-       InsetCode lyxCode() const { return MATH_GRID_CODE; }
-
-private:
        ///
        char v_align_; // FIXME: add approp. type
        ///