X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftabular.h;h=163f33a2b746aa364181e4bd20f9b6f967078b52;hb=2af1fccc61b68e273bd690c506df85d4a2c8e30e;hp=24e24da4af4aeff3a74a30c4770face094599c8d;hpb=6c300f72a217722652dc27db9108e1050028979c;p=lyx.git

diff --git a/src/tabular.h b/src/tabular.h
index 24e24da4af..163f33a2b7 100644
--- a/src/tabular.h
+++ b/src/tabular.h
@@ -205,13 +205,13 @@ public:
 		   row_type rows_arg);
 
 	/// Returns true if there is a topline, returns false if not
-	bool topLine(idx_type cell, bool onlycolumn = false) const;
+	bool topLine(idx_type cell, bool wholerow = false) const;
 	/// Returns true if there is a topline, returns false if not
-	bool bottomLine(idx_type cell, bool onlycolumn = false) const;
+	bool bottomLine(idx_type cell, bool wholerow = false) const;
 	/// Returns true if there is a topline, returns false if not
-	bool leftLine(idx_type cell, bool onlycolumn = false) const;
+	bool leftLine(idx_type cell, bool wholecolumn = false) const;
 	/// Returns true if there is a topline, returns false if not
-	bool rightLine(idx_type cell, bool onlycolumn = false) const;
+	bool rightLine(idx_type cell, bool wholecolumn = false) const;
 
 	///
 	bool topAlreadyDrawn(idx_type cell) const;
@@ -246,13 +246,13 @@ public:
 	///
 	void setAllLines(idx_type cell, bool line);
 	///
-	void setTopLine(idx_type cell, bool line, bool onlycolumn = false);
+	void setTopLine(idx_type cell, bool line, bool wholerow = false);
 	///
-	void setBottomLine(idx_type cell, bool line, bool onlycolumn = false);
+	void setBottomLine(idx_type cell, bool line, bool wholerow = false);
 	///
-	void setLeftLine(idx_type cell, bool line, bool onlycolumn = false);
+	void setLeftLine(idx_type cell, bool line, bool wholecolumn = false);
 	///
-	void setRightLine(idx_type cell, bool line, bool onlycolumn = false);
+	void setRightLine(idx_type cell, bool line, bool wholecolumn = false);
 	///
 	void setAlignment(idx_type cell, LyXAlignment align,
 			  bool onlycolumn = false);
@@ -264,7 +264,7 @@ public:
 	///
 	bool setMColumnPWidth(LCursor &, idx_type, LyXLength const &);
 	///
-	void setAlignSpecial(idx_type cell, std::string const & special,
+	void setAlignSpecial(idx_type cell, docstring const & special,
 			     Feature what);
 	///
 	LyXAlignment getAlignment(idx_type cell,
@@ -279,7 +279,7 @@ public:
 	///
 	LyXLength const getMColumnPWidth(idx_type cell) const;
 	///
-	std::string const getAlignSpecial(idx_type cell, int what) const;
+	docstring const getAlignSpecial(idx_type cell, int what) const;
 	///
 	int getWidthOfCell(idx_type cell) const;
 	///
@@ -454,7 +454,7 @@ public:
 		///
 		bool rotate;
 		///
-		std::string align_special;
+		docstring align_special;
 		///
 		LyXLength p_width; // this is only set for multicolumn!!!
 		///
@@ -524,7 +524,7 @@ public:
 		///
 		LyXLength p_width;
 		///
-		std::string align_special;
+		docstring align_special;
 	};
 	///
 	typedef std::vector<columnstruct> column_vector;
@@ -604,18 +604,18 @@ public:
 	int TeXRow(odocstream &, row_type const row, Buffer const & buf,
 		   OutputParams const &) const;
 	///
-	// helper function for ASCII returns number of newlines
+	// helper functions for plain text return number of newlines
 	///
-	int asciiTopHLine(odocstream &, row_type row,
-			  std::vector<unsigned int> const &) const;
+	int plaintextTopHLine(odocstream &, row_type row,
+			std::vector<unsigned int> const &) const;
 	///
-	int asciiBottomHLine(odocstream &, row_type row,
-			     std::vector<unsigned int> const &) const;
+	int plaintextBottomHLine(odocstream &, row_type row,
+			std::vector<unsigned int> const &) const;
 	///
-	int asciiPrintCell(Buffer const &, odocstream &,
-			   OutputParams const &,
-			   idx_type cell, row_type row, col_type column,
-			   std::vector<unsigned int> const &,
+	int plaintextPrintCell(Buffer const &, odocstream &,
+			OutputParams const &,
+			idx_type cell, row_type row, col_type column,
+			std::vector<unsigned int> const &,
 					   bool onlydata) const;
 	/// auxiliary function for docbook
 	int docbookRow(Buffer const & buf, odocstream & os, row_type,