* dynamic macros as described in http://1stein.org/download/dynmacro.pdf

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

diff --git a/src/mathed/InsetMathGrid.h b/src/mathed/InsetMathGrid.h
index 85204ea79620b1f05e1196304fe4f9219492cfa0..7683ad6305a9a22d9cdf99a80cd7b9bc1a67b5b0 100644 (file)
--- a/src/mathed/InsetMathGrid.h
+++ b/src/mathed/InsetMathGrid.h
@@ -13,7 +13,7 @@
 #define MATH_GRID_H
 
 #include "InsetMathNest.h"
-#include "LyXLength.h"
+#include "Length.h"
 
 
 namespace lyx {
@@ -59,7 +59,7 @@ public:
                /// how many hlines above this row?
                unsigned int lines_;
                /// parameter to the line break
-               LyXLength crskip_;
+               Length crskip_;
                /// extra distance between lines
                int skip_;
                /// Is a page break allowed after this row?
@@ -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;
        ///
@@ -123,9 +126,9 @@ public:
        ///
        char valign() const;
        ///
-       void vcrskip(LyXLength const &, row_type row);
+       void vcrskip(Length const &, row_type row);
        ///
-       LyXLength vcrskip(row_type row) const;
+       Length vcrskip(row_type row) const;
        ///
        void resize(short int type, col_type cols);
        ///
@@ -150,15 +153,15 @@ public:
        row_type row(idx_type idx) const;
 
        ///
-       bool idxUpDown(LCursor &, bool up) const;
+       bool idxUpDown(Cursor &, bool up) const;
        ///
-       bool idxLeft(LCursor &) const;
+       bool idxLeft(Cursor &) const;
        ///
-       bool idxRight(LCursor &) const;
+       bool idxRight(Cursor &) const;
        ///
-       bool idxFirst(LCursor &) const;
+       bool idxFirst(Cursor &) const;
        ///
-       bool idxLast(LCursor &) const;
+       bool idxLast(Cursor &) const;
        ///
        bool idxDelete(idx_type & idx);
        /// pulls cell after pressing erase
@@ -216,12 +219,12 @@ public:
        //void octave(OctaveStream &) const;
 
 protected:
-       virtual void doDispatch(LCursor & cur, FuncRequest & cmd);
+       virtual void doDispatch(Cursor & cur, FuncRequest & cmd);
        ///
-       bool getStatus(LCursor & cur, FuncRequest const & cmd,
+       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
@@ -232,7 +235,7 @@ protected:
        /// extract number of columns from alignment string
        col_type guessColumns(docstring const & halign) const;
        /// splits cells and shifts right part to the next cell
-       void splitCell(LCursor & cur);
+       void splitCell(Cursor & cur);
 
        /// row info.
        /// rowinfo_[nrows()] is a dummy row used only for hlines.
@@ -245,7 +248,7 @@ protected:
        ///
        char v_align_; // add approp. type
 private:
-       virtual std::auto_ptr<InsetBase> doClone() const;
+       virtual Inset * clone() const;
 };