X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathArray.cpp;h=eeea831d05e5c2d7f2279a88c6aa7a3553ba9c00;hb=25d64bf43aba78a1ed20c88dfdc4cac269b53985;hp=0d9c7d5c879e049ad1d9f0757edbbaa25dab7a26;hpb=90837aaf6eee523fd594c0ea7f44c053bb49a3cf;p=lyx.git

diff --git a/src/mathed/InsetMathArray.cpp b/src/mathed/InsetMathArray.cpp
index 0d9c7d5c87..eeea831d05 100644
--- a/src/mathed/InsetMathArray.cpp
+++ b/src/mathed/InsetMathArray.cpp
@@ -3,7 +3,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author André Pönitz
+ * \author André Pönitz
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -28,19 +28,21 @@ using namespace std;
 namespace lyx {
 
 
-InsetMathArray::InsetMathArray(docstring const & name, int m, int n)
-	: InsetMathGrid(m, n), name_(name)
+InsetMathArray::InsetMathArray(Buffer * buf, docstring const & name, int m,
+		int n)
+	: InsetMathGrid(buf, m, n), name_(name)
 {}
 
 
-InsetMathArray::InsetMathArray(docstring const & name, int m, int n,
-		char valign, docstring const & halign)
-	: InsetMathGrid(m, n, valign, halign), name_(name)
+InsetMathArray::InsetMathArray(Buffer * buf, docstring const & name, int m,
+		int n, char valign, docstring const & halign)
+	: InsetMathGrid(buf, m, n, valign, halign), name_(name)
 {}
 
 
-InsetMathArray::InsetMathArray(docstring const & name, docstring const & str)
-	: InsetMathGrid(1, 1), name_(name)
+InsetMathArray::InsetMathArray(Buffer * buf, docstring const & name,
+		docstring const & str)
+	: InsetMathGrid(buf, 1, 1), name_(name)
 {
 	vector< vector<string> > dat;
 	istringstream is(to_utf8(str));
@@ -49,7 +51,7 @@ InsetMathArray::InsetMathArray(docstring const & name, docstring const & str)
 		istringstream ls(line);
 		typedef istream_iterator<string> iter;
 		vector<string> v = vector<string>(iter(ls), iter());
-		if (v.size())
+		if (!v.empty())
 			dat.push_back(v);
 	}
 
@@ -59,7 +61,8 @@ InsetMathArray::InsetMathArray(docstring const & name, docstring const & str)
 		addCol(0);
 	for (row_type row = 0; row < dat.size(); ++row)
 		for (col_type col = 0; col < dat[0].size(); ++col)
-			mathed_parse_cell(cell(index(row, col)), from_utf8(dat[row][col]));
+			mathed_parse_cell(cell(index(row, col)),
+					  from_utf8(dat[row][col]), Parse::NORMAL);
 }
 
 
@@ -71,41 +74,28 @@ Inset * InsetMathArray::clone() const
 
 void InsetMathArray::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-	ArrayChanger dummy(mi.base);
+	Changer dummy2 = mi.base.changeEnsureMath();
+	Changer dummy = mi.base.changeArray();
 	InsetMathGrid::metrics(mi, dim);
-	dim.wid += 6;
-}
-
-
-Dimension const InsetMathArray::dimension(BufferView const & bv) const
-{
-	Dimension dim = InsetMathGrid::dimension(bv);
-	dim.wid += 6;
-	return dim;
 }
 
 
 void InsetMathArray::draw(PainterInfo & pi, int x, int y) const
 {
-	setPosCache(pi, x, y);
-	ArrayChanger dummy(pi.base);
-	InsetMathGrid::drawWithMargin(pi, x, y, 4, 2);
+	Changer dummy2 = pi.base.changeEnsureMath();
+	Changer dummy = pi.base.changeArray();
+	InsetMathGrid::draw(pi, x, y);
 }
 
 
 void InsetMathArray::write(WriteStream & os) const
 {
-	bool brace = os.pendingBrace();
-	os.pendingBrace(false);
-	if (os.latex() && os.textMode()) {
-		os << "\\ensuremath{";
-		os.textMode(false);
-		brace = true;
-	}
+	MathEnsurer ensurer(os);
 
 	if (os.fragile())
 		os << "\\protect";
 	os << "\\begin{" << name_ << '}';
+	bool open = os.startOuterRow();
 
 	char const v = verticalAlignment();
 	if (v == 't' || v == 'b')
@@ -117,10 +107,10 @@ void InsetMathArray::write(WriteStream & os) const
 	if (os.fragile())
 		os << "\\protect";
 	os << "\\end{" << name_ << '}';
+	if (open)
+		os.startOuterRow();
 	// adding a \n here is bad if the array is the last item
 	// in an \eqnarray...
-
-	os.pendingBrace(brace);
 }