make \newcommand{\bb}[1]{\mathbf{#1}} work for read/write/display.

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

diff --git a/src/mathed/math_gridinset.h b/src/mathed/math_gridinset.h
index 2bea095771d9df82a58ca7a7f813d99570319937..286aa953dd1f14fd3d2af1459585eb26d1efa116 100644 (file)
--- a/src/mathed/math_gridinset.h
+++ b/src/mathed/math_gridinset.h
@@ -30,12 +30,12 @@ class MathGridInset : public MathNestInset {
                mutable int ascent_;
                /// cached offset
                mutable int offset_;
-               /// hline abow this row?
-               bool upperline_;
-               /// hline below this row?
-               bool lowerline_;
-               /// distance
-               LyXLength skip_;
+               /// how many hlines above this row?
+               int lines_;
+               /// parameter to the line break
+               LyXLength crskip_;
+               /// extra distance between lines
+               int skip_;
        };
 
        // additional per-row information
@@ -54,98 +54,123 @@ class MathGridInset : public MathNestInset {
                bool leftline_;
                /// do we need a line to the right?
                bool rightline_;
+               /// how many lines to the left of this column?
+               int lines_;
                /// additional amount to be skipped when drawing
                int skip_;
        };
 
 public: 
+       /// constructor from columns description, creates one row
+       MathGridInset(char valign, string const & halign);
+       /// Note: columns first!
+       MathGridInset(col_type m, row_type n);
        ///
-       MathGridInset(unsigned int m, unsigned int n);
+       MathGridInset(col_type m, row_type n, char valign, string const & halign);
        ///
-       void write(std::ostream &, bool fragile) const;
+       MathInset * clone() const;
        ///
-       void metrics(MathStyles st) const;
+       void metrics(MathMetricsInfo const & st) const;
        ///
        void draw(Painter &, int x, int y) const;
        ///
        void halign(string const &);
        ///
-       void halign(char c, unsigned int col);
+       void halign(char c, col_type col);
+       ///
+       char halign(col_type col) const;
        ///
-       char halign(unsigned int col) const;
+       string halign() const;
        ///
        void valign(char c);
        ///
        char valign() const;
        ///
-       void vskip(LyXLength const &, unsigned int row);
-       ///
-       LyXLength vskip(unsigned int row) const;
+       void vcrskip(LyXLength const &, row_type row);
        ///
-       void resize(short int type, unsigned int cols);
+       LyXLength vcrskip(row_type row) const;
        ///
-       const RowInfo & rowinfo(unsigned int row) const;
+       void resize(short int type, col_type cols);
        ///
-       RowInfo & rowinfo(unsigned int row);
-       ///
-       bool isGrid() const { return true; }
+       const RowInfo & rowinfo(row_type row) const;
+       /// returns topmost row if passed (-1)
+       RowInfo & rowinfo(row_type row);
+       /// identifies GridInset
+       virtual MathGridInset * asGridInset() { return this; }
 
        ///
-       unsigned int ncols() const { return colinfo_.size(); }
+       col_type ncols() const;
        ///
-       unsigned int nrows() const { return rowinfo_.size(); }
+       row_type nrows() const;
        ///
-       unsigned int col(unsigned int idx) const { return idx % ncols(); }
+       col_type col(idx_type idx) const;
        ///
-       unsigned int row(unsigned int idx) const { return idx / ncols(); }
+       row_type row(idx_type idx) const;
        ///
-       int cellXOffset(unsigned int idx) const;
+       int cellXOffset(idx_type idx) const;
        ///
-       int cellYOffset(unsigned int idx) const;
+       int cellYOffset(idx_type idx) const;
 
        ///
-       bool idxUp(unsigned int &, unsigned int &) const;
+       bool idxUp(idx_type &) const;
+       ///
+       bool idxDown(idx_type &) const;
+       ///
+       bool idxLeft(idx_type &, pos_type &) const;
        ///
-       bool idxDown(unsigned int &, unsigned int &) const;
+       bool idxRight(idx_type &, pos_type &) const;
        ///
-       bool idxLeft(unsigned int &, unsigned int &) const;
+       bool idxFirst(idx_type &, pos_type &) const;
        ///
-       bool idxRight(unsigned int &, unsigned int &) const;
+       bool idxLast(idx_type &, pos_type &) const;
        ///
-       bool idxFirst(unsigned int &, unsigned int &) const;
+       bool idxHome(idx_type &, pos_type &) const;
        ///
-       bool idxLast(unsigned int &, unsigned int &) const;
+       bool idxEnd(idx_type &, pos_type &) const;
        ///
-       void idxDelete(unsigned int &, bool &, bool &);
+       void idxDelete(idx_type &, bool &, bool &);
        ///
-       void idxDeleteRange(unsigned int, unsigned int);
+       void idxDeleteRange(idx_type, idx_type);
                        
        ///
-       void addRow(unsigned int);
+       virtual void addRow(row_type);
        ///
-       void delRow(unsigned int);
+       virtual void delRow(row_type);
        ///
-       void addCol(unsigned int);
+       virtual void addCol(col_type);
        ///
-       void delCol(unsigned int);
+       virtual void delCol(col_type);
        ///
        virtual void appendRow();
        ///
-       unsigned int index(unsigned int row, unsigned int col) const;
+       idx_type index(row_type row, col_type col) const;
        ///
-       std::vector<unsigned int> idxBetween(unsigned int from, unsigned int to) const;
+       std::vector<idx_type> idxBetween(idx_type from, idx_type to) const;
        ///
-       virtual int defaultColSpace(unsigned int) { return 10; }
+       virtual int defaultColSpace(col_type) { return 0; }
        ///
-       virtual char defaultColAlign(unsigned int) { return 'c'; }
+       virtual char defaultColAlign(col_type) { return 'c'; }
        ///
        void setDefaults();
 
+       ///
+       void write(WriteStream & os) const;
+       ///
+       void normalize(NormalStream &) const;
+       ///
+       //void maplize(MapleStream &) const;
+       ///
+       void mathmlize(MathMLStream &) const;
+       ///
+       //void octavize(OctaveStream &) const;
+
 protected:
        /// returns proper 'end of line' code for LaTeX
-       string eolString(unsigned int row) const;
+       string eolString(row_type row) const;
        /// returns proper 'end of column' code for LaTeX
-       string eocString(unsigned int col) const;
+       string eocString(col_type col) const;
+       /// extract number of columns from alignment string
+       col_type guessColumns(string const & halign) const;
 
        /// row info
        std::vector<RowInfo> rowinfo_;