"Inter-word Space"

[lyx.git] / src / tabular.h

diff --git a/src/tabular.h b/src/tabular.h
index 2b34120c857007d93c114b2f5d60df25e2fc8873..8aaee3509e669e48770ca3cd49bb9305e0c7d61b 100644 (file)
--- a/src/tabular.h
+++ b/src/tabular.h
@@ -12,10 +12,6 @@
 #ifndef TABULAR_H
 #define TABULAR_H
 
-#ifdef __GNUG__
-#pragma interface
-#endif
-
 #include "layout.h"
 #include "LString.h"
 #include "lyxlength.h"
@@ -28,6 +24,7 @@
 class InsetTabular;
 class BufferParams;
 class LaTeXFeatures;
+class LatexRunParams;
 class Buffer;
 class LyXLex;
 
@@ -162,9 +159,9 @@ public:
                BOX_MINIPAGE = 2
        };
 
-       struct lttype {
+       struct ltType {
                // constructor
-               lttype();
+               ltType();
                // we have this header type (is set in the GetLT... functions)
                bool set;
                // double borders on top
@@ -176,8 +173,6 @@ public:
                // ignored in the output and it is set to be empty!
                bool empty;
        };
-       ///
-       typedef struct lttype ltType;
 
        /* konstruktor */
        ///
@@ -185,15 +180,14 @@ public:
                   InsetTabular *, int columns_arg, int rows_arg);
        ///
        LyXTabular(BufferParams const &,
-                  InsetTabular *, LyXTabular const &, bool same_id = false);
+                  InsetTabular *, LyXTabular const &);
        ///
        explicit
        LyXTabular(Buffer const *, InsetTabular *, LyXLex & lex);
        ///
        LyXTabular & operator=(LyXTabular const &);
        ///
-       LyXTabular * clone(BufferParams const &,
-                          InsetTabular *, bool same_id = false);
+       LyXTabular * clone(BufferParams const &, InsetTabular *);
 
        /// Returns true if there is a topline, returns false if not
        bool TopLine(int cell, bool onlycolumn = false) const;
@@ -205,9 +199,9 @@ public:
        bool RightLine(int cell, bool onlycolumn = false) const;
 
        ///
-       bool TopAlreadyDrawed(int cell) const;
+       bool topAlreadyDrawn(int cell) const;
        ///
-       bool LeftAlreadyDrawed(int cell) const;
+       bool leftAlreadyDrawn(int cell) const;
        ///
        bool IsLastRow(int cell) const;
 
@@ -296,9 +290,8 @@ public:
        ///
        void Read(Buffer const *, LyXLex &);
        ///
-       void OldFormatRead(BufferParams const &, LyXLex &, string const &);
-       ///
-       int latex(Buffer const *, std::ostream &, bool, bool) const;
+       int latex(Buffer const *, std::ostream &,
+                 LatexRunParams const &) const;
        ///
        int docbook(Buffer const * buf, std::ostream & os, bool mixcont) const;
        ///
@@ -307,7 +300,7 @@ public:
        ///
        bool IsMultiColumn(int cell, bool real = false) const;
        ///
-       void SetMultiColumn(Buffer const *, int cell, int number);
+       void SetMultiColumn(Buffer *, int cell, int number);
        ///
        int UnsetMultiColumn(int cell); // returns number of new cells
        ///
@@ -489,11 +482,9 @@ private:
        typedef std::vector<columnstruct> column_vector;
 
        ///
-       void ReadNew(Buffer const * buf, std::istream & is,
-                                LyXLex & lex, string const & l, int const version);
+       void read(Buffer const * buf, std::istream & is,
+                 LyXLex & lex, string const & l, int const version);
        ///
-       void ReadOld(Buffer const * buf, std::istream & is,
-                                LyXLex & lex, string const & l);
        ///
        int rows_;
        ///
@@ -569,12 +560,12 @@ private:
        int TeXCellPostamble(std::ostream &, int cell) const;
        ///
        int TeXLongtableHeaderFooter(std::ostream &, Buffer const * buf,
-                                    bool fragile, bool fp) const;
+                                    LatexRunParams const &) const;
        ///
        bool isValidRow(int const row) const;
        ///
        int TeXRow(std::ostream &, int const row, Buffer const * buf,
-                  bool fragile, bool fp) const;
+                  LatexRunParams const &) const;
        ///
        // helper function for ASCII returns number of newlines
        ///