more changes, read the Changelog

[lyx.git] / src / tabular.h

diff --git a/src/tabular.h b/src/tabular.h
index 46ef2e51495b6890bf996c80d23a2df6b8955df2..0b19167c7cddade50e2234488fdc2dd24541ba2b 100644 (file)
--- a/src/tabular.h
+++ b/src/tabular.h
@@ -19,9 +19,11 @@
 
 #include "lyxlex.h"
 #include "LString.h"
+#include "insets/insettext.h"
 
 class InsetTabular;
-class InsetText;
+class LaTeXFeatures;
+class Buffer;
 
 /* The features the text class offers for tables */ 
 
@@ -75,7 +77,7 @@ public:
     LyXTabular(InsetTabular *, LyXTabular const &);
     ///
     explicit
-    LyXTabular(InsetTabular *, LyXLex & lex);
+    LyXTabular(Buffer const *, InsetTabular *, LyXLex & lex);
     ///
     ~LyXTabular();
     ///
@@ -115,10 +117,10 @@ public:
     int GetDescentOfRow(int row) const;
     ///
     int GetHeightOfTabular() const;
-    ///
-    void SetAscentOfRow(int row, int height);
-    ///
-    void SetDescentOfRow(int row, int height);
+    /// Returns true if a complete update is necessary, otherwise false
+    bool SetAscentOfRow(int row, int height);
+    /// Returns true if a complete update is necessary, otherwise false
+    bool SetDescentOfRow(int row, int height);
     /// Returns true if a complete update is necessary, otherwise false
     bool SetWidthOfCell(int cell, int new_width);
     /// Returns true if a complete update is necessary, otherwise false
@@ -134,9 +136,9 @@ public:
     /// Returns true if a complete update is necessary, otherwise false
     bool SetAlignment(int cell, char align);
     ///
-    bool SetPWidth(int cell, string width);
+    bool SetPWidth(int cell, string const & width);
     ///
-    bool SetAlignSpecial(int cell, string special, int what);
+    bool SetAlignSpecial(int cell, string const & special, int what);
     ///
     char GetAlignment(int cell) const; // add approp. signedness
     ///
@@ -166,17 +168,13 @@ public:
     ///
     int GetNumberOfCells() const;
     ///
-    int AppendCellAfterCell(int append_cell, int question_cell);
-    ///
-    int DeleteCellIfColumnIsDeleted(int cell, int delete_column_cell);
-    ///
     int NumberOfCellsInRow(int cell) const;
     ///
-    void Write(std::ostream &) const;
+    void Write(Buffer const *, std::ostream &) const;
     ///
-    void Read(LyXLex &);
+    void Read(Buffer const *, LyXLex &);
     ///
-    void OldFormatRead(std::istream &, string);
+    void OldFormatRead(LyXLex &, string const &);
     ///
     /// helper function for Latex returns number of newlines
     ///
@@ -185,7 +183,7 @@ public:
     int TeXCellPreamble(std::ostream &, int cell) const;
     int TeXCellPostamble(std::ostream &, int cell) const;
     ///
-    int Latex(std::ostream &, bool, bool) const;
+    int Latex(Buffer const *, std::ostream &, bool, bool) const;
     ///
     int DocBookEndOfCell(std::ostream &, int cell, int & depth) const;
 #if 0
@@ -208,6 +206,8 @@ public:
     ///
     int column_of_cell(int cell) const;
     ///
+    int right_column_of_cell(int cell) const;
+    ///
     void SetLongTabular(int what);
     ///
     bool IsLongTabular() const;
@@ -226,6 +226,12 @@ public:
     ///
     int GetCellAbove(int cell) const;
     ///
+    int GetCellBelow(int cell) const;
+    ///
+    int GetLastCellAbove(int cell) const;
+    ///
+    int GetLastCellBelow(int cell) const;
+    ///
     int GetCellNumber(int row, int column) const;
     ///
     void SetLinebreaks(int cell, bool what);
@@ -257,6 +263,8 @@ public:
     int columns() const { return columns_;}
     ///
     InsetTabular * owner() const { return owner_; }
+    ///
+    void Validate(LaTeXFeatures &) const;
 
 private: //////////////////////////////////////////////////////////////////
     ///
@@ -264,11 +272,13 @@ private: //////////////////////////////////////////////////////////////////
        ///
         cellstruct();
        ///
+#ifdef INSET_POINTER
        ~cellstruct();
        ///
         cellstruct(cellstruct const &);
        ///
        cellstruct & operator=(cellstruct const &);
+#endif
        ///
        int cellno;
        ///
@@ -290,8 +300,11 @@ private: //////////////////////////////////////////////////////////////////
        ///
        string p_width; // this is only set for multicolumn!!!
        ///
-       InsetText * inset;
+       InsetText inset;
     };
+    typedef std::vector<cellstruct> cell_vector;
+    typedef std::vector<cell_vector> cell_vvector;
+
     ///
     struct rowstruct {
        ///
@@ -308,6 +321,8 @@ private: //////////////////////////////////////////////////////////////////
        /// This are for longtabulars only
        bool newpage;
     };
+    typedef std::vector<rowstruct> row_vector;
+
     ///
     struct columnstruct {
        ///
@@ -324,6 +339,8 @@ private: //////////////////////////////////////////////////////////////////
        string p_width;
        string align_special;
     };
+    typedef std::vector<columnstruct> column_vector;
+
     ///
     int rows_;
     ///
@@ -335,11 +352,11 @@ private: //////////////////////////////////////////////////////////////////
     ///
     int * columnofcell;
     ///
-    std::vector<rowstruct> row_info;
+    row_vector row_info;
     ///
-    std::vector<columnstruct> column_info;
+    column_vector column_info;
     ///
-    mutable std::vector< std::vector<cellstruct> > cell_info;
+    mutable cell_vvector cell_info;
     ///
     int width_of_tabular;
     ///
@@ -367,9 +384,6 @@ private: //////////////////////////////////////////////////////////////////
     ///
     void calculate_width_of_tabular();
 
-    ///
-    int right_column_of_cell(int cell) const;
-
     ///
     cellstruct * cellinfo_of_cell(int cell) const;