#ifndef TABULAR_H
#define TABULAR_H
-#ifdef __GNUG__
-#pragma interface
-#endif
-
-#include "lyxlex.h"
#include "layout.h"
#include "LString.h"
#include "lyxlength.h"
#include <vector>
class InsetTabular;
+class BufferParams;
class LaTeXFeatures;
+class LatexRunParams;
class Buffer;
+class LyXLex;
/* The features the text class offers for tables */
///
ALIGN_CENTER,
///
+ ALIGN_BLOCK,
+ ///
VALIGN_TOP,
///
VALIGN_BOTTOM,
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
// ignored in the output and it is set to be empty!
bool empty;
};
- ///
- typedef struct lttype ltType;
/* konstruktor */
///
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;
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;
///
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;
///
///
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
///
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_;
///
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
///