X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathGrid.h;h=886d03a8ee3321e33661988bcf20c32862ff9576;hb=71623b88b2c613dd4ab826a9783a53e840bcd6e1;hp=0dff138b3722101bdd43fce2e43aac4869486493;hpb=9536afe74261975b916e4e8d9d05c24bdbe4a977;p=lyx.git

diff --git a/src/mathed/InsetMathGrid.h b/src/mathed/InsetMathGrid.h
index 0dff138b37..886d03a8ee 100644
--- a/src/mathed/InsetMathGrid.h
+++ b/src/mathed/InsetMathGrid.h
@@ -25,22 +25,25 @@ namespace lyx {
 class InsetMathGrid : public InsetMathNest {
 public:
 
+	enum Multicolumn {
+		/// A normal cell
+		CELL_NORMAL = 0,
+		/// A multicolumn cell. The number of columns is <tt>1 + number
+		/// of CELL_PART_OF_MULTICOLUMN cells</tt> that follow directly
+		CELL_BEGIN_OF_MULTICOLUMN = 1,
+		/// This is a dummy cell (part of a multicolumn cell)
+		CELL_PART_OF_MULTICOLUMN = 2
+	};
+
 	/// additional per-cell information
 	class CellInfo {
 	public:
 		///
 		CellInfo();
-		/// a dummy cell before a multicolumn cell
-		int dummy_;
+		/// multicolumn flag
+		Multicolumn multi_;
 		/// special multi colums alignment
 		docstring align_;
-		/// these should be a per-cell property, but ok to have it here
-		/// for single-column grids like paragraphs
-		mutable int glue_;
-		///
-		mutable pos_type begin_;
-		///
-		mutable pos_type end_;
 	};
 
 	/// additional per-row information
@@ -73,15 +76,13 @@ public:
 		ColInfo();
 		/// currently possible: 'l', 'c', 'r'
 		char align_;
-		/// cache for drawing
-		int h_offset;
 		/// cached width
 		mutable int width_;
 		/// cached offset
 		mutable int offset_;
 		/// how many lines to the left of this column?
 		unsigned int lines_;
-		/// additional amount to be skipped when drawing
+		/// additional amount to the right to be skipped when drawing
 		int skip_;
 		/// Special alignment.
 		/// This does also contain align_ and lines_ if it is nonempty.
@@ -103,12 +104,6 @@ public:
 	///
 	void draw(PainterInfo & pi, int x, int y) const;
 	///
-	void drawWithMargin(PainterInfo & pi, int x, int y,
-		int lmargin = 0, int rmargin = 0) const;
-	/// draw decorations.
-	void drawDecoration(PainterInfo & pi, int x, int y) const
-	{ drawMarkers2(pi, x, y); }
-	///
 	void metricsT(TextMetricsInfo const & mi, Dimension & dim) const;
 	///
 	void drawT(TextPainter & pi, int x, int y) const;
@@ -146,6 +141,8 @@ public:
 	InsetMathGrid * asGridInset() { return this; }
 	/// identifies GridInset
 	InsetMathGrid const * asGridInset() const { return this; }
+	//
+	bool isTable() const { return true; }
 	///
 	col_type ncols() const;
 	///
@@ -154,6 +151,8 @@ public:
 	col_type col(idx_type idx) const;
 	///
 	row_type row(idx_type idx) const;
+	/// number of columns of cell \p idx
+	col_type ncellcols(idx_type idx) const;
 
 	///
 	bool idxUpDown(Cursor &, bool up) const;
@@ -187,8 +186,6 @@ public:
 	/// swap two columns
 	virtual void swapCol(col_type c);
 	///
-	virtual void appendRow();
-	///
 	idx_type index(row_type r, col_type c) const;
 	///
 	bool idxBetween(idx_type idx, idx_type from, idx_type to) const;
@@ -198,6 +195,8 @@ public:
 	virtual char defaultColAlign(col_type) { return 'c'; }
 	///
 	void setDefaults();
+	///
+	virtual bool interpretString(Cursor & cur, docstring const & str);
 
 	///
 	virtual int colsep() const;
@@ -209,6 +208,8 @@ public:
 	virtual int vlinesep() const;
 	///
 	virtual int border() const;
+	///
+	virtual bool handlesMulticolumn() const { return false; }
 
 	///
 	void write(WriteStream & os) const;
@@ -227,6 +228,8 @@ public:
 	///
 	void htmlize(HtmlStream &, std::string attrib) const;
 	///
+	void validate(LaTeXFeatures & features) const;
+	///
 	//void octave(OctaveStream &) const;
 
 protected:
@@ -239,12 +242,37 @@ protected:
 	int cellXOffset(BufferView const &, idx_type idx) const;
 	/// returns y offset of cell compared to inset
 	int cellYOffset(idx_type idx) const;
+	/// Width of cell, taking combined columns into account
+	int cellWidth(idx_type idx) const;
+	///
+	virtual int leftMargin() const { return 0; }
+	///
+	virtual int rightMargin() const { return 0; }
+
 	/// returns proper 'end of line' code for LaTeX
-	virtual docstring eolString(row_type row, bool fragile, bool last_eoln) const;
+	virtual docstring eolString(row_type row, bool fragile, bool latex,
+			bool last_eoln) const;
 	/// returns proper 'end of column' code for LaTeX
 	virtual docstring eocString(col_type col, col_type lastcol) const;
 	/// splits cells and shifts right part to the next cell
 	void splitCell(Cursor & cur);
+	/// Column alignment for display of cell \p idx.
+	/// Must not be written to file!
+	virtual char displayColAlign(idx_type idx) const;
+	/// Column spacing for display of column \p col.
+	/// Must not be written to file!
+	virtual int displayColSpace(col_type col) const;
+
+	// The following two functions are used in InsetMathHull and
+	// InsetMathSplit.
+	/// The value of a fixed col align for a certain hull type 
+	static char colAlign(HullType type, col_type col);
+	/// The value of a fixed col spacing for a certain hull type
+	static int colSpace(HullType type, col_type col);
+
+	/// positions of vertical and horizontal lines
+	int vLineHOffset(col_type col, unsigned int line) const;
+	int hLineVOffset(row_type row, unsigned int line) const;
 
 	/// row info.
 	/// rowinfo_[nrows()] is a dummy row used only for hlines.
@@ -259,7 +287,7 @@ protected:
 
 private:
 	///
-	char v_align_; // add approp. type
+	char v_align_; // FIXME: add approp. type
 	///
 	Inset * clone() const;
 };