X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetTabular.h;h=87114ec367bb23cf0d668c2f28a8ff44c59e71ef;hb=87a7f728ca9b8b4d358cf06de980f61b67a927ac;hp=1e1379cc7b28df7decf825ef123cd56dcab41faf;hpb=e2fa3cb6ef0e65704402570d56086deca7643828;p=lyx.git

diff --git a/src/insets/InsetTabular.h b/src/insets/InsetTabular.h
index 1e1379cc7b..87114ec367 100644
--- a/src/insets/InsetTabular.h
+++ b/src/insets/InsetTabular.h
@@ -63,6 +63,10 @@ public:
 	///
 	void toggleFixedWidth(bool fw) { isFixedWidth = fw; }
 	///
+	void toggleMultiCol(bool m) { isMultiColumn = m; }
+	///
+	void toggleMultiRow(bool m) { isMultiRow = m; }
+	///
 	void setContentAlignment(LyXAlignment al) {contentAlign = al; }
 	/// writes the contents of the cell as a string, optionally
 	/// descending into insets
@@ -71,15 +75,18 @@ public:
 	docstring xhtml(XHTMLStream &, OutputParams const &) const;
 	///
 	void addToToc(DocIterator const & di, bool output_active,
-				  UpdateType utype) const;
+				  UpdateType utype, TocBackend & backend) const;
+	///
+	void metrics(MetricsInfo &, Dimension &) const;
 private:
 	/// unimplemented
 	InsetTableCell();
 	/// unimplemented
 	void operator=(InsetTableCell const &);
 	// FIXME
-	// This boolean is supposed to track whether the cell has had its
-	// width explicitly set. We need to know this to determine whether
+	// These booleans are supposed to track whether the cell has had its
+	// width explicitly set and whether it is part of a multicolumn, respectively.
+	// We need to know this to determine whether
 	// layout changes and paragraph customization are allowed---that is,
 	// we need it in forcePlainLayout() and allowParagraphCustomization().
 	// Unfortunately, that information is not readily available in
@@ -102,6 +109,10 @@ private:
 	// --rgh
 	///
 	bool isFixedWidth;
+	///
+	bool isMultiColumn;
+	///
+	bool isMultiRow;
 	// FIXME: Here the thoughts from the comment above also apply.
 	///
 	LyXAlignment contentAlign;
@@ -120,11 +131,7 @@ private:
 	/// Is the width forced to some value?
 	bool hasFixedWidth() const { return isFixedWidth; }
 	/// Can the cell contain several paragraphs?
-	/** FIXME this is wrong for multirows, that are limited to one
-	 * paragraph. However, we cannot test for this (see the big
-	 * comment above).
-	 */
-	bool allowMultiPar() const { return isFixedWidth; }
+	bool allowMultiPar() const { return !isMultiRow && (!isMultiColumn || isFixedWidth); }
 };
 
 
@@ -228,6 +235,8 @@ public:
 		///
 		SET_MPWIDTH,
 		///
+		TOGGLE_VARWIDTH_COLUMN,
+		///
 		SET_ROTATE_TABULAR,
 		///
 		UNSET_ROTATE_TABULAR,
@@ -339,7 +348,9 @@ public:
 		///
 		BOX_PARBOX = 1,
 		///
-		BOX_MINIPAGE = 2
+		BOX_MINIPAGE = 2,
+		///
+		BOX_VARWIDTH = 3
 	};
 
 	enum CaptionType {
@@ -460,6 +471,8 @@ public:
 	///
 	bool setMColumnPWidth(Cursor &, idx_type, Length const &);
 	///
+	bool toggleVarwidth(idx_type, bool const);
+	///
 	bool setMROffset(Cursor &, idx_type, Length const &);
 	///
 	void setAlignSpecial(idx_type cell, docstring const & special,
@@ -526,7 +539,11 @@ public:
 	///
 	bool hasMultiColumn(col_type cell) const;
 	///
-	idx_type setMultiColumn(idx_type cell, idx_type number,
+	bool hasVarwidthColumn() const;
+	///
+	bool isVTypeColumn(col_type cell) const;
+	///
+	idx_type setMultiColumn(Cursor & cur, idx_type cell, idx_type number,
 			     bool const right_border);
 	///
 	void unsetMultiColumn(idx_type cell);
@@ -539,7 +556,7 @@ public:
 	///
 	bool hasMultiRow(row_type r) const;
 	///
-	idx_type setMultiRow(idx_type cell, idx_type number,
+	idx_type setMultiRow(Cursor & cur, idx_type cell, idx_type number,
 			     bool const bottom_border,
 			     LyXAlignment const halign);
 	///
@@ -587,7 +604,7 @@ public:
 	///
 	bool getLTNewPage(row_type row) const;
 	///
-	idx_type setLTCaption(row_type row, bool what);
+	idx_type setLTCaption(Cursor & cur, row_type row, bool what);
 	///
 	bool ltCaption(row_type row) const;
 	///
@@ -741,6 +758,8 @@ public:
 		docstring align_special;
 		///
 		docstring decimal_point;
+		///
+		bool varwidth;
 	};
 	///
 	typedef std::vector<ColumnData> column_vector;
@@ -788,30 +807,33 @@ public:
 	///
 	bool setFixedWidth(row_type r, col_type c);
 	/// return true of update is needed
-	bool updateColumnWidths();
+	bool updateColumnWidths(MetricsInfo & mi);
 	///
 	idx_type columnSpan(idx_type cell) const;
 	///
 	idx_type rowSpan(idx_type cell) const;
 	///
-	BoxType useParbox(idx_type cell) const;
+	BoxType useBox(idx_type cell) const;
 	///
 	// helper function for Latex
 	///
-	void TeXTopHLine(otexstream &, row_type row, std::string const & lang) const;
+	void TeXTopHLine(otexstream &, row_type row, std::string const & lang,
+			 std::list<col_type>) const;
 	///
-	void TeXBottomHLine(otexstream &, row_type row, std::string const & lang) const;
+	void TeXBottomHLine(otexstream &, row_type row, std::string const & lang,
+			    std::list<col_type>) const;
 	///
-	void TeXCellPreamble(otexstream &, idx_type cell, bool & ismulticol, bool & ismultirow) const;
+	void TeXCellPreamble(otexstream &, idx_type cell, bool & ismulticol, bool & ismultirow,
+			     bool const bidi) const;
 	///
 	void TeXCellPostamble(otexstream &, idx_type cell, bool ismulticol, bool ismultirow) const;
 	///
-	void TeXLongtableHeaderFooter(otexstream &, OutputParams const &) const;
+	void TeXLongtableHeaderFooter(otexstream &, OutputParams const &, std::list<col_type>) const;
 	///
 	bool isValidRow(row_type const row) const;
 	///
 	void TeXRow(otexstream &, row_type const row,
-		    OutputParams const &) const;
+		    OutputParams const &, std::list<col_type>) const;
 	///
 	// helper functions for plain text
 	///
@@ -959,7 +981,7 @@ public:
 	void updateBuffer(ParIterator const &, UpdateType);
 	///
 	void addToToc(DocIterator const & di, bool output_active,
-				  UpdateType utype) const;
+				  UpdateType utype, TocBackend & backend) const;
 
 	///
 	bool completionSupported(Cursor const &) const;