The "I want this in now" patch.

[lyx.git] / src / tabular.h

diff --git a/src/tabular.h b/src/tabular.h
index bac0c068ea72d7b162730017f65922c8ae3cc752..bf786d4dedb917211705cd30d9474db41b307cfb 100644 (file)
--- a/src/tabular.h
+++ b/src/tabular.h
@@ -24,6 +24,7 @@
 class InsetTabular;
 class BufferParams;
 class LaTeXFeatures;
+class LatexRunParams;
 class Buffer;
 class LyXLex;
 
@@ -290,9 +291,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 &,
+                 bool) const;
        ///
        int docbook(Buffer const * buf, std::ostream & os, bool mixcont) const;
        ///
@@ -301,7 +301,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
        ///
@@ -483,11 +483,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_;
        ///
@@ -563,12 +561,12 @@ private:
        int TeXCellPostamble(std::ostream &, int cell) const;
        ///
        int TeXLongtableHeaderFooter(std::ostream &, Buffer const * buf,
-                                    bool fragile, bool fp) const;
+                                    LatexRunParams const &, bool fp) const;
        ///
        bool isValidRow(int const row) const;
        ///
        int TeXRow(std::ostream &, int const row, Buffer const * buf,
-                  bool fragile, bool fp) const;
+                  LatexRunParams const &, bool fp) const;
        ///
        // helper function for ASCII returns number of newlines
        ///