fix xxalignat bug

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5155 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/mathed/math_data.C b/src/mathed/math_data.C
index f97c93ec07318ad071dd5700fcae1d47e7d6b183..0002db98df28ad1ecb9ffbcc38d3eb7090f0948c 100644 (file)
--- a/src/mathed/math_data.C
+++ b/src/mathed/math_data.C
@@ -214,12 +214,11 @@ Dimension const & MathArray::metrics(MathMetricsInfo & mi) const
        clean_  = true;
        drawn_  = false;
 
-       if (empty()) {
-               mathed_char_dim(mi.base.font, 'I', dim_);
+       mathed_char_dim(mi.base.font, 'I', dim_);
+       if (empty()) 
                return dim_;
-       }
 
-       dim_.clear();
+       dim_.w = 0;
        for (const_iterator it = begin(), et = end(); it != et; ++it) {
                (*it)->metrics(mi);
                dim_ += (*it)->dimensions();

diff --git a/src/mathed/math_hullinset.C b/src/mathed/math_hullinset.C
index 6d4e2809918f087a663eacd8be0247aa018231a8..4f5a81d29b9d640feb48e1006cc34819102eba8a 100644 (file)
--- a/src/mathed/math_hullinset.C
+++ b/src/mathed/math_hullinset.C
@@ -402,7 +402,9 @@ void MathHullInset::footer_write(WriteStream & os) const
 
 bool MathHullInset::colChangeOK() const
 {
-       return type_ == "align" || type_ == "alignat" || type_ == "xalignat";
+       return
+               type_ == "align" || type_ == "alignat" ||
+               type_ == "xalignat" || type_ == "xxalignat";
 }