X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetTabular.h;h=fd942049ba6d07c53d86acfb84610443196ca07b;hb=48b1e8a0aca2f3f3faa8f1f800568e47792ba9a0;hp=ce684ec9ead375cfe6f4c062483396805496d7ea;hpb=3883b85f49054c109cb8a9a293721a5e41edb68d;p=lyx.git

diff --git a/src/insets/InsetTabular.h b/src/insets/InsetTabular.h
index ce684ec9ea..fd942049ba 100644
--- a/src/insets/InsetTabular.h
+++ b/src/insets/InsetTabular.h
@@ -25,7 +25,8 @@
 #define INSET_TABULAR_H
 
 #include "InsetText.h"
-#include "Length.h"
+
+#include "support/Length.h"
 
 #include <climits>
 #include <iosfwd>
@@ -80,6 +81,10 @@ public:
 				  UpdateType utype, TocBackend & backend) const;
 	///
 	void metrics(MetricsInfo &, Dimension &) const;
+	/// Needs to be same as InsetTabular
+	bool inheritFont() const { return false; }
+	/// Can the cell contain several paragraphs?
+	bool allowMultiPar() const { return !isMultiRow && (!isMultiColumn || isFixedWidth); }
 private:
 	/// unimplemented
 	InsetTableCell();
@@ -132,8 +137,6 @@ private:
 	virtual bool forceLocalFontSwitch() const;
 	/// Is the width forced to some value?
 	bool hasFixedWidth() const { return isFixedWidth; }
-	/// Can the cell contain several paragraphs?
-	bool allowMultiPar() const { return !isMultiRow && (!isMultiColumn || isFixedWidth); }
 };
 
 
@@ -572,8 +575,8 @@ public:
 	void read(Lexer &);
 	///
 	void latex(otexstream &, OutputParams const &) const;
-	///
-    void docbook(XMLStream &, OutputParams const &) const;
+	/// serialise the table in DocBook, according to buffer parameters
+	void docbook(XMLStream &, OutputParams const &) const;
 	///
 	docstring xhtml(XMLStream &, OutputParams const &) const;
 	///
@@ -907,9 +910,14 @@ public:
 				idx_type cell, row_type row, col_type column,
 				std::vector<unsigned int> const &,
 				bool onlydata, size_t max_length) const;
-	/// auxiliary function for docbook
-    void docbookRow(XMLStream &, row_type, OutputParams const &,
-                    bool header = false) const;
+	/// auxiliary function for DocBook
+	void docbookRow(XMLStream &, row_type, OutputParams const &,
+					bool header = false) const;
+	/// auxiliary function for DocBook: export this row as HTML
+	void docbookRowAsHTML(XMLStream &, row_type, OutputParams const &,
+					bool header) const;
+	/// auxiliary function for DocBook: export this row as CALS
+	void docbookRowAsCALS(XMLStream &, row_type, OutputParams const &) const;
 	///
 	docstring xhtmlRow(XMLStream & xs, row_type, OutputParams const &,
 	                   bool header = false) const;
@@ -971,6 +979,8 @@ public:
 	    insets that may contain several paragraphs */
 	bool inheritFont() const { return false; }
 	///
+	bool allowMultiPar() const;
+	///
 	bool allowsCaptionVariation(std::string const &) const;
 	//
 	bool isTable() const { return true; }