X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftabular.h;h=810037f9853463ca52404082cadbc2aa62b7fb96;hb=ab254289c832cd045c56e6012d14b048618cb833;hp=5af58996edc2a3c3448dfc4e3faa8276a46924dc;hpb=63d5070bc3fc82f12e4bae453191e8f153b8524b;p=lyx.git

diff --git a/src/tabular.h b/src/tabular.h
index 5af58996ed..810037f985 100644
--- a/src/tabular.h
+++ b/src/tabular.h
@@ -4,7 +4,7 @@
  * 
  *           LyX, The Document Processor
  * 	 
- *           Copyright 2000 The LyX Team.
+ *           Copyright 2000-2001 The LyX Team.
  *
  *           @author: Jürgen Vigna
  *
@@ -163,7 +163,7 @@ public:
 	///
 	LyXTabular & operator=(LyXTabular const &);
 	///
-	LyXTabular * Clone(InsetTabular *);
+	LyXTabular * clone(InsetTabular *);
 	
 	/// Returns true if there is a topline, returns false if not
 	bool TopLine(int cell, bool onlycolumn = false) const;
@@ -180,9 +180,9 @@ public:
 	bool LeftAlreadyDrawed(int cell) const;
 	///
 	bool IsLastRow(int cell) const;
-	
+
 	///
-	int GetAdditionalHeight(int cell) const;
+	int GetAdditionalHeight(int row) const;
 	///
 	int GetAdditionalWidth(int cell) const;
 	
@@ -206,17 +206,19 @@ public:
 	/// Returns true if a complete update is necessary, otherwise false
 	bool SetAllLines(int cell, bool line);
 	/// Returns true if a complete update is necessary, otherwise false
-	bool SetTopLine(int cell, bool line, bool onlycolumn=false);
+	bool SetTopLine(int cell, bool line, bool onlycolumn = false);
 	/// Returns true if a complete update is necessary, otherwise false
-	bool SetBottomLine(int cell, bool line, bool onlycolumn=false);
+	bool SetBottomLine(int cell, bool line, bool onlycolumn = false);
 	/// Returns true if a complete update is necessary, otherwise false
-	bool SetLeftLine(int cell, bool line, bool onlycolumn=false);
+	bool SetLeftLine(int cell, bool line, bool onlycolumn = false);
 	/// Returns true if a complete update is necessary, otherwise false
-	bool SetRightLine(int cell, bool line, bool onlycolumn=false);
+	bool SetRightLine(int cell, bool line, bool onlycolumn = false);
 	/// Returns true if a complete update is necessary, otherwise false
-	bool SetAlignment(int cell, LyXAlignment align, bool onlycolumn = false);
+	bool SetAlignment(int cell, LyXAlignment align,
+			  bool onlycolumn = false);
 	/// Returns true if a complete update is necessary, otherwise false
-	bool SetVAlignment(int cell, VAlignment align, bool onlycolumn = false);
+	bool SetVAlignment(int cell, VAlignment align,
+			   bool onlycolumn = false);
 	///
 	bool SetColumnPWidth(int cell, string const & width);
 	///
@@ -283,13 +285,14 @@ public:
 	// helper function for Latex returns number of newlines
 	///
 	int AsciiTopHLine(std::ostream &, int row,
-					  std::vector<unsigned int> const &) const;
+			  std::vector<unsigned int> const &) const;
 	///
 	int AsciiBottomHLine(std::ostream &, int row,
-						 std::vector<unsigned int> const &) const;
+			     std::vector<unsigned int> const &) const;
 	///
-	int AsciiPrintCell(Buffer const *, std::ostream &, int cell, int row,
-					   int column, std::vector<unsigned int> const &) const;
+	int AsciiPrintCell(Buffer const *, std::ostream &,
+			   int cell, int row, int column,
+			   std::vector<unsigned int> const &) const;
 	///
 	int Ascii(Buffer const *, std::ostream &) const;
 	///
@@ -366,8 +369,11 @@ public:
 	InsetTabular * owner() const { return owner_; }
 	///
 	void Validate(LaTeXFeatures &) const;
-
-private: //////////////////////////////////////////////////////////////////
+	///
+	std::vector<string> const getLabelList() const;
+	///
+	mutable int cur_cell;
+private:
 	///
 	struct cellstruct {
 		///
@@ -486,9 +492,9 @@ private: //////////////////////////////////////////////////////////////////
 	int endlastfoot;
 	///
 	InsetTabular * owner_;
-   
+
 	///
-	void Init(int columns_arg, int rows_arg);
+	void Init(int columns_arg, int rows_arg, LyXTabular const * lt = 0);
 	///
 	void Reinit();
 	///