X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2Fmath_gridinset.h;h=00e324f676b90eefe2def93b74bb5e0ce7c09c90;hb=92d522b7f1be6046adcac062c558bbf0bf021612;hp=01fddcd8bc6ee3579979e99e1e8321b4286cddfe;hpb=23f483a23e24c2303656998e1065625fa1ad8f1b;p=lyx.git

diff --git a/src/mathed/math_gridinset.h b/src/mathed/math_gridinset.h
index 01fddcd8bc..00e324f676 100644
--- a/src/mathed/math_gridinset.h
+++ b/src/mathed/math_gridinset.h
@@ -6,18 +6,19 @@
 #include "vspace.h"
 #include "LString.h"
 
-#ifdef __GNUG__
-#pragma interface
-#endif
 
 /** Gridded math inset base class.
     This is the base to all grid-like editable math objects
     like array and eqnarray.
-    \author André Pönitz 2001
+ *  \author André Pönitz 2001
+ *
+ * Full author contact details are available in file CREDITS
 */
 
 class MathGridInset : public MathNestInset {
 
+public:
+
 	/// additional per-cell information
 	struct CellInfo {
 		///
@@ -26,6 +27,13 @@ class MathGridInset : public MathNestInset {
 		int dummy_;
 		/// special multi colums alignment
 		string 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,18 +87,22 @@ public:
 	MathGridInset(col_type m, row_type n);
 	///
 	MathGridInset(col_type m, row_type n, char valign, string const & halign);
+	/// Ensures that the dialog is closed.
+	~MathGridInset();
+	///
+	InsetBase * clone() const;
 	///
-	MathInset * clone() const;
+	void metrics(MetricsInfo & mi) const;
 	///
-	void metrics(MathMetricsInfo & st) const;
+	void metrics(MetricsInfo & mi, Dimension &) const;
 	///
-	void draw(MathPainterInfo &, int x, int y) const;
+	void draw(PainterInfo & pi, int x, int y) const;
 	///
-	void metricsT(TextMetricsInfo const & st) const;
+	void metricsT(TextMetricsInfo const & mi, Dimension & dim) const;
 	///
-	void drawT(TextPainter &, int x, int y) const;
+	void drawT(TextPainter & pi, int x, int y) const;
 	///
-	void halign(string const &);
+	void halign(string const & align);
 	///
 	void halign(char c, col_type col);
 	///
@@ -113,10 +125,14 @@ public:
 	RowInfo & rowinfo(row_type row);
 	///
 	const CellInfo & cellinfo(idx_type idx) const { return cellinfo_[idx]; }
-	/// 
+	///
 	CellInfo & cellinfo(idx_type idx) { return cellinfo_[idx]; }
 	/// identifies GridInset
-	virtual MathGridInset * asGridInset() { return this; }
+	MathGridInset * asGridInset() { return this; }
+	/// identifies GridInset
+	MathGridInset const * asGridInset() const { return this; }
+	/// local dispatcher
+	dispatch_result dispatch(FuncRequest const & cmd, idx_type & idx, pos_type & pos);
 
 	///
 	col_type ncols() const;
@@ -126,52 +142,48 @@ public:
 	col_type col(idx_type idx) const;
 	///
 	row_type row(idx_type idx) const;
-	///
-	int cellXOffset(idx_type idx) const;
-	///
-	int cellYOffset(idx_type idx) const;
 
 	///
-	bool idxUpDown(idx_type &, bool) const;
+	bool idxUpDown(idx_type & idx, pos_type & pos, bool up, int targetx) const;
 	///
-	bool idxLeft(idx_type &, pos_type &) const;
+	bool idxLeft(idx_type & idx, pos_type & pos) const;
 	///
-	bool idxRight(idx_type &, pos_type &) const;
+	bool idxRight(idx_type & idx, pos_type & pos) const;
 	///
-	bool idxFirst(idx_type &, pos_type &) const;
+	bool idxFirst(idx_type & idx, pos_type & pos) const;
 	///
-	bool idxLast(idx_type &, pos_type &) const;
+	bool idxLast(idx_type & idx, pos_type & pos) const;
 	///
-	bool idxHome(idx_type &, pos_type &) const;
+	bool idxHome(idx_type & idx, pos_type & pos) const;
 	///
-	bool idxEnd(idx_type &, pos_type &) const;
+	bool idxEnd(idx_type & idx, pos_type & pos) const;
 	///
-	bool idxDelete(idx_type &);
+	bool idxDelete(idx_type & idx);
 	/// pulls cell after pressing erase
 	void idxGlue(idx_type idx);
 
 	///
-	virtual void addRow(row_type);
+	virtual void addRow(row_type r);
 	///
-	virtual void delRow(row_type);
+	virtual void delRow(row_type r);
 	///
-	virtual void addFancyRow(row_type r) { addRow(r); }
+	virtual void copyRow(row_type r);
 	///
-	virtual void delFancyRow(row_type r) { addRow(r); }
+	virtual void swapRow(row_type r);
 	///
-	virtual void addCol(col_type);
+	virtual void addCol(col_type c);
 	///
-	virtual void delCol(col_type);
+	virtual void delCol(col_type c);
 	///
-	virtual void addFancyCol(col_type c) { addCol(c); }
+	virtual void copyCol(col_type c);
 	///
-	virtual void delFancyCol(col_type c) { addCol(c); }
+	virtual void swapCol(col_type c);
 	///
 	virtual void appendRow();
 	///
-	idx_type index(row_type row, col_type col) const;
+	idx_type index(row_type r, col_type c) const;
 	///
-	std::vector<idx_type> idxBetween(idx_type from, idx_type to) const;
+	bool idxBetween(idx_type idx, idx_type from, idx_type to) const;
 	///
 	virtual int defaultColSpace(col_type) { return 0; }
 	///
@@ -195,20 +207,27 @@ public:
 	///
 	void normalize(NormalStream &) const;
 	///
-	//void maplize(MapleStream &) const;
+	//void maple(MapleStream &) const;
 	///
 	void mathmlize(MathMLStream &) const;
 	///
-	//void octavize(OctaveStream &) const;
+	//void octave(OctaveStream &) const;
 
 protected:
+	/// returns x offset of cell compared to inset
+	int cellXOffset(idx_type idx) const;
+	/// returns y offset of cell compared to inset
+	int cellYOffset(idx_type idx) const;
 	/// returns proper 'end of line' code for LaTeX
-	string eolString(row_type row, bool fragile = false) const;
+	virtual string eolString(row_type row, bool fragile = false) const;
 	/// returns proper 'end of column' code for LaTeX
-	string eocString(col_type col) const;
+	virtual string eocString(col_type col, col_type lastcol) const;
 	/// extract number of columns from alignment string
 	col_type guessColumns(string const & halign) const;
+	/// splits cells and shifts right part to the next cell
+	void splitCell(idx_type &, pos_type & pos);
 
+public:
 	/// row info
 	std::vector<RowInfo> rowinfo_;
 	/// column info