Fix bug 5802 (http://bugzilla.lyx.org/show_bug.cgi?id=5802)

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

diff --git a/src/mathed/InsetMathGrid.h b/src/mathed/InsetMathGrid.h
index b600c71904fd9c28b8d2ac9a00ac145eb2c83dbe..f085f99f1a86b614c9293af3c96db2c2e5516a2f 100644 (file)
--- a/src/mathed/InsetMathGrid.h
+++ b/src/mathed/InsetMathGrid.h
@@ -4,7 +4,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author André Pönitz
+ * \author André Pönitz
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -49,7 +49,7 @@ public:
                ///
                RowInfo();
                ///
-               int skipPixels() const;
+               int skipPixels(MetricsInfo const & mi) const;
                /// cached descent
                mutable int descent_;
                /// cached ascent
@@ -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
@@ -91,18 +91,14 @@ public:
        };
 
 public:
-       /// sets nrows and ncols to 1
+       /// sets nrows and ncols to 1, vertical alingment to 'c'
        InsetMathGrid();
-       /// constructor from columns description, creates one row
-       InsetMathGrid(char valign, docstring const & halign);
        /// Note: columns first!
        InsetMathGrid(col_type m, row_type n);
        ///
        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;
        ///
@@ -115,18 +111,20 @@ public:
        void metricsT(TextMetricsInfo const & mi, Dimension & dim) const;
        ///
        void drawT(TextPainter & pi, int x, int y) const;
+       /// extract number of columns from alignment string
+       static col_type guessColumns(docstring const & halign);
+       /// accepts some LaTeX column codes: p,m,!,@,M,<,>
+       void setHorizontalAlignments(docstring const & align);
        ///
-       void halign(docstring const & align);
-       ///
-       void halign(char c, col_type col);
-       ///
-       char halign(col_type col) const;
+       void setHorizontalAlignment(char c, col_type col);
        ///
-       docstring halign() const;
+       char horizontalAlignment(col_type col) const;
        ///
-       void valign(char c);
+       docstring horizontalAlignments() const;
+       /// 't', 'b', or 'm'
+       void setVerticalAlignment(char c);
        ///
-       char valign() const;
+       char verticalAlignment() const;
        ///
        void vcrskip(Length const &, row_type row);
        ///
@@ -157,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;
        ///
@@ -169,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);
@@ -177,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);
@@ -212,6 +210,10 @@ public:
        ///
        void write(WriteStream & os) const;
        ///
+       void write(WriteStream & os,
+                  row_type beg_row, col_type beg_col,
+                  row_type end_row, col_type end_col) const;
+       ///
        void normalize(NormalStream &) const;
        ///
        //void maple(MapleStream &) const;
@@ -221,12 +223,13 @@ public:
        //void octave(OctaveStream &) const;
 
 protected:
-       virtual void doDispatch(Cursor & cur, FuncRequest & cmd);
+       ///
+       void doDispatch(Cursor & cur, FuncRequest & 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
@@ -234,8 +237,6 @@ protected:
                                      bool fragile) const;
        /// returns proper 'end of column' code for LaTeX
        virtual docstring eocString(col_type col, col_type lastcol) const;
-       /// 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(Cursor & cur);
 
@@ -247,13 +248,14 @@ protected:
        std::vector<ColInfo> colinfo_;
        /// cell info
        std::vector<CellInfo> cellinfo_;
+private:
        ///
        char v_align_; // add approp. type
-private:
-       virtual Inset * clone() const;
+       ///
+       Inset * clone() const;
 };
 
 
-
 } // namespace lyx
+
 #endif