tex2lyx/text.cpp: fix typos

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

diff --git a/src/insets/InsetTabular.h b/src/insets/InsetTabular.h
index 8d1c56c0dceba0c90a12778f13d179858bf148bf..80958cc8a856cbb24938d070c2913356b739b2f8 100644 (file)
--- a/src/insets/InsetTabular.h
+++ b/src/insets/InsetTabular.h
@@ -233,6 +233,7 @@ public:
                UNSET_LTLASTFOOT,
                ///
                SET_LTNEWPAGE,
+               UNSET_LTNEWPAGE,
                ///
                TOGGLE_LTCAPTION,
                ///
@@ -317,6 +318,19 @@ public:
                BOX_MINIPAGE = 2
        };
 
+       enum CaptionType {
+               ///
+               CAPTION_FIRSTHEAD,
+               ///
+               CAPTION_HEAD,
+               ///
+               CAPTION_FOOT,
+               ///
+               CAPTION_LASTFOOT,
+               ///
+               CAPTION_ANY
+       };
+
        class ltType {
        public:
                // constructor
@@ -431,17 +445,21 @@ public:
        ///
        int textVOffset(idx_type cell) const;
        ///
-       void appendRow(idx_type cell);
+       void appendRow(row_type row);
        ///
        void deleteRow(row_type row);
        ///
-       void copyRow(row_type);
+       void copyRow(row_type row);
+       ///  
+       void insertRow(row_type row, bool copy);
        ///
-       void appendColumn(idx_type cell);
+       void appendColumn(col_type column);
        ///
        void deleteColumn(col_type column);
        ///
-       void copyColumn(col_type);
+       void copyColumn(col_type column);
+       ///
+       void insertColumn(col_type column, bool copy);
        ///
        idx_type getFirstCellInRow(row_type row) const;
        ///
@@ -465,7 +483,8 @@ public:
        ///
        bool isMultiColumn(idx_type cell) const;
        ///
-       idx_type setMultiColumn(idx_type cell, idx_type number);
+       idx_type setMultiColumn(idx_type cell, idx_type number,
+                            bool const right_border);
        ///
        void unsetMultiColumn(idx_type cell);
        ///
@@ -475,7 +494,8 @@ public:
        ///
        bool isMultiRow(idx_type cell) const;
        ///
-       idx_type setMultiRow(idx_type cell, idx_type number);
+       idx_type setMultiRow(idx_type cell, idx_type number,
+                            bool const bottom_border);
        ///
        void unsetMultiRow(idx_type cell);
        ///
@@ -483,9 +503,9 @@ public:
        ///
        col_type cellColumn(idx_type cell) const;
        ///
-       void setRotateCell(idx_type cell, bool);
+       void setRotateCell(idx_type cell, int);
        ///
-       bool getRotateCell(idx_type cell) const;
+       int getRotateCell(idx_type cell) const;
        ///
        bool needRotating() const;
        ///
@@ -503,8 +523,6 @@ public:
        //
        // Long Tabular Options support functions
        ///
-       bool checkLTType(row_type row, ltType const &) const;
-       ///
        void setLTHead(row_type row, bool flag, ltType const &, bool first);
        ///
        bool getRowOfLTHead(row_type row, ltType &) const;
@@ -525,15 +543,15 @@ public:
        ///
        bool ltCaption(row_type row) const;
        ///
-       bool haveLTHead() const;
+       bool haveLTHead(bool withcaptions = true) const;
        ///
-       bool haveLTFirstHead() const;
+       bool haveLTFirstHead(bool withcaptions = true) const;
        ///
-       bool haveLTFoot() const;
+       bool haveLTFoot(bool withcaptions = true) const;
        ///
-       bool haveLTLastFoot() const;
+       bool haveLTLastFoot(bool withcaptions = true) const;
        ///
-       bool haveLTCaption() const;
+       bool haveLTCaption(CaptionType captiontype = CAPTION_ANY) const;
        ///
        // end longtable support
        ///
@@ -595,7 +613,7 @@ public:
                ///
                BoxType usebox;
                ///
-               bool rotate;
+               int rotate;
                ///
                docstring align_special;
                ///
@@ -685,7 +703,7 @@ public:
        ///
        bool use_booktabs;
        ///
-       bool rotate;
+       int rotate;
        ///
        VAlignment tabular_valignment;
        //
@@ -803,10 +821,10 @@ public:
        bool allowSpellCheck() const { return true; }
        ///
        bool canTrackChanges() const { return true; }
-       /** returns true if, when outputing LaTeX, font changes should
+       /** returns false if, when outputing LaTeX, font changes should
            be closed before generating this inset. This is needed for
            insets that may contain several paragraphs */
-       bool noFontChange() const { return true; }
+       bool inheritFont() const { return false; }
        ///
        DisplayType display() const;
        ///
@@ -822,9 +840,9 @@ public:
        ///
        InsetCode lyxCode() const { return TABULAR_CODE; }
        ///
-       docstring contextMenu(BufferView const &, int, int) const;
+       std::string contextMenu(BufferView const &, int, int) const;
        ///
-       docstring contextMenuName() const;
+       std::string contextMenuName() const;
        /// get offset of this cursor slice relative to our upper left corner
        void cursorPos(BufferView const & bv, CursorSlice const & sl,
                bool boundary, int & x, int & y) const;