fix xxalignat bug

[lyx.git] / src / mathed / math_hullinset.C

diff --git a/src/mathed/math_hullinset.C b/src/mathed/math_hullinset.C
index 8b1c556c5cadec47afe3418261e16fc5f3e71062..4f5a81d29b9d640feb48e1006cc34819102eba8a 100644 (file)
--- a/src/mathed/math_hullinset.C
+++ b/src/mathed/math_hullinset.C
@@ -400,6 +400,14 @@ void MathHullInset::footer_write(WriteStream & os) const
 }
 
 
+bool MathHullInset::colChangeOK() const
+{
+       return
+               type_ == "align" || type_ == "alignat" ||
+               type_ == "xalignat" || type_ == "xxalignat";
+}
+
+
 void MathHullInset::addRow(row_type row)
 {
        nonum_.insert(nonum_.begin() + row + 1, !numberedType());
@@ -410,32 +418,29 @@ void MathHullInset::addRow(row_type row)
 
 void MathHullInset::delRow(row_type row)
 {
+       if (nrows() <= 1)
+               return;
        MathGridInset::delRow(row);
        nonum_.erase(nonum_.begin() + row);
        label_.erase(label_.begin() + row);
 }
 
 
-void MathHullInset::addFancyCol(col_type col)
+void MathHullInset::addCol(col_type col)
 {
-       if (type_ == "equation")
-               mutate("eqnarray");
-
-       else if (type_ == "eqnarray") {
-               mutate("align");
-               addFancyCol(col);
-       }
-
-       else if (type_ == "align" || type_ == "alignat"
-             || type_ == "xalignat" || type_ == "xxalignat")
+       if (colChangeOK()) 
                MathGridInset::addCol(col);
+       else
+               lyxerr << "Can't change number of columns in '" << type_ << "'\n";
 }
 
 
-void MathHullInset::delFancyCol(col_type col)
+void MathHullInset::delCol(col_type col)
 {
-       if (type_ == "alignat" || type_ == "xalignat" || type_ == "xxalignat")
+       if (colChangeOK()) 
                MathGridInset::delCol(col);
+       else
+               lyxerr << "Can't change number of columns in '" << type_ << "'\n";
 }
 
 
@@ -582,12 +587,16 @@ void MathHullInset::mutate(string const & newtype)
        }
 
        else if (type_ == "multline") {
-               if (newtype == "gather") {
-                       setType("gather");
+               if (newtype == "gather" || newtype == "align" ||        
+                          newtype == "xalign" || newtype == "xxalign")
+                       setType(newtype);
+               else if (newtype == "eqnarray") {
+                       MathGridInset::addCol(1);
+                       MathGridInset::addCol(1);
+                       setType("eqnarray");
                } else {
                        lyxerr << "mutation from '" << type_
-                               << "' to '" << newtype << "' not implemented"
-                                                << endl;
+                               << "' to '" << newtype << "' not implemented" << endl;
                }
        }
 
@@ -607,24 +616,23 @@ void MathHullInset::mutate(string const & newtype)
 }
 
 
-void MathHullInset::write(WriteStream & os) const
+string MathHullInset::eolString(row_type row, bool fragile) const
 {
-       header_write(os);
-
-       bool n = numberedType();
-
-       for (row_type row = 0; row < nrows(); ++row) {
-               for (col_type col = 0; col < ncols(); ++col)
-                       os << cell(index(row, col)) << eocString(col);
-               if (n) {
-                       if (!label_[row].empty())
-                               os << "\\label{" << label_[row] << "}";
-                       if (nonum_[row])
-                               os << "\\nonumber ";
-               }
-               os << eolString(row);
+       string res;
+       if (numberedType()) {
+               if (!label_[row].empty())
+                       res += "\\label{" + label_[row] + "}";
+               if (nonum_[row])
+                       res += "\\nonumber ";
        }
+       return res + MathGridInset::eolString(row, fragile);
+}
 
+
+void MathHullInset::write(WriteStream & os) const
+{
+       header_write(os);
+       MathGridInset::write(os);
        footer_write(os);
 }
 
@@ -800,11 +808,6 @@ MathInset::result_type MathHullInset::dispatch
                        return DISPATCHED;
                }
 
-               case LFUN_MATH_HALIGN:
-               case LFUN_MATH_VALIGN:
-                       // we explicitly don't want the default behaviour here
-                       return UNDISPATCHED;
-
                case LFUN_MATH_EXTERN:
                        doExtern(cmd, idx, pos);
                        return DISPATCHED_POP;