Make it compile when USE_BOOST_FORMAT is unset

[lyx.git] / src / tabular.h

diff --git a/src/tabular.h b/src/tabular.h
index 7a03f8fd95262e1a059f00f83bc6d9a7dac6d0e8..2b34120c857007d93c114b2f5d60df25e2fc8873 100644 (file)
--- a/src/tabular.h
+++ b/src/tabular.h
@@ -1,9 +1,9 @@
 // -*- C++ -*-
 /* This file is part of
- * ====================================================== 
- * 
+ * ======================================================
+ *
  *           LyX, The Document Processor
- *      
+ *
  *           Copyright 2000-2001 The LyX Team.
  *
  *           @author: Jürgen Vigna
@@ -16,7 +16,6 @@
 #pragma interface
 #endif
 
-#include "lyxlex.h"
 #include "layout.h"
 #include "LString.h"
 #include "lyxlength.h"
@@ -27,10 +26,12 @@
 #include <vector>
 
 class InsetTabular;
+class BufferParams;
 class LaTeXFeatures;
 class Buffer;
+class LyXLex;
 
-/* The features the text class offers for tables */ 
+/* The features the text class offers for tables */
 
 ///
 class LyXTabular  {
@@ -60,6 +61,8 @@ public:
                ///
                ALIGN_CENTER,
                ///
+               ALIGN_BLOCK,
+               ///
                VALIGN_TOP,
                ///
                VALIGN_BOTTOM,
@@ -175,7 +178,7 @@ public:
        };
        ///
        typedef struct lttype ltType;
-       
+
        /* konstruktor */
        ///
        LyXTabular(BufferParams const &,
@@ -191,7 +194,7 @@ public:
        ///
        LyXTabular * clone(BufferParams const &,
                           InsetTabular *, bool same_id = false);
-       
+
        /// Returns true if there is a topline, returns false if not
        bool TopLine(int cell, bool onlycolumn = false) const;
        /// Returns true if there is a topline, returns false if not
@@ -200,7 +203,7 @@ public:
        bool LeftLine(int cell, bool onlycolumn = false) const;
        /// Returns true if there is a topline, returns false if not
        bool RightLine(int cell, bool onlycolumn = false) const;
-       
+
        ///
        bool TopAlreadyDrawed(int cell) const;
        ///
@@ -212,7 +215,7 @@ public:
        int GetAdditionalHeight(int row) const;
        ///
        int GetAdditionalWidth(int cell) const;
-       
+
        /* returns the maximum over all rows */
        ///
        int GetWidthOfColumn(int cell) const;
@@ -297,14 +300,14 @@ public:
        ///
        int latex(Buffer const *, std::ostream &, bool, bool) const;
        ///
-       int docBook(Buffer const * buf, std::ostream & os) const;
+       int docbook(Buffer const * buf, std::ostream & os, bool mixcont) const;
        ///
        int ascii(Buffer const *, std::ostream &, int const depth,
-                 bool onlydata, unsigned char delim) const;
+                 bool onlydata, unsigned char delim) const;
        ///
        bool IsMultiColumn(int cell, bool real = false) const;
        ///
-       void SetMultiColumn(int cell, int number);
+       void SetMultiColumn(Buffer const *, int cell, int number);
        ///
        int UnsetMultiColumn(int cell); // returns number of new cells
        ///
@@ -566,24 +569,24 @@ private:
        int TeXCellPostamble(std::ostream &, int cell) const;
        ///
        int TeXLongtableHeaderFooter(std::ostream &, Buffer const * buf,
-                                    bool fragile, bool fp) const;
+                                    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;
+                  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;
+                         std::vector<unsigned int> const &) const;
        ///
        int asciiBottomHLine(std::ostream &, int row,
-                            std::vector<unsigned int> const &) const;
+                            std::vector<unsigned int> const &) const;
        ///
        int asciiPrintCell(Buffer const *, std::ostream &,
-                          int cell, int row, int column,
-                          std::vector<unsigned int> const &,
+                          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;