X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathGrid.h;h=7683ad6305a9a22d9cdf99a80cd7b9bc1a67b5b0;hb=12314897982e07afd8926c997f66d7bb08e7e1fd;hp=7cd93fe1aaeed27c3677d1129afa3f14f6830d4a;hpb=e89625ef28143545a511cdabc67dee8b7be1b216;p=lyx.git

diff --git a/src/mathed/InsetMathGrid.h b/src/mathed/InsetMathGrid.h
index 7cd93fe1aa..7683ad6305 100644
--- a/src/mathed/InsetMathGrid.h
+++ b/src/mathed/InsetMathGrid.h
@@ -13,7 +13,10 @@
 #define MATH_GRID_H
 
 #include "InsetMathNest.h"
-#include "lyxlength.h"
+#include "Length.h"
+
+
+namespace lyx {
 
 
 /** Gridded math inset base class.
@@ -30,7 +33,7 @@ public:
 		/// a dummy cell before a multicolumn cell
 		int dummy_;
 		/// special multi colums alignment
-		std::string align_;
+		docstring align_;
 		/// these should be a per-cell property, but ok to have it here
 		/// for single-column grids like paragraphs
 		mutable int glue_;
@@ -56,9 +59,11 @@ public:
 		/// how many hlines above this row?
 		unsigned int lines_;
 		/// parameter to the line break
-		LyXLength crskip_;
+		Length crskip_;
 		/// extra distance between lines
 		int skip_;
+		/// Is a page break allowed after this row?
+		bool allow_pagebreak_;
 	};
 
 	// additional per-row information
@@ -78,21 +83,22 @@ public:
 		unsigned int lines_;
 		/// additional amount to be skipped when drawing
 		int skip_;
+		/// Special alignment.
+		/// This does also contain align_ and lines_ if it is nonempty.
+		/// It needs to be in sync with align_ and lines_ because some
+		/// code only uses align_ and lines_.
+		docstring special_;
 	};
 
 public:
 	/// sets nrows and ncols to 1
 	InsetMathGrid();
 	/// constructor from columns description, creates one row
-	InsetMathGrid(char valign, std::string const & halign);
+	InsetMathGrid(char valign, docstring const & halign);
 	/// Note: columns first!
 	InsetMathGrid(col_type m, row_type n);
 	///
-	InsetMathGrid(col_type m, row_type n, char valign, std::string const & halign);
-	/// Ensures that the dialog is closed.
-	~InsetMathGrid();
-	///
-	void metrics(MetricsInfo & mi) const;
+	InsetMathGrid(col_type m, row_type n, char valign, docstring const & halign);
 	///
 	void metrics(MetricsInfo & mi, Dimension &) const;
 	///
@@ -100,26 +106,29 @@ public:
 	///
 	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;
 	///
-	void halign(std::string const & align);
+	void halign(docstring const & align);
 	///
 	void halign(char c, col_type col);
 	///
 	char halign(col_type col) const;
 	///
-	std::string halign() const;
+	docstring halign() const;
 	///
 	void valign(char c);
 	///
 	char valign() const;
 	///
-	void vcrskip(LyXLength const &, row_type row);
+	void vcrskip(Length const &, row_type row);
 	///
-	LyXLength vcrskip(row_type row) const;
+	Length vcrskip(row_type row) const;
 	///
 	void resize(short int type, col_type cols);
 	///
@@ -144,15 +153,15 @@ public:
 	row_type row(idx_type idx) const;
 
 	///
-	bool idxUpDown(LCursor &, bool up) const;
+	bool idxUpDown(Cursor &, bool up) const;
 	///
-	bool idxLeft(LCursor &) const;
+	bool idxLeft(Cursor &) const;
 	///
-	bool idxRight(LCursor &) const;
+	bool idxRight(Cursor &) const;
 	///
-	bool idxFirst(LCursor &) const;
+	bool idxFirst(Cursor &) const;
 	///
-	bool idxLast(LCursor &) const;
+	bool idxLast(Cursor &) const;
 	///
 	bool idxDelete(idx_type & idx);
 	/// pulls cell after pressing erase
@@ -205,28 +214,28 @@ public:
 	///
 	//void maple(MapleStream &) const;
 	///
-	void mathmlize(MathMLStream &) const;
+	void mathmlize(MathStream &) const;
 	///
 	//void octave(OctaveStream &) const;
 
 protected:
-	virtual void doDispatch(LCursor & cur, FuncRequest & cmd);
+	virtual void doDispatch(Cursor & cur, FuncRequest & cmd);
 	///
-	bool getStatus(LCursor & cur, FuncRequest const & cmd,
+	bool getStatus(Cursor & cur, FuncRequest const & cmd,
 		FuncStatus & flag) const;
 	/// returns x offset of cell compared to inset
-	int cellXOffset(idx_type idx) const;
+	int cellXOffset(BufferView const &, 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
-	virtual std::string eolString(row_type row, bool emptyline,
+	virtual docstring eolString(row_type row, bool emptyline,
 				      bool fragile) const;
 	/// returns proper 'end of column' code for LaTeX
-	virtual std::string eocString(col_type col, col_type lastcol) const;
+	virtual docstring eocString(col_type col, col_type lastcol) const;
 	/// extract number of columns from alignment string
-	col_type guessColumns(std::string const & halign) const;
+	col_type guessColumns(docstring const & halign) const;
 	/// splits cells and shifts right part to the next cell
-	void splitCell(LCursor & cur);
+	void splitCell(Cursor & cur);
 
 	/// row info.
 	/// rowinfo_[nrows()] is a dummy row used only for hlines.
@@ -239,7 +248,10 @@ protected:
 	///
 	char v_align_; // add approp. type
 private:
-	virtual std::auto_ptr<InsetBase> doClone() const;
+	virtual Inset * clone() const;
 };
 
+
+
+} // namespace lyx
 #endif