some support for det and abs for math-extern

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

diff --git a/src/mathed/math_gridinset.h b/src/mathed/math_gridinset.h
index 25555c1e9182f0abbfdf30d91124a41bcb40f4b9..af3f69e68db6d8081411b9b2e86cbff86a8579c5 100644 (file)
--- a/src/mathed/math_gridinset.h
+++ b/src/mathed/math_gridinset.h
@@ -59,93 +59,106 @@ class MathGridInset : public MathNestInset {
        };
 
 public: 
+       /// Note: columns first!
+       MathGridInset(col_type m, row_type n);
        ///
-       MathGridInset(int m, int n);
+       MathGridInset(int m, int n, char valign, string const & halign);
        ///
-       void write(std::ostream &, bool fragile) const;
+       void write(MathWriteInfo & os) const;
        ///
-       void metrics(MathStyles st) const;
+       void writeNormal(std::ostream &) const;
+       ///
+       void metrics(MathMetricsInfo const & st) const;
        ///
        void draw(Painter &, int x, int y) const;
        ///
        void halign(string const &);
        ///
-       void halign(char c, int col);
+       void halign(char c, col_type col);
        ///
-       char halign(int col) const;
+       char halign(col_type col) const;
        ///
        void valign(char c);
        ///
        char valign() const;
        ///
-       void vskip(LyXLength const &, int row);
-       ///
-       LyXLength vskip(int row) const;
+       void vskip(LyXLength const &, row_type row);
        ///
-       void resize(short int type, int cols);
+       LyXLength vskip(row_type row) const;
        ///
-       const RowInfo & rowinfo(int row) const;
+       void resize(short int type, col_type cols);
        ///
-       RowInfo & rowinfo(int row);
+       const RowInfo & rowinfo(row_type row) const;
        ///
-       bool isGrid() const { return true; }
+       RowInfo & rowinfo(row_type row);
+       /// identifies GridInset
+       virtual MathGridInset * asGridInset() { return this; }
 
        ///
-       int ncols() const { return colinfo_.size(); }
+       col_type ncols() const { return colinfo_.size(); }
        ///
-       int nrows() const { return rowinfo_.size(); }
+       row_type nrows() const { return rowinfo_.size(); }
        ///
-       int col(int idx) const { return idx % ncols(); }
+       col_type col(idx_type idx) const { return idx % ncols(); }
        ///
-       int row(int idx) const { return idx / ncols(); }
+       row_type row(idx_type idx) const { return idx / ncols(); }
        ///
-       int cellXOffset(int idx) const;
+       int cellXOffset(idx_type idx) const;
        ///
-       int cellYOffset(int idx) const;
+       int cellYOffset(idx_type idx) const;
 
        ///
-       bool idxUp(int &, int &) const;
+       bool idxUp(idx_type &, pos_type &) const;
+       ///
+       bool idxDown(idx_type &, pos_type &) const;
+       ///
+       bool idxLeft(idx_type &, pos_type &) const;
        ///
-       bool idxDown(int &, int &) const;
+       bool idxRight(idx_type &, pos_type &) const;
        ///
-       bool idxLeft(int &, int &) const;
+       bool idxFirst(idx_type &, pos_type &) const;
        ///
-       bool idxRight(int &, int &) const;
+       bool idxLast(idx_type &, pos_type &) const;
        ///
-       bool idxFirst(int &, int &) const;
+       bool idxHome(idx_type &, pos_type &) const;
        ///
-       bool idxLast(int &, int &) const;
+       bool idxEnd(idx_type &, pos_type &) const;
        ///
-       void idxDelete(int &, bool &, bool &);
+       void idxDelete(idx_type &, bool &, bool &);
        ///
-       void idxDeleteRange(int, int);
+       void idxDeleteRange(idx_type, idx_type);
                        
        ///
-       void addRow(int);
+       void addRow(row_type);
        ///
-       void delRow(int);
+       void delRow(row_type);
        ///
-       void addCol(int);
+       void addCol(col_type);
        ///
-       void delCol(int);
+       void delCol(col_type);
        ///
        virtual void appendRow();
        ///
-       int index(int row, int col) const;
+       idx_type index(row_type row, col_type col) const;
        ///
-       std::vector<int> idxBetween(int from, int to) const;
+       std::vector<idx_type> idxBetween(idx_type from, idx_type to) const;
        ///
-       virtual int defaultColSpace(int) { return 10; }
+       virtual int defaultColSpace(col_type) { return 10; }
        ///
-       virtual char defaultColAlign(int) { return 'c'; }
+       virtual char defaultColAlign(col_type) { return 'c'; }
        ///
        void setDefaults();
 
+       ///
+       string octavize() const;
+       ///
+       string maplize() const;
+
 protected:
        /// returns proper 'end of line' code for LaTeX
-       string eolString(int row) const;
+       string eolString(row_type row) const;
        /// returns proper 'end of column' code for LaTeX
-       string eocString(int col) const;
+       string eocString(col_type col) const;
 
        /// row info
        std::vector<RowInfo> rowinfo_;