Change the interface to a paragraph's layout. We still store a LayoutPtr, but now...

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

diff --git a/src/mathed/InsetMathGrid.h b/src/mathed/InsetMathGrid.h
index ba221fdc480416a1595d3d2f29062ada1c0f0d0b..da309998d19142ba8128a23bac9f322257ce8dfc 100644 (file)
--- a/src/mathed/InsetMathGrid.h
+++ b/src/mathed/InsetMathGrid.h
@@ -63,7 +63,7 @@ public:
                /// extra distance between lines
                int skip_;
                /// Is a page break allowed after this row?
-               bool allow_pagebreak_;
+               bool allow_newpage_;
        };
 
        // additional per-row information
@@ -83,6 +83,11 @@ public:
                unsigned int lines_;
                /// additional amount to be skipped when drawing
                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_;
        };
 
 public:
@@ -95,9 +100,7 @@ public:
        ///
        InsetMathGrid(col_type m, row_type n, char valign, docstring const & halign);
        ///
-       void metrics(MetricsInfo & mi) const;
-       ///
-       bool metrics(MetricsInfo & mi, Dimension &) const;
+       void metrics(MetricsInfo & mi, Dimension &) const;
        ///
        void draw(PainterInfo & pi, int x, int y) const;
        ///
@@ -152,9 +155,9 @@ public:
        ///
        bool idxUpDown(Cursor &, bool up) const;
        ///
-       bool idxLeft(Cursor &) const;
+       bool idxBackward(Cursor &) const;
        ///
-       bool idxRight(Cursor &) const;
+       bool idxForward(Cursor &) const;
        ///
        bool idxFirst(Cursor &) const;
        ///
@@ -164,7 +167,7 @@ public:
        /// pulls cell after pressing erase
        void idxGlue(idx_type idx);
 
-       /// add a row
+       /// add a row, one row down
        virtual void addRow(row_type r);
        /// delete a row
        virtual void delRow(row_type r);
@@ -172,7 +175,7 @@ public:
        virtual void copyRow(row_type r);
        /// swap two rows
        virtual void swapRow(row_type r);
-       /// add a column
+       /// add a column, here
        virtual void addCol(col_type c);
        /// delete a column
        virtual void delCol(col_type c);
@@ -221,7 +224,7 @@ protected:
        bool getStatus(Cursor & cur, FuncRequest const & cmd,
                FuncStatus & flag) const;
        /// returns x offset of cell compared to inset
-       int cellXOffset(idx_type idx) const;
+       int cellXOffset(BufferView const &, idx_type idx) const;
        /// returns y offset of cell compared to inset
        int cellYOffset(idx_type idx) const;
        /// returns proper 'end of line' code for LaTeX
@@ -245,7 +248,7 @@ protected:
        ///
        char v_align_; // add approp. type
 private:
-       virtual std::auto_ptr<InsetBase> doClone() const;
+       virtual Inset * clone() const;
 };