X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathGrid.h;h=7ff533be998e4f978b16d500c3e9cb95c3a39434;hb=872c71ffa61e52918a12c847ef7f87b10741d75a;hp=926216ea1cdca3967a63b2c301c7b0172bf97434;hpb=ff4460603e3888948b46f0ab5bfa69a862d538ad;p=lyx.git

diff --git a/src/mathed/InsetMathGrid.h b/src/mathed/InsetMathGrid.h
index 926216ea1c..7ff533be99 100644
--- a/src/mathed/InsetMathGrid.h
+++ b/src/mathed/InsetMathGrid.h
@@ -73,8 +73,6 @@ public:
 		ColInfo();
 		/// currently possible: 'l', 'c', 'r'
 		char align_;
-		/// cache for drawing
-		int h_offset;
 		/// cached width
 		mutable int width_;
 		/// cached offset
@@ -112,6 +110,8 @@ public:
 	void metricsT(TextMetricsInfo const & mi, Dimension & dim) const;
 	///
 	void drawT(TextPainter & pi, int x, int y) const;
+	///
+	void updateBuffer(ParIterator const &, UpdateType);
 	/// extract number of columns from alignment string
 	static col_type guessColumns(docstring const & halign);
 	/// accepts some LaTeX column codes: p,m,!,@,M,<,>
@@ -185,8 +185,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;
@@ -196,6 +194,8 @@ public:
 	virtual char defaultColAlign(col_type) { return 'c'; }
 	///
 	void setDefaults();
+	///
+	virtual bool interpretString(Cursor & cur, docstring const & str);
 
 	///
 	virtual int colsep() const;
@@ -220,6 +220,10 @@ public:
 	//void maple(MapleStream &) const;
 	///
 	void mathmlize(MathStream &) const;
+	/// 
+	void htmlize(HtmlStream &) const;
+	///
+	void htmlize(HtmlStream &, std::string attrib) const;
 	///
 	//void octave(OctaveStream &) const;
 
@@ -234,11 +238,16 @@ protected:
 	/// returns y offset of cell compared to inset
 	int cellYOffset(idx_type idx) const;
 	/// returns proper 'end of line' code for LaTeX
-	virtual docstring eolString(row_type row, bool fragile) 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 aligmment for display of cell at (\p row, \p col).
+	/// Must not be written to file!
+	virtual char displayColAlign(col_type col, row_type) const { return colinfo_[col].align_; }
+
 
 	/// row info.
 	/// rowinfo_[nrows()] is a dummy row used only for hlines.