The previous commit was actually a fix for bug #9158.

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

diff --git a/src/mathed/InsetMathArray.cpp b/src/mathed/InsetMathArray.cpp
index 821f4605e8f119a5fa74210d319ad9e9d06f4887..22f8471bfe2fda2bf9289d3072d29b7fa605473a 100644 (file)
--- a/src/mathed/InsetMathArray.cpp
+++ b/src/mathed/InsetMathArray.cpp
@@ -74,7 +74,8 @@ Inset * InsetMathArray::clone() const
 
 void InsetMathArray::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       ArrayChanger dummy(mi.base);
+       Changer dummy =
+               mi.base.changeStyle(LM_ST_TEXT, mi.base.style == LM_ST_DISPLAY);
        InsetMathGrid::metrics(mi, dim);
        dim.wid += 6;
 }
@@ -91,7 +92,8 @@ Dimension const InsetMathArray::dimension(BufferView const & bv) const
 void InsetMathArray::draw(PainterInfo & pi, int x, int y) const
 {
        setPosCache(pi, x, y);
-       ArrayChanger dummy(pi.base);
+       Changer dummy =
+               pi.base.changeStyle(LM_ST_TEXT, pi.base.style == LM_ST_DISPLAY);
        InsetMathGrid::drawWithMargin(pi, x, y, 4, 2);
 }
 
@@ -103,6 +105,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 +117,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...
 }