Cmake export tests: Added sublabel handling also to revertedTests

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

diff --git a/src/mathed/InsetMathGrid.h b/src/mathed/InsetMathGrid.h
index a512969afbcf9e13b745c6df0fe68dd497f18d4e..bd3066db0b2e85b662925eff3c00af65d6987ab3 100644 (file)
--- a/src/mathed/InsetMathGrid.h
+++ b/src/mathed/InsetMathGrid.h
@@ -25,13 +25,23 @@ namespace lyx {
 class InsetMathGrid : public InsetMathNest {
 public:
 
+       enum Multicolumn {
+               /// A normal cell
+               CELL_NORMAL = 0,
+               /// A multicolumn cell. The number of columns is <tt>1 + number
+               /// of CELL_PART_OF_MULTICOLUMN cells</tt> that follow directly
+               CELL_BEGIN_OF_MULTICOLUMN = 1,
+               /// This is a dummy cell (part of a multicolumn cell)
+               CELL_PART_OF_MULTICOLUMN = 2
+       };
+
        /// additional per-cell information
        class CellInfo {
        public:
                ///
                CellInfo();
-               /// a dummy cell before a multicolumn cell
-               int dummy_;
+               /// multicolumn flag
+               Multicolumn multi_;
                /// special multi colums alignment
                docstring align_;
                /// these should be a per-cell property, but ok to have it here
@@ -73,15 +83,13 @@ public:
                ColInfo();
                /// currently possible: 'l', 'c', 'r'
                char align_;
-               /// cache for drawing
-               int h_offset;
                /// cached width
                mutable int width_;
                /// cached offset
                mutable int offset_;
                /// how many lines to the left of this column?
                unsigned int lines_;
-               /// additional amount to be skipped when drawing
+               /// additional amount to the right to be skipped when drawing
                int skip_;
                /// Special alignment.
                /// This does also contain align_ and lines_ if it is nonempty.
@@ -92,11 +100,12 @@ public:
 
 public:
        /// sets nrows and ncols to 1, vertical alingment to 'c'
-       InsetMathGrid();
+       InsetMathGrid(Buffer * buf);
        /// Note: columns first!
-       InsetMathGrid(col_type m, row_type n);
+       InsetMathGrid(Buffer * buf, col_type m, row_type n);
        ///
-       InsetMathGrid(col_type m, row_type n, char valign, docstring const & halign);
+       InsetMathGrid(Buffer * buf, col_type m, row_type n, char valign,
+               docstring const & halign);
        ///
        void metrics(MetricsInfo & mi, Dimension &) const;
        ///
@@ -111,6 +120,8 @@ public:
        void metricsT(TextMetricsInfo const & mi, Dimension & dim) const;
        ///
        void drawT(TextPainter & pi, int x, int y) const;
+       ///
+       void updateBuffer(ParIterator const &, UpdateType);
        /// extract number of columns from alignment string
        static col_type guessColumns(docstring const & halign);
        /// accepts some LaTeX column codes: p,m,!,@,M,<,>
@@ -151,6 +162,8 @@ public:
        col_type col(idx_type idx) const;
        ///
        row_type row(idx_type idx) const;
+       /// number of columns of cell \p idx
+       col_type ncellcols(idx_type idx) const;
 
        ///
        bool idxUpDown(Cursor &, bool up) const;
@@ -184,8 +197,6 @@ public:
        /// swap two columns
        virtual void swapCol(col_type c);
        ///
-       virtual void appendRow();
-       ///
        idx_type index(row_type r, col_type c) const;
        ///
        bool idxBetween(idx_type idx, idx_type from, idx_type to) const;
@@ -195,6 +206,8 @@ public:
        virtual char defaultColAlign(col_type) { return 'c'; }
        ///
        void setDefaults();
+       ///
+       virtual bool interpretString(Cursor & cur, docstring const & str);
 
        ///
        virtual int colsep() const;
@@ -219,6 +232,10 @@ public:
        //void maple(MapleStream &) const;
        ///
        void mathmlize(MathStream &) const;
+       /// 
+       void htmlize(HtmlStream &) const;
+       ///
+       void htmlize(HtmlStream &, std::string attrib) const;
        ///
        //void octave(OctaveStream &) const;
 
@@ -232,12 +249,19 @@ protected:
        int cellXOffset(BufferView const &, idx_type idx) const;
        /// returns y offset of cell compared to inset
        int cellYOffset(idx_type idx) const;
+       /// Width of cell, taking combined columns into account
+       int cellWidth(idx_type idx) const;
        /// returns proper 'end of line' code for LaTeX
-       virtual docstring eolString(row_type row, bool fragile) const;
+       virtual docstring eolString(row_type row, bool fragile, bool latex,
+                       bool last_eoln) const;
        /// returns proper 'end of column' code for LaTeX
        virtual docstring eocString(col_type col, col_type lastcol) const;
        /// splits cells and shifts right part to the next cell
        void splitCell(Cursor & cur);
+       /// Column aligmment for display of cell \p idx.
+       /// Must not be written to file!
+       virtual char displayColAlign(idx_type idx) const;
+
 
        /// row info.
        /// rowinfo_[nrows()] is a dummy row used only for hlines.