X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathArray.cpp;h=eeea831d05e5c2d7f2279a88c6aa7a3553ba9c00;hb=31cd421bcd26647cb7edbb694b05473271fe9153;hp=fd7ceebe31c8634089204d583bd4d1ee1bcdd985;hpb=ff4460603e3888948b46f0ab5bfa69a862d538ad;p=lyx.git

diff --git a/src/mathed/InsetMathArray.cpp b/src/mathed/InsetMathArray.cpp
index fd7ceebe31..eeea831d05 100644
--- a/src/mathed/InsetMathArray.cpp
+++ b/src/mathed/InsetMathArray.cpp
@@ -51,7 +51,7 @@ InsetMathArray::InsetMathArray(Buffer * buf, docstring const & name,
 		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);
 	}
 
@@ -74,25 +74,17 @@ 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);
 }
 
 
@@ -103,6 +95,7 @@ void InsetMathArray::write(WriteStream & os) const
 	if (os.fragile())
 		os << "\\protect";
 	os << "\\begin{" << name_ << '}';
+	bool open = os.startOuterRow();
 
 	char const v = verticalAlignment();
 	if (v == 't' || v == 'b')
@@ -114,6 +107,8 @@ 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...
 }