// up. (Lgb)
//#define NEW_INSETS 1
+// I dare you to try this one too. It is ortogonal with NEW_INSETS so you
+// can try both or just one of them.
+//#define NEW_TABULAR 1
+
/// A LyXParagraph holds all text, attributes and insets in a text paragraph
class LyXParagraph {
public:
///
LyXParagraph * TeXEnvironment(Buffer const *, BufferParams const &,
- std::ostream &, TexRow & texrow,
- std::ostream & foot, TexRow & foot_texrow,
- int & foot_count);
+ std::ostream &, TexRow & texrow
+#ifndef NEW_INSETS
+ ,std::ostream & foot, TexRow & foot_texrow,
+ int & foot_count
+#endif
+ );
///
LyXParagraph * Clone() const;
///
LyXParagraph * previous;
+#ifndef NEW_TABULAR
/* table stuff -- begin*/
///
LyXTable * table;
/* table stuff -- end*/
-
+#endif
///
InsetBibKey * bibkey; // ale970302
LyXParagraph * FirstPhysicalPar();
///
LyXParagraph const * FirstPhysicalPar() const;
-#endif
-
/// returns the physical paragraph
LyXParagraph * ParFromPos(size_type pos);
/// returns the position in the physical par
int PositionInParFromPos(size_type pos) const;
+#endif
/// for the environments
LyXParagraph * DepthHook(int depth);
*/
LyXFont getFont(BufferParams const &, size_type pos) const;
///
- value_type GetChar(size_type pos);
- ///
value_type GetChar(size_type pos) const;
/// The position must already exist.
void SetChar(size_type pos, value_type c) {
void UnsetPExtraType(BufferParams const &);
///
bool linuxDocConvertChar(char c, string & sgml_string);
+#ifndef NEW_TABULAR
///
void DocBookContTableRows(Buffer const *,
std::ostream &, string & extra,
void SimpleDocBookOneTablePar(Buffer const *,
std::ostream &, string & extra,
int & desc_on, int depth);
+#endif
private:
///
struct InsetTable {
InsetList insetlist;
///
LyXParagraph * TeXDeeper(Buffer const *, BufferParams const &,
- std::ostream &, TexRow & texrow,
- std::ostream & foot, TexRow & foot_texrow,
- int & foot_count);
+ std::ostream &, TexRow & texrow
+#ifndef NEW_INSETS
+ ,std::ostream & foot, TexRow & foot_texrow,
+ int & foot_count
+#endif
+ );
#ifndef NEW_INSETS
///
LyXParagraph * TeXFootnote(Buffer const *, BufferParams const &,
int & foot_count,
bool parent_is_rtl);
#endif
+#ifndef NEW_TABULAR
///
bool SimpleTeXOneTablePar(Buffer const *, BufferParams const &,
std::ostream &, TexRow & texrow);
std::ostream &, size_type i,
int current_cell_number,
int & column, TexRow & texrow);
+#endif
///
void SimpleTeXBlanks(std::ostream &, TexRow & texrow,
size_type const i,