Pure HTML output for math macros.

[lyx.git] / src / insets / InsetTabular.h

diff --git a/src/insets/InsetTabular.h b/src/insets/InsetTabular.h
index ecf36f9b9d1b5948354bc9c361c4443dd61ea70c..9e3f532f390b70d7ff8e218ae27f041b28c90ed5 100644 (file)
--- a/src/insets/InsetTabular.h
+++ b/src/insets/InsetTabular.h
@@ -72,12 +72,20 @@ public:
                ///
                COPY_COLUMN,
                ///
-               TOGGLE_LINE_TOP,
+               SET_LINE_TOP,
                ///
-               TOGGLE_LINE_BOTTOM,
+               SET_LINE_BOTTOM,
                ///
-               TOGGLE_LINE_LEFT,
+               SET_LINE_LEFT,
                ///
+               SET_LINE_RIGHT,
+               ///FIXME: remove
+               TOGGLE_LINE_TOP,
+               ///FIXME: remove
+               TOGGLE_LINE_BOTTOM,
+               ///FIXME: remove
+               TOGGLE_LINE_LEFT,
+               ///FIXME: remove
                TOGGLE_LINE_RIGHT,
                ///
                ALIGN_LEFT,
@@ -264,13 +272,6 @@ public:
        /// Returns true if there is a topline, returns false if not
        bool rightLine(idx_type cell) const;
 
-       ///
-       bool topAlreadyDrawn(idx_type cell) const;
-       ///
-       bool leftAlreadyDrawn(idx_type cell) const;
-       ///
-       bool isLastRow(idx_type cell) const;
-
        /// return space occupied by the second horizontal line and
        /// interline space above row \p row in pixels
        int interRowSpace(row_type row) const;
@@ -281,12 +282,16 @@ public:
        ///
        int columnWidth(idx_type cell) const;
        ///
-       int rowHeight(idx_type cell) const;
+       int cellHeight(idx_type cell) const;
        ///
        int width() const;
        ///
        int height() const;
        ///
+       row_type nrows() const {return row_info.size();}
+       ///
+       col_type ncols() const {return column_info.size();}
+       ///
        int rowAscent(row_type row) const;
        ///
        int rowDescent(row_type row) const;
@@ -297,8 +302,6 @@ public:
        ///
        void setCellWidth(idx_type cell, int new_width);
        ///
-       void setAllLines(idx_type cell, bool line);
-       ///
        void setTopLine(idx_type cell, bool line);
        ///
        void setBottomLine(idx_type cell, bool line);
@@ -376,9 +379,7 @@ public:
        ///
        bool isMultiColumn(idx_type cell) const;
        ///
-       bool isMultiColumnReal(idx_type cell) const;
-       ///
-       void setMultiColumn(idx_type cell, idx_type number);
+       idx_type setMultiColumn(idx_type cell, idx_type number);
        ///
        void unsetMultiColumn(idx_type cell);
        ///
@@ -388,7 +389,7 @@ public:
        ///
        bool isMultiRow(idx_type cell) const;
        ///
-       void setMultiRow(idx_type cell, idx_type number);
+       idx_type setMultiRow(idx_type cell, idx_type number);
        ///
        void unsetMultiRow(idx_type cell);
        ///
@@ -396,8 +397,6 @@ public:
        ///
        col_type cellColumn(idx_type cell) const;
        ///
-       col_type cellRightColumn(idx_type cell) const;
-       ///
        void setRotateCell(idx_type cell, bool);
        ///
        bool getRotateCell(idx_type cell) const;
@@ -492,6 +491,8 @@ public:
                ///
                VAlignment valignment;
                ///
+               int voffset;
+               ///
                bool top_line;
                ///
                bool bottom_line;
@@ -840,7 +841,7 @@ public:
        /// can we go further down on mouse click?
        bool descendable(BufferView const &) const { return true; }
        /// Update the counters of this inset and of its contents
-       void updateLabels(ParIterator const &, UpdateType);
+       void updateBuffer(ParIterator const &, UpdateType);
        ///
        void addToToc(DocIterator const &);
 
@@ -911,8 +912,6 @@ private:
        ///
        void resetPos(Cursor & cur) const;
        ///
-       void removeTabularRow();
-       ///
        bool copySelection(Cursor & cur);
        ///
        bool pasteClipboard(Cursor & cur);