We only support gcc >= 4.9.

[lyx.git] / src / mathed / InsetMathArray.cpp

diff --git a/src/mathed/InsetMathArray.cpp b/src/mathed/InsetMathArray.cpp
index fd7ceebe31c8634089204d583bd4d1ee1bcdd985..2815dc9612b06b87ee7e8faae344131cc782bbdc 100644 (file)
--- 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,35 +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
+void InsetMathArray::write(TeXMathStream & os) const
 {
        MathEnsurer ensurer(os);
 
        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...
 }