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

diff --git a/src/mathed/InsetMathGrid.h b/src/mathed/InsetMathGrid.h
index 7ff533be99..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
@@ -79,7 +82,7 @@ public:
 		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.
@@ -101,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;
@@ -144,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;
 	///
@@ -152,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;
@@ -207,6 +208,8 @@ public:
 	virtual int vlinesep() const;
 	///
 	virtual int border() const;
+	///
+	virtual bool handlesMulticolumn() const { return false; }
 
 	///
 	void write(WriteStream & os) const;
@@ -225,6 +228,8 @@ public:
 	///
 	void htmlize(HtmlStream &, std::string attrib) const;
 	///
+	void validate(LaTeXFeatures & features) const;
+	///
 	//void octave(OctaveStream &) const;
 
 protected:
@@ -237,6 +242,13 @@ 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 latex,
 			bool last_eoln) const;
@@ -244,10 +256,23 @@ protected:
 	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 aligmment for display of cell at (\p row, \p col).
+	/// 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 char displayColAlign(col_type col, row_type) const { return colinfo_[col].align_; }
+	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.
@@ -262,7 +287,7 @@ protected:
 
 private:
 	///
-	char v_align_; // add approp. type
+	char v_align_; // FIXME: add approp. type
 	///
 	Inset * clone() const;
 };