Collapse all those LFUN_XYZ_APPLY to a single LFUN_INSET_APPLY.

[lyx.git] / src / tabular.h

diff --git a/src/tabular.h b/src/tabular.h
index b3432cfcfeb416d14d1723bb34cebd3b72e51f6d..bac0c068ea72d7b162730017f65922c8ae3cc752 100644 (file)
--- a/src/tabular.h
+++ b/src/tabular.h
@@ -12,11 +12,6 @@
 #ifndef TABULAR_H
 #define TABULAR_H
 
-#ifdef __GNUG__
-#pragma interface
-#endif
-
-#include "lyxlex.h"
 #include "layout.h"
 #include "LString.h"
 #include "lyxlength.h"
@@ -27,8 +22,10 @@
 #include <vector>
 
 class InsetTabular;
+class BufferParams;
 class LaTeXFeatures;
 class Buffer;
+class LyXLex;
 
 /* The features the text class offers for tables */
 
@@ -60,6 +57,8 @@ public:
                ///
                ALIGN_CENTER,
                ///
+               ALIGN_BLOCK,
+               ///
                VALIGN_TOP,
                ///
                VALIGN_BOTTOM,
@@ -159,9 +158,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
@@ -173,8 +172,6 @@ public:
                // ignored in the output and it is set to be empty!
                bool empty;
        };
-       ///
-       typedef struct lttype ltType;
 
        /* konstruktor */
        ///
@@ -202,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;
 
@@ -297,7 +294,7 @@ 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;