Fix fuer #209

[lyx.git] / src / tabular.h

diff --git a/src/tabular.h b/src/tabular.h
index ada0609fa5dc6d4aaa76ff6b1282a02a86976223..d23f2d8883a123b16115ecff96824fb28df2a578 100644 (file)
--- a/src/tabular.h
+++ b/src/tabular.h
@@ -16,15 +16,16 @@
 #pragma interface
 #endif
 
-#include <iosfwd>
-#include <vector>
-
 #include "lyxlex.h"
 #include "layout.h"
 #include "LString.h"
-#include "insets/insettext.h"
 #include "lyxlength.h"
 
+#include "insets/insettext.h"
+
+#include <iosfwd>
+#include <vector>
+
 class InsetTabular;
 class LaTeXFeatures;
 class Buffer;
@@ -290,44 +291,13 @@ public:
        void Read(Buffer const *, LyXLex &);
        ///
        void OldFormatRead(LyXLex &, string const &);
-       //
-       // helper function for Latex returns number of newlines
-       ///
-       int TeXTopHLine(std::ostream &, int row) const;
-       ///
-       int TeXBottomHLine(std::ostream &, int row) const;
-       ///
-       int TeXCellPreamble(std::ostream &, int cell) const;
-       ///
-       int TeXCellPostamble(std::ostream &, int cell) const;
-       ///
-       int TeXLongtableHeaderFooter(std::ostream &, Buffer const * buf,
-                                    bool fragile, bool fp) const;
-       ///
-       bool isValidRow(int const row) const;
-       ///
-       int TeXRow(std::ostream &, int const row, Buffer const * buf,
-                  bool fragile, bool fp) const;
-       ///
-       int Latex(Buffer const *, std::ostream &, bool, bool) const;
-       /// auxiliary function for docbook rows
-       int docbookRow(Buffer const * buf, std::ostream & os, int row) const;
-       ///
-       int DocBook(Buffer const * buf, std::ostream & os) const;
-       ///
-       // helper function for Latex returns number of newlines
        ///
-       int AsciiTopHLine(std::ostream &, int row,
-                         std::vector<unsigned int> const &) const;
+       int latex(Buffer const *, std::ostream &, bool, bool) const;
        ///
-       int AsciiBottomHLine(std::ostream &, int row,
-                            std::vector<unsigned int> const &) const;
+       int docBook(Buffer const * buf, std::ostream & os) const;
        ///
-       int AsciiPrintCell(Buffer const *, std::ostream &,
-                          int cell, int row, int column,
-                          std::vector<unsigned int> const &) const;
-       ///
-       int Ascii(Buffer const *, std::ostream &) const;
+       int ascii(Buffer const *, std::ostream &, int const depth,
+                 bool onlydata, unsigned char delim) const;
        ///
        bool IsMultiColumn(int cell, bool real = false) const;
        ///
@@ -406,6 +376,9 @@ public:
        InsetText * GetCellInset(int cell) 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 rows() const { return rows_; }
        ///
@@ -577,6 +550,39 @@ private:
        BoxType UseParbox(int cell) const;
        ///
        void setHeaderFooterRows(int header, int fheader, int footer, int lfooter);
+       ///
+       // helper function for Latex returns number of newlines
+       ///
+       int TeXTopHLine(std::ostream &, int row) const;
+       ///
+       int TeXBottomHLine(std::ostream &, int row) const;
+       ///
+       int TeXCellPreamble(std::ostream &, int cell) const;
+       ///
+       int TeXCellPostamble(std::ostream &, int cell) const;
+       ///
+       int TeXLongtableHeaderFooter(std::ostream &, Buffer const * buf,
+                                    bool fragile, bool fp) const;
+       ///
+       bool isValidRow(int const row) const;
+       ///
+       int TeXRow(std::ostream &, int const row, Buffer const * buf,
+                  bool fragile, bool fp) const;
+       ///
+       // helper function for ASCII returns number of newlines
+       ///
+       int asciiTopHLine(std::ostream &, int row,
+                         std::vector<unsigned int> const &) const;
+       ///
+       int asciiBottomHLine(std::ostream &, int row,
+                            std::vector<unsigned int> const &) const;
+       ///
+       int asciiPrintCell(Buffer const *, std::ostream &,
+                          int cell, int row, int column,
+                          std::vector<unsigned int> const &,
+                                          bool onlydata) const;
+       /// auxiliary function for docbook
+       int docbookRow(Buffer const * buf, std::ostream & os, int row) const;
 };
 
 #endif