split LyXText::rowlist_ into individual Paragraph::rows_ chunks

[lyx.git] / src / tabular.h

diff --git a/src/tabular.h b/src/tabular.h
index 47008152d798f8b297c5165f105c63b5093ef1c4..0033e28511c79dd27a57fa3fb8a963ec5aec1352 100644 (file)
--- a/src/tabular.h
+++ b/src/tabular.h
@@ -12,21 +12,14 @@
 #ifndef TABULAR_H
 #define TABULAR_H
 
-#include "layout.h"
-#include "LString.h"
 #include "lyxlength.h"
-
 #include "insets/insettext.h"
 
 #include <iosfwd>
 #include <vector>
 
 class InsetTabular;
-class BufferParams;
-class LaTeXFeatures;
 class LatexRunParams;
-class Buffer;
-class LyXLex;
 
 /* The features the text class offers for tables */
 
@@ -64,7 +57,7 @@ public:
                ///
                VALIGN_BOTTOM,
                ///
-               VALIGN_CENTER,
+               VALIGN_MIDDLE,
                ///
                M_TOGGLE_LINE_TOP,
                ///
@@ -84,7 +77,7 @@ public:
                ///
                M_VALIGN_BOTTOM,
                ///
-               M_VALIGN_CENTER,
+               M_VALIGN_MIDDLE,
                ///
                MULTICOLUMN,
                ///
@@ -147,7 +140,7 @@ public:
                ///
                LYX_VALIGN_BOTTOM = 1,
                ///
-               LYX_VALIGN_CENTER = 2
+               LYX_VALIGN_MIDDLE = 2
        };
 
        enum BoxType {
@@ -183,8 +176,6 @@ public:
        ///
        explicit
        LyXTabular(Buffer const *, InsetTabular *, LyXLex & lex);
-       ///
-       LyXTabular * clone(BufferParams const &, InsetTabular *);
 
        /// Returns true if there is a topline, returns false if not
        bool topLine(int cell, bool onlycolumn = false) const;
@@ -219,33 +210,33 @@ public:
        ///
        int getHeightOfTabular() const;
        /// 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
-       bool setAllLines(int cell, bool line);
+       void setAscentOfRow(int row, int height);
        /// Returns true if a complete update is necessary, otherwise false
-       bool setTopLine(int cell, bool line, bool onlycolumn = false);
+       void setDescentOfRow(int row, int height);
        /// Returns true if a complete update is necessary, otherwise false
-       bool setBottomLine(int cell, bool line, bool onlycolumn = false);
-       /// Returns true if a complete update is necessary, otherwise false
-       bool setLeftLine(int cell, bool line, bool onlycolumn = false);
-       /// Returns true if a complete update is necessary, otherwise false
-       bool setRightLine(int cell, bool line, bool onlycolumn = false);
-       /// Returns true if a complete update is necessary, otherwise false
-       bool setAlignment(int cell, LyXAlignment align,
+       void setWidthOfCell(int cell, int new_width);
+       ///
+       void setAllLines(int cell, bool line);
+       ///
+       void setTopLine(int cell, bool line, bool onlycolumn = false);
+       ///
+       void setBottomLine(int cell, bool line, bool onlycolumn = false);
+       ///
+       void setLeftLine(int cell, bool line, bool onlycolumn = false);
+       ///
+       void setRightLine(int cell, bool line, bool onlycolumn = false);
+       ///
+       void setAlignment(int cell, LyXAlignment align,
                          bool onlycolumn = false);
-       /// Returns true if a complete update is necessary, otherwise false
-       bool setVAlignment(int cell, VAlignment align,
+       ///
+       void setVAlignment(int cell, VAlignment align,
                           bool onlycolumn = false);
        ///
-       bool setColumnPWidth(int cell, LyXLength const & width);
+       void setColumnPWidth(int cell, LyXLength const & width);
        ///
        bool setMColumnPWidth(int cell, LyXLength const & width);
        ///
-       bool setAlignSpecial(int cell, string const & special, Feature what);
+       void setAlignSpecial(int cell, string const & special, Feature what);
        ///
        LyXAlignment getAlignment(int cell, bool onlycolumn = false) const;
        ///
@@ -289,6 +280,8 @@ public:
        ///
        int latex(Buffer const *, std::ostream &,
                  LatexRunParams const &) const;
+       //
+       int linuxdoc(Buffer const * buf, std::ostream & os) const;
        ///
        int docbook(Buffer const * buf, std::ostream & os, bool mixcont) const;
        ///
@@ -369,12 +362,12 @@ public:
        ///
        // end longtable support
        ///
-       InsetText * getCellInset(int cell) const;
+       InsetText & getCellInset(int cell) const;
        ///
-       InsetText * getCellInset(int row, int column) const;
+       InsetText & getCellInset(int row, int column) const;
        /// Search for \param inset in the tabular, with the
        /// additional hint that it could be at \param maybe_cell
-       int getCellFromInset(Inset const * inset, int maybe_cell = -1) const;
+       int getCellFromInset(InsetOld const * inset, int maybe_cell = -1) const;
        ///
        int rows() const { return rows_; }
        ///
@@ -386,7 +379,8 @@ public:
        ///
        /// recalculate the widths/heights only!
        void reinit();
-private:
+       ///
+//private:
        ///
        mutable int cur_cell;
        ///
@@ -422,6 +416,7 @@ private:
                ///
                InsetText inset;
        };
+       cellstruct & cellinfo_of_cell(int cell) const;
        ///
        typedef std::vector<cellstruct> cell_vector;
        ///
@@ -518,22 +513,18 @@ private:
        ///
        void Reinit(bool reset_widths = true);
        ///
-       LyXTabular & operator=(LyXTabular const &);
-       ///
        void set_row_column_number_info(bool oldformat = false);
        /// Returns true if a complete update is necessary, otherwise false
        bool setWidthOfMulticolCell(int cell, int new_width);
        ///
        void recalculateMulticolumnsOfColumn(int column);
        /// Returns true if change
-       bool calculate_width_of_column(int column);
+       void calculate_width_of_column(int column);
        ///
        bool calculate_width_of_column_NMC(int column); // no multi cells
        ///
        void calculate_width_of_tabular();
        ///
-       cellstruct * cellinfo_of_cell(int cell) const;
-       ///
        void delete_column(int column);
        ///
        int cells_in_multicolumn(int cell) const;