]> git.lyx.org Git - lyx.git/blobdiff - src/mathed/math_hullinset.C
and some mathed de-uglyfication
[lyx.git] / src / mathed / math_hullinset.C
index d1736f34d7d051bffa4ef13d092fd1d6896be7c1..c18072ee95b478768724854fec65a0dc7ae0de87 100644 (file)
@@ -1,38 +1,65 @@
-#include <config.h>
+/**
+ * \file math_hullinset.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author André Pönitz
+ *
+ * Full author contact details are available in file CREDITS.
+ */
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
+#include <config.h>
 
 #include "math_hullinset.h"
 #include "math_mathmlstream.h"
 #include "math_streamstr.h"
+#include "math_cursor.h"
 #include "math_support.h"
+#include "math_extern.h"
+#include "math_charinset.h"
+#include "textpainter.h"
+#include "BufferView.h"
+#include "dispatchresult.h"
 #include "debug.h"
-#include "Painter.h"
+#include "funcrequest.h"
+#include "gettext.h"
 #include "LaTeXFeatures.h"
-#include "support/LAssert.h"
+#include "LColor.h"
+#include "lyxrc.h"
 
-#include <vector>
+#include "frontends/Alert.h"
+
+#include "support/std_sstream.h"
+
+
+using lyx::support::trim;
 
-using std::vector;
-using std::max;
 using std::endl;
+using std::max;
+
+using std::string;
+using std::auto_ptr;
+using std::istringstream;
+using std::ostringstream;
+using std::pair;
+
 
 namespace {
 
-       int getCols(MathInsetTypes type)
+       int getCols(string const & type)
        {
-               switch (type) {
-                       case LM_OT_EQNARRAY:
-                               return 3;
-                       case LM_OT_ALIGN:
-                       case LM_OT_ALIGNAT:
-                       case LM_OT_XALIGNAT:
-                       case LM_OT_XXALIGNAT:
-                               return 2;
-                       default:;
-               }
+               if (type == "eqnarray")
+                       return 3;
+               if (type == "align")
+                       return 2;
+               if (type == "flalign")
+                       return 2;
+               if (type == "alignat")
+                       return 2;
+               if (type == "xalignat")
+                       return 2;
+               if (type == "xxalignat")
+                       return 2;
                return 1;
        }
 
@@ -53,186 +80,209 @@ namespace {
                return numbered ? "" : "*";
        }
 
-       MathInsetTypes typecode(string const & s)
+
+       int typecode(string const & s)
        {
-               if (s == "equation")  return LM_OT_EQUATION;
-               if (s == "display")   return LM_OT_EQUATION;
-               if (s == "eqnarray")  return LM_OT_EQNARRAY;
-               if (s == "align")     return LM_OT_ALIGN;
-               if (s == "alignat")   return LM_OT_ALIGNAT;
-               if (s == "xalignat")  return LM_OT_XALIGNAT;
-               if (s == "xxalignat") return LM_OT_XXALIGNAT;
-               if (s == "multline")  return LM_OT_MULTLINE;
-               if (s == "gather")    return LM_OT_GATHER;
-               return LM_OT_SIMPLE;
-       }       
-
-
-       string normalName(MathInsetTypes t)
+               if (s == "none")      return 0;
+               if (s == "simple")    return 1;
+               if (s == "equation")  return 2;
+               if (s == "eqnarray")  return 3;
+               if (s == "align")     return 4;
+               if (s == "alignat")   return 5;
+               if (s == "xalignat")  return 6;
+               if (s == "xxalignat") return 7;
+               if (s == "multline")  return 8;
+               if (s == "gather")    return 9;
+               if (s == "flalign")   return 10;
+               lyxerr << "unknown hull type '" << s << "'" << endl;
+               return 0;
+       }
+
+       bool smaller(string const & s, string const & t)
        {
-               switch (t) {
-                       case LM_OT_EQUATION:  return "equation";
-                       case LM_OT_EQNARRAY:  return "eqnarray";
-                       case LM_OT_ALIGN:     return "align";
-                       case LM_OT_ALIGNAT:   return "alignat";
-                       case LM_OT_XALIGNAT:  return "xalignat";
-                       case LM_OT_XXALIGNAT: return "xxalignat";
-                       case LM_OT_MULTLINE:  return "multline";
-                       case LM_OT_GATHER:    return "gather";
-                       case LM_OT_SIMPLE:    return "simple";
-                       default: break;
-               }
-               return "unknown";
-       }       
+               return typecode(s) < typecode(t);
+       }
+
 
 } // end anon namespace
 
 
 MathHullInset::MathHullInset()
-       : MathGridInset(1, 1), objtype_(LM_OT_SIMPLE), nonum_(1), label_(1)
+       : MathGridInset(1, 1), type_("none"), nonum_(1), label_(1)
 {
        setDefaults();
 }
 
 
-MathHullInset::MathHullInset(MathInsetTypes t)
-       : MathGridInset(getCols(t), 1), objtype_(t), nonum_(1), label_(1)
+MathHullInset::MathHullInset(string const & type)
+       : MathGridInset(getCols(type), 1), type_(type), nonum_(1), label_(1)
 {
        setDefaults();
 }
 
 
-MathHullInset::MathHullInset(MathInsetTypes t, MathGridInset const & grid)
-       : MathGridInset(grid), objtype_(t), nonum_(1), label_(1)
+auto_ptr<InsetBase> MathHullInset::clone() const
 {
-       setDefaults();
+       return auto_ptr<InsetBase>(new MathHullInset(*this));
 }
 
 
-MathHullInset::MathHullInset(MathInsetTypes t, col_type cols)
-       : MathGridInset(cols, 1), objtype_(t), nonum_(1), label_(1)
+MathInset::mode_type MathHullInset::currentMode() const
 {
-       setDefaults();
+       if (type_ == "none")
+               return UNDECIDED_MODE;
+       // definitely math mode ...
+       return MATH_MODE;
 }
 
 
-MathInset * MathHullInset::clone() const
+bool MathHullInset::idxFirst(LCursor & cur) const
 {
-       return new MathHullInset(*this);
+       cur.idx() = 0;
+       cur.pos() = 0;
+       return true;
+}
+
+
+bool MathHullInset::idxLast(LCursor & cur) const
+{
+       cur.idx() = nargs() - 1;
+       cur.pos() = cur.lastpos();
+       return true;
 }
 
 
 char MathHullInset::defaultColAlign(col_type col)
 {
-       switch (getType()) {
-               case LM_OT_ALIGN:
-               case LM_OT_ALIGNAT:
-               case LM_OT_XALIGNAT:
-               case LM_OT_XXALIGNAT:
-                       return "rl"[col & 1];
-               case LM_OT_EQNARRAY:
-                       return "rcl"[col];
-               default:;
-       }
+       if (type_ == "eqnarray")
+               return "rcl"[col];
+       if (typecode(type_) >= typecode("align"))
+               return "rl"[col & 1];
        return 'c';
 }
 
 
 int MathHullInset::defaultColSpace(col_type col)
 {
-       switch (getType()) {
-               case LM_OT_ALIGN:
-               case LM_OT_ALIGNAT:
-                       return 0;
-               case LM_OT_XALIGNAT:
-                       return (col & 1) ? 20 : 0;
-               case LM_OT_XXALIGNAT:
-                       return (col & 1) ? 40 : 0;
-               default:;
-       }
+       if (type_ == "align" || type_ == "alignat")
+               return 0;
+       if (type_ == "xalignat")
+               return (col & 1) ? 20 : 0;
+       if (type_ == "xxalignat" || type_ == "flalign")
+               return (col & 1) ? 40 : 0;
        return 0;
 }
 
 
-void MathHullInset::metrics(MathMetricsInfo const & mi) const
+char const * MathHullInset::standardFont() const
 {
-       mi_ = mi;
-       mi_.style = (getType() == LM_OT_SIMPLE) ? LM_ST_TEXT : LM_ST_DISPLAY;
+       if (type_ == "none")
+               return "lyxnochange";
+       return "mathnormal";
+}
+
+
+void MathHullInset::metrics(MetricsInfo & mi, Dimension & dim) const
+{
+       FontSetChanger dummy1(mi.base, standardFont());
+       StyleChanger dummy2(mi.base, display() ? LM_ST_DISPLAY : LM_ST_TEXT);
 
        // let the cells adjust themselves
-       MathGridInset::metrics(mi_);
+       MathGridInset::metrics(mi);
 
        if (display()) {
-               ascent_  += 12;
-               descent_ += 12;
-       }       
+               dim_.asc += 12;
+               dim_.des += 12;
+       }
 
        if (numberedType()) {
-               whichFont(mi_.font, LM_TC_BF, mi_);
+               FontSetChanger dummy(mi.base, "mathbf");
                int l = 0;
                for (row_type row = 0; row < nrows(); ++row)
-                       l = max(l, mathed_string_width(mi_.font, nicelabel(row)));
+                       l = max(l, mathed_string_width(mi.base.font, nicelabel(row)));
 
                if (l)
-                       width_ += 30 + l;
+                       dim_.wid += 30 + l;
        }
 
        // make it at least as high as the current font
        int asc = 0;
        int des = 0;
-       math_font_max_dim(mi_.font, asc, des);
-       ascent_  = max(ascent_,  asc);
-       descent_ = max(descent_, des);
+       math_font_max_dim(mi.base.font, asc, des);
+       dim_.asc = max(dim_.asc, asc);
+       dim_.des = max(dim_.des, des);
+
+       // for markers
+       metricsMarkers2();
+       dim = dim_;
 }
 
 
-void MathHullInset::draw(Painter & pain, int x, int y) const
+void MathHullInset::draw(PainterInfo & pi, int x, int y) const
 {
-       MathGridInset::draw(pain, x, y);
+       FontSetChanger dummy1(pi.base, standardFont());
+       StyleChanger dummy2(pi.base, display() ? LM_ST_DISPLAY : LM_ST_TEXT);
+       MathGridInset::draw(pi, x + 1, y);
 
        if (numberedType()) {
                int const xx = x + colinfo_.back().offset_ + colinfo_.back().width_ + 20;
                for (row_type row = 0; row < nrows(); ++row) {
                        int const yy = y + rowinfo_[row].offset_;
-                       drawStr(pain, mi_.font, xx, yy, nicelabel(row));
+                       FontSetChanger dummy(pi.base, "mathrm");
+                       drawStr(pi, pi.base.font, xx, yy, nicelabel(row));
                }
        }
+
+       drawMarkers2(pi, x, y);
 }
 
-/*
-void MathHullInset::metricsT(TextMetricsInfo const & mi) const
+
+void MathHullInset::metricsT(TextMetricsInfo const & mi, Dimension & dim) const
 {
-       ascent_  = 1;
-       descent_ = 0;
-       width_   = normalName(objtype_).size();
+       if (display()) {
+               MathGridInset::metricsT(mi, dim);
+       } else {
+               ostringstream os;
+               WriteStream wi(os, false, true);
+               write(wi);
+               dim.wid = os.str().size();
+               dim.asc = 1;
+               dim.des = 0;
+       }
 }
 
 
 void MathHullInset::drawT(TextPainter & pain, int x, int y) const
 {
-       pain.draw(x, y, normalName(objtype_).c_str());
-       MathGridInset::draw(pain, x, y);
+       if (display()) {
+               MathGridInset::drawT(pain, x, y);
+       } else {
+               ostringstream os;
+               WriteStream wi(os, false, true);
+               write(wi);
+               pain.draw(x, y, os.str().c_str());
+       }
 }
-*/
 
 
 string MathHullInset::label(row_type row) const
 {
        row_type n = nrows();
-       lyx::Assert(row < n);
+       BOOST_ASSERT(row < n);
        return label_[row];
 }
 
 
 void MathHullInset::label(row_type row, string const & label)
 {
-       label_[row] = label; 
+       //lyxerr << "setting label '" << label << "' for row " << row << endl;
+       label_[row] = label;
 }
 
 
 void MathHullInset::numbered(row_type row, bool num)
 {
-       nonum_[row] = !num; 
+       nonum_[row] = !num;
 }
 
 
@@ -244,38 +294,39 @@ bool MathHullInset::numbered(row_type row) const
 
 bool MathHullInset::ams() const
 {
-       return true;
-/*
-       return 
-               objtype_ == LM_OT_ALIGN ||
-               objtype_ == LM_OT_MULTLINE ||
-               objtype_ == LM_OT_GATHER ||
-               objtype_ == LM_OT_ALIGNAT ||
-               objtype_ == LM_OT_XALIGNAT ||
-               objtype_ == LM_OT_XXALIGNAT;
-*/
+       return
+               type_ == "align" ||
+               type_ == "flalign" ||
+               type_ == "multline" ||
+               type_ == "gather" ||
+               type_ == "alignat" ||
+               type_ == "xalignat" ||
+               type_ == "xxalignat";
 }
 
 
 bool MathHullInset::display() const
 {
-       return getType() != LM_OT_SIMPLE;
+       return type_ != "simple" && type_ != "none";
 }
 
 
-vector<string> const MathHullInset::getLabelList() const
+void MathHullInset::getLabelList(Buffer const &,
+                                std::vector<string> & labels) const
 {
-       vector<string> res;
        for (row_type row = 0; row < nrows(); ++row)
                if (!label_[row].empty() && nonum_[row] != 1)
-                       res.push_back(label_[row]);
-       return res;
+                       labels.push_back(label_[row]);
 }
 
 
 bool MathHullInset::numberedType() const
 {
-       if (getType() == LM_OT_SIMPLE || getType() == LM_OT_XXALIGNAT)
+       if (type_ == "none")
+               return false;
+       if (type_ == "simple")
+               return false;
+       if (type_ == "xxalignat")
                return false;
        for (row_type row = 0; row < nrows(); ++row)
                if (!nonum_[row])
@@ -298,7 +349,7 @@ void MathHullInset::validate(LaTeXFeatures & features) const
        features.require("boldsymbol");
        //features.binom      = true;
 
-       MathNestInset::validate(features);
+       MathGridInset::validate(features);
 }
 
 
@@ -306,54 +357,36 @@ void MathHullInset::header_write(WriteStream & os) const
 {
        bool n = numberedType();
 
-       switch (getType()) {
-               case LM_OT_SIMPLE:
-                       os << '$';
-                       if (cell(0).empty())
-                               os << ' ';
-                       break;
-
-               case LM_OT_EQUATION:
-                       if (n)
-                               os << "\\begin{equation" << star(n) << "}\n"; 
-                       else
-                               os << "\\[\n"; 
-                       break;
-
-               case LM_OT_EQNARRAY:
-                       os << "\\begin{eqnarray" << star(n) << "}\n";
-                       break;
-
-               case LM_OT_ALIGN:
-                       os << "\\begin{align" << star(n) << "}\n";
-                       break;
-
-               case LM_OT_ALIGNAT:
-                       os << "\\begin{alignat" << star(n) << "}"
-                         << "{" << static_cast<unsigned int>(ncols()/2) << "}\n";
-                       break;
-
-               case LM_OT_XALIGNAT:
-                       os << "\\begin{xalignat" << star(n) << "}"
-                          << "{" << static_cast<unsigned int>(ncols()/2) << "}\n";
-                       break;
-
-               case LM_OT_XXALIGNAT:
-                       os << "\\begin{xxalignat}" 
-                          << "{" << static_cast<unsigned int>(ncols()/2) << "}\n";
-                       break;
-
-               case LM_OT_MULTLINE:
-                       os << "\\begin{multline}\n";
-                       break;
-
-               case LM_OT_GATHER:
-                       os << "\\begin{gather}\n";
-                       break;
+       if (type_ == "none")
+               ;
 
-               default:
-                       os << "\\begin{unknown" << star(n) << "}";
+       else if (type_ == "simple") {
+               os << '$';
+               if (cell(0).empty())
+                       os << ' ';
+       }
+
+       else if (type_ == "equation") {
+               if (n)
+                       os << "\\begin{equation" << star(n) << "}\n";
+               else
+                       os << "\\[\n";
        }
+
+       else if (type_ == "eqnarray" || type_ == "align" || type_ == "flalign"
+                || type_ == "gather" || type_ == "multline")
+                       os << "\\begin{" << type_ << star(n) << "}\n";
+
+       else if (type_ == "alignat" || type_ == "xalignat")
+               os << "\\begin{" << type_ << star(n) << '}'
+                 << '{' << static_cast<unsigned int>((ncols() + 1)/2) << "}\n";
+
+       else if (type_ == "xxalignat")
+               os << "\\begin{" << type_ << '}'
+                 << '{' << static_cast<unsigned int>((ncols() + 1)/2) << "}\n";
+
+       else
+               os << "\\begin{unknown" << star(n) << '}';
 }
 
 
@@ -361,53 +394,40 @@ void MathHullInset::footer_write(WriteStream & os) const
 {
        bool n = numberedType();
 
-       switch (getType()) {
-               case LM_OT_SIMPLE:
-                       os << '$';
-                       break;
-
-               case LM_OT_EQUATION:
-                       if (n)
-                               os << "\\end{equation" << star(n) << "}\n"; 
-                       else
-                               os << "\\]\n"; 
-                       break;
-
-               case LM_OT_EQNARRAY:
-                       os << "\n\\end{eqnarray" << star(n) << "}\n";
-                       break;
+       if (type_ == "none")
+               os << "\n";
 
-               case LM_OT_ALIGN:
-                       os << "\n\\end{align" << star(n) << "}\n";
-                       break;
+       else if (type_ == "simple")
+               os << '$';
 
-               case LM_OT_ALIGNAT:
-                       os << "\n\\end{alignat" << star(n) << "}\n";
-                       break;
+       else if (type_ == "equation")
+               if (n)
+                       os << "\\end{equation" << star(n) << "}\n";
+               else
+                       os << "\\]\n";
 
-               case LM_OT_XALIGNAT:
-                       os << "\n\\end{xalignat" << star(n) << "}\n";
-                       break;
+       else if (type_ == "eqnarray" || type_ == "align" || type_ == "flalign"
+                || type_ == "alignat" || type_ == "xalignat"
+                || type_ == "gather" || type_ == "multline")
+               os << "\\end{" << type_ << star(n) << "}\n";
 
-               case LM_OT_XXALIGNAT:
-                       os << "\n\\end{xxalignat}\n";
-                       break;
+       else if (type_ == "xxalignat")
+               os << "\\end{" << type_ << "}\n";
 
-               case LM_OT_MULTLINE:
-                       os << "\n\\end{multline}\n";
-                       break;
+       else
+               os << "\\end{unknown" << star(n) << '}';
+}
 
-               case LM_OT_GATHER:
-                       os << "\n\\end{gather}\n";
-                       break;
 
-               default:
-                       os << "\\end{unknown" << star(n) << "}";
-       }
+bool MathHullInset::colChangeOK() const
+{
+       return
+               type_ == "align" || type_ == "flalign" ||type_ == "alignat" ||
+               type_ == "xalignat" || type_ == "xxalignat";
 }
 
 
-void MathHullInset::addRow(row_type row) 
+void MathHullInset::addRow(row_type row)
 {
        nonum_.insert(nonum_.begin() + row + 1, !numberedType());
        label_.insert(label_.begin() + row + 1, string());
@@ -415,16 +435,22 @@ void MathHullInset::addRow(row_type row)
 }
 
 
-void MathHullInset::appendRow()
+void MathHullInset::swapRow(row_type row)
 {
-       nonum_.push_back(!numberedType());
-       label_.push_back(string());
-       MathGridInset::appendRow();
+       if (nrows() == 1)
+               return;
+       if (row + 1 == nrows())
+               --row;
+       std::swap(nonum_[row], nonum_[row + 1]);
+       std::swap(label_[row], label_[row + 1]);
+       MathGridInset::swapRow(row);
 }
 
 
-void MathHullInset::delRow(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);
@@ -433,46 +459,19 @@ void MathHullInset::delRow(row_type row)
 
 void MathHullInset::addCol(col_type col)
 {
-       switch (getType()) {
-               case LM_OT_EQUATION:
-                       mutate(LM_OT_EQNARRAY);
-                       break;
-
-               case LM_OT_EQNARRAY:
-                       mutate(LM_OT_ALIGN);
-                       addCol(col);
-                       break;
-
-               case LM_OT_ALIGN:
-                       mutate(LM_OT_ALIGNAT);
-                       addCol(col);
-                       break;
-
-               case LM_OT_ALIGNAT:
-               case LM_OT_XALIGNAT:
-               case LM_OT_XXALIGNAT:
-                       MathGridInset::addCol(col);
-                       MathGridInset::addCol(col + 1);
-                       break;
-
-               default:
-                       break;
-       }
+       if (colChangeOK())
+               MathGridInset::addCol(col);
+       else
+               lyxerr << "Can't change number of columns in '" << type_ << "'" << endl;
 }
 
 
 void MathHullInset::delCol(col_type col)
 {
-       switch (getType()) {
-               case LM_OT_ALIGNAT:
-               case LM_OT_XALIGNAT:
-               case LM_OT_XXALIGNAT:
-                       MathGridInset::delCol(col + 1);
-                       MathGridInset::delCol(col);
-                       break;
-               default:
-                       break;
-       }
+       if (colChangeOK())
+               MathGridInset::delCol(col);
+       else
+               lyxerr << "Can't change number of columns in '" << type_ << "'" << endl;
 }
 
 
@@ -482,18 +481,7 @@ string MathHullInset::nicelabel(row_type row) const
                return string();
        if (label_[row].empty())
                return string("(#)");
-       return "(" + label_[row] + ")";
-}
-
-
-void MathHullInset::mutate(string const & newtype)
-{
-       if (newtype == "dump") {
-               dump();
-               return;
-       }
-       //lyxerr << "mutating from '" << getType() << "' to '" << newtype << "'\n";
-       mutate(typecode(newtype));
+       return '(' + label_[row] + ')';
 }
 
 
@@ -501,211 +489,188 @@ void MathHullInset::glueall()
 {
        MathArray ar;
        for (idx_type i = 0; i < nargs(); ++i)
-               ar.push_back(cell(i));
-       *this = MathHullInset(LM_OT_SIMPLE);
+               ar.append(cell(i));
+       *this = MathHullInset("simple");
        cell(0) = ar;
+       setDefaults();
 }
 
 
-MathInsetTypes MathHullInset::getType() const
+string const & MathHullInset::getType() const
 {
-       return objtype_;
+       return type_;
 }
 
 
-void MathHullInset::setType(MathInsetTypes t)
+void MathHullInset::setType(string const & type)
 {
-       objtype_ = t;
+       type_ = type;
        setDefaults();
 }
 
 
 
-void MathHullInset::mutate(MathInsetTypes newtype)
+void MathHullInset::mutate(string const & newtype)
 {
-       //lyxerr << "mutating from '" << getType() << "' to '" << newtype << "'\n";
-
-       if (newtype == getType())
-               return;
-
-       switch (getType()) {
-               case LM_OT_SIMPLE:
-                       setType(LM_OT_EQUATION);
-                       numbered(0, false);
-                       mutate(newtype);
-                       break;
-
-               case LM_OT_EQUATION:
-                       switch (newtype) {
-                               case LM_OT_SIMPLE:
-                                       setType(LM_OT_SIMPLE);
-                                       break;
-
-                               case LM_OT_ALIGN: 
-                               case LM_OT_ALIGNAT:
-                               case LM_OT_XALIGNAT:
-                               case LM_OT_XXALIGNAT: {
+       lyxerr << "mutating from '" << type_ << "' to '" << newtype << "'" << endl;
 
-                                       MathGridInset::addCol(1);
+       // we try to move along the chain
+       // none <-> simple <-> equation <-> eqnarray
 
-                                       // split it "nicely"
-                                       pos_type pos = firstRelOp(cell(0));     
-                                       cell(1) = cell(0);
-                                       cell(0).erase(pos, cell(0).size());
-                                       cell(1).erase(0, pos);
-                                       setType(LM_OT_ALIGN);
-                                       mutate(newtype);
-                                       break;
-                               }
+       if (newtype == "dump") {
+               dump();
+       }
 
-                               case LM_OT_EQNARRAY:
-                               default:
-                                       MathGridInset::addCol(1);
-                                       MathGridInset::addCol(1);
+       else if (newtype == type_) {
+               // done
+       }
 
-                                       // split it "nicely" on the firest relop
-                                       pos_type pos = firstRelOp(cell(0));     
-                                       cell(1) = MathArray(cell(0), pos, cell(0).size());
-                                       cell(0).erase(pos, cell(0).size());
+       else if (type_ == "none") {
+               setType("simple");
+               numbered(0, false);
+               mutate(newtype);
+       }
 
-                                       if (cell(1).size()) {
-                                               cell(2) = MathArray(cell(1), 1, cell(1).size());
-                                               cell(1).erase(1, cell(1).size());
-                                       }
+       else if (type_ == "simple") {
+               if (newtype == "none") {
+                       setType("none");
+               } else {
+                       setType("equation");
+                       numbered(0, false);
+                       mutate(newtype);
+               }
+       }
 
-                                       setType(LM_OT_EQNARRAY);
-                                       mutate(newtype);
-                                       break;
-                               }
-                       break;
-
-               case LM_OT_EQNARRAY:
-                       switch (newtype) {
-                               case LM_OT_SIMPLE:
-                               case LM_OT_EQUATION: {
-                                       // set correct (no)numbering
-                                       bool allnonum = true;
-                                       for (row_type row = 0; row < nrows(); ++row) {
-                                               if (!nonum_[row])
-                                                       allnonum = false;
-                                       }
-
-                                       // set first non-empty label
-                                       string label;
-                                       for (row_type row = 0; row < nrows(); ++row) {
-                                               if (!label_[row].empty()) {
-                                                       label = label_[row];
-                                                       break;
-                                               }
-                                       }
-
-                                       glueall();
-
-                                       nonum_[0] = allnonum;
-                                       label_[0] = label;
-                                       mutate(newtype);
-                                       break;
-                               }
+       else if (type_ == "equation") {
+               if (smaller(newtype, type_)) {
+                       setType("simple");
+                       mutate(newtype);
+               } else if (newtype == "eqnarray") {
+                       MathGridInset::addCol(1);
+                       MathGridInset::addCol(1);
+
+                       // split it "nicely" on the firest relop
+                       pos_type pos = firstRelOp(cell(0));
+                       cell(1) = MathArray(cell(0).begin() + pos, cell(0).end());
+                       cell(0).erase(pos, cell(0).size());
+
+                       if (cell(1).size()) {
+                               cell(2) = MathArray(cell(1).begin() + 1, cell(1).end());
+                               cell(1).erase(1, cell(1).size());
+                       }
+                       setType("eqnarray");
+                       mutate(newtype);
+               } else if (newtype == "multline" || newtype == "gather") {
+                       setType(newtype);
+                       numbered(0, false);
+               } else {
+                       MathGridInset::addCol(1);
+                       // split it "nicely"
+                       pos_type pos = firstRelOp(cell(0));
+                       cell(1) = cell(0);
+                       cell(0).erase(pos, cell(0).size());
+                       cell(1).erase(0, pos);
+                       setType("align");
+                       mutate(newtype);
+               }
+       }
 
-                               case LM_OT_ALIGN:
-                               case LM_OT_ALIGNAT:
-                               case LM_OT_XALIGNAT:
-                               case LM_OT_XXALIGNAT:
-                               default: {
-                                       for (row_type row = 0; row < nrows(); ++row) {
-                                               idx_type c = 3 * row + 1;
-                                               cell(c).push_back(cell(c + 1));
-                                       }
-                                       MathGridInset::delCol(2);
-                                       setType(LM_OT_ALIGN);
-                                       mutate(newtype);
+       else if (type_ == "eqnarray") {
+               if (smaller(newtype, type_)) {
+                       // set correct (no)numbering
+                       bool allnonum = true;
+                       for (row_type row = 0; row < nrows(); ++row)
+                               if (!nonum_[row])
+                                       allnonum = false;
+
+                       // set first non-empty label
+                       string label;
+                       for (row_type row = 0; row < nrows(); ++row) {
+                               if (!label_[row].empty()) {
+                                       label = label_[row];
                                        break;
                                }
                        }
-                       break;
-
-               case LM_OT_ALIGN:
-                       switch (newtype) {
-                               case LM_OT_SIMPLE:
-                               case LM_OT_EQUATION:
-                               case LM_OT_EQNARRAY:
-                                       MathGridInset::addCol(1);
-                                       setType(LM_OT_EQNARRAY);
-                                       mutate(newtype);
-                                       break;
-                               
-                               case LM_OT_ALIGNAT:
-                               case LM_OT_XALIGNAT:
-                               case LM_OT_XXALIGNAT:
-                                       setType(newtype);
-                                       break;
 
-                               default:
-                                       lyxerr << "mutation from '" << getType()
-                                               << "' to '" << newtype << "' not implemented"
-                                              << endl;
-                                       break;
+                       glueall();
+                       nonum_[0] = allnonum;
+                       label_[0] = label;
+                       mutate(newtype);
+               } else { // align & Co.
+                       for (row_type row = 0; row < nrows(); ++row) {
+                               idx_type c = 3 * row + 1;
+                               cell(c).append(cell(c + 1));
                        }
-                       break;
+                       MathGridInset::delCol(2);
+                       setType("align");
+                       mutate(newtype);
+               }
+       }
 
-               case LM_OT_MULTLINE:
-                       switch (newtype) {
-                               case LM_OT_GATHER:
-                                       setType(LM_OT_GATHER);
-                                       break;
-                               default:
-                                       lyxerr << "mutation from '" << getType()
-                                               << "' to '" << newtype << "' not implemented"
-                                              << endl;
-                                       break;
-                       }
+       else if (type_ == "align") {
+               if (smaller(newtype, type_)) {
+                       MathGridInset::addCol(1);
+                       setType("eqnarray");
+                       mutate(newtype);
+               } else {
+                       setType(newtype);
+               }
+       }
 
-               case LM_OT_GATHER:
-                       switch (newtype) {
-                               case LM_OT_MULTLINE:
-                                       setType(LM_OT_MULTLINE);
-                                       break;
-                               default:
-                                       lyxerr << "mutation from '" << getType()
-                                               << "' to '" << newtype << "' not implemented"
-                                              << endl;
-                                       break;
-                       }
+       else if (type_ == "multline") {
+               if (newtype == "gather" || newtype == "align" ||
+                   newtype == "xalignat" || newtype == "xxalignat" || newtype == "flalign")
+                       setType(newtype);
+               else if (newtype == "eqnarray") {
+                       MathGridInset::addCol(1);
+                       MathGridInset::addCol(1);
+                       setType("eqnarray");
+               } else {
+                       lyxerr << "mutation from '" << type_
+                               << "' to '" << newtype << "' not implemented" << endl;
+               }
+       }
 
-               default:
-                       lyxerr << "mutation from '" << getType()
-                              << "' to '" << newtype << "' not implemented"
-                              << endl;
-                       break;
+       else if (type_ == "gather") {
+               if (newtype == "multline") {
+                       setType("multline");
+               } else {
+                       lyxerr << "mutation from '" << type_
+                               << "' to '" << newtype << "' not implemented" << endl;
+               }
+       }
+
+       else {
+               lyxerr << "mutation from '" << type_
+                                        << "' to '" << newtype << "' not implemented" << endl;
        }
 }
 
 
+string MathHullInset::eolString(row_type row, bool fragile) const
+{
+       string res;
+       if (numberedType()) {
+               if (!label_[row].empty() && !nonum_[row])
+                       res += "\\label{" + label_[row] + '}';
+               if (nonum_[row] && (type_ != "multline"))
+                       res += "\\nonumber ";
+       }
+       return res + MathGridInset::eolString(row, fragile);
+}
+
+
 void MathHullInset::write(WriteStream & os) 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);
-       }
-       
+       MathGridInset::write(os);
        footer_write(os);
 }
 
 
 void MathHullInset::normalize(NormalStream & os) const
 {
-       os << "[formula " << normalName(getType()) << " ";
+       os << "[formula " << type_ << ' ';
        MathGridInset::normalize(os);
        os << "] ";
 }
@@ -717,10 +682,193 @@ void MathHullInset::mathmlize(MathMLStream & os) const
 }
 
 
+void MathHullInset::infoize(std::ostream & os) const
+{
+       os << "Type: " << type_;
+}
+
+
 void MathHullInset::check() const
 {
-       lyx::Assert(nonum_.size() == nrows());
-       lyx::Assert(label_.size() == nrows());
+       BOOST_ASSERT(nonum_.size() == nrows());
+       BOOST_ASSERT(label_.size() == nrows());
+}
+
+
+void MathHullInset::doExtern(LCursor & cur, FuncRequest const & func)
+{
+       string lang;
+       string extra;
+       istringstream iss(func.argument.c_str());
+       iss >> lang >> extra;
+       if (extra.empty())
+               extra = "noextra";
+
+#ifdef WITH_WARNINGS
+#warning temporarily disabled
+       //if (selection()) {
+       //      MathArray ar;
+       //      selGet(ar);
+       //      lyxerr << "use selection: " << ar << endl;
+       //      insert(pipeThroughExtern(lang, extra, ar));
+       //      return;
+       //}
+#endif
+
+       MathArray eq;
+       eq.push_back(MathAtom(new MathCharInset('=')));
+
+       // go to first item in line
+       cur.idx() -= cur.idx() % ncols();
+       cur.pos() = 0;
+
+       if (getType() == "simple") {
+               size_type pos = cur.cell().find_last(eq);
+               MathArray ar;
+               if (mathcursor && mathcursor->selection()) {
+                       asArray(mathcursor->grabAndEraseSelection(cur), ar);
+               } else if (pos == cur.cell().size()) {
+                       ar = cur.cell();
+                       lyxerr << "use whole cell: " << ar << endl;
+               } else {
+                       ar = MathArray(cur.cell().begin() + pos + 1, cur.cell().end());
+                       lyxerr << "use partial cell form pos: " << pos << endl;
+               }
+               cur.cell().append(eq);
+               cur.cell().append(pipeThroughExtern(lang, extra, ar));
+               cur.pos() = cur.lastpos();
+               return;
+       }
+
+       if (getType() == "equation") {
+               lyxerr << "use equation inset" << endl;
+               mutate("eqnarray");
+               MathArray & ar = cur.cell();
+               lyxerr << "use cell: " << ar << endl;
+               ++cur.idx();
+               cur.cell() = eq;
+               ++cur.idx();
+               cur.cell() = pipeThroughExtern(lang, extra, ar);
+               // move to end of line
+               cur.pos() = cur.lastpos();
+               return;
+       }
+
+       {
+               lyxerr << "use eqnarray" << endl;
+               cur.idx() += 2 - cur.idx() % ncols();
+               cur.pos() = 0;
+               MathArray ar = cur.cell();
+               lyxerr << "use cell: " << ar << endl;
+#ifdef WITH_WARNINGS
+#warning temporarily disabled
+#endif
+               addRow(cur.row());
+               ++cur.idx();
+               ++cur.idx();
+               cur.cell() = eq;
+               ++cur.idx();
+               cur.cell() = pipeThroughExtern(lang, extra, ar);
+               cur.pos() = cur.lastpos();
+       }
+}
+
+
+DispatchResult
+MathHullInset::priv_dispatch(BufferView & bv, FuncRequest const & cmd)
+{
+       CursorSlice & cur = cursorTip(bv);
+       switch (cmd.action) {
+
+               case LFUN_BREAKLINE:
+                       if (type_ == "simple" || type_ == "equation") {
+                               mutate("eqnarray");
+                               cur.idx() = 1;
+                               cur.pos() = 0;
+                               return DispatchResult(true, FINISHED);
+                       }
+                       return MathGridInset::priv_dispatch(bv, cmd);
+
+               case LFUN_MATH_NUMBER:
+                       //lyxerr << "toggling all numbers" << endl;
+                       if (display()) {
+                               //recordUndo(bv, Undo::INSERT);
+                               bool old = numberedType();
+                               if (type_ == "multline")
+                                       numbered(nrows() - 1, !old);
+                               else
+                                       for (row_type row = 0; row < nrows(); ++row)
+                                               numbered(row, !old);
+                               //bv->owner()->message(old ? _("No number") : _("Number"));
+                       }
+                       return DispatchResult(true, true);
+
+               case LFUN_MATH_NONUMBER:
+                       if (display()) {
+                               row_type r = (type_ == "multline") ? nrows() - 1 : cur.row();
+                               //recordUndo(bv, Undo::INSERT);
+                               bool old = numbered(r);
+                               //bv->owner()->message(old ? _("No number") : _("Number"));
+                               numbered(r, !old);
+                       }
+                       return DispatchResult(true, true);
+
+               case LFUN_INSERT_LABEL: {
+                       row_type r = (type_ == "multline") ? nrows() - 1 : cur.row();
+                       string old_label = label(r);
+                       string new_label = cmd.argument;
+
+                       if (new_label.empty()) {
+                               string const default_label =
+                                       (lyxrc.label_init_length >= 0) ? "eq:" : "";
+                               pair<bool, string> const res = old_label.empty()
+                                       ? Alert::askForText(_("Enter new label to insert:"), default_label)
+                                       : Alert::askForText(_("Enter label:"), old_label);
+                               if (!res.first)
+                                       return DispatchResult(false);
+                               new_label = trim(res.second);
+                       }
+
+                       //if (new_label == old_label)
+                       //      break;  // Nothing to do
+
+                       if (!new_label.empty())
+                               numbered(r, true);
+                       label(r, new_label);
+                       return DispatchResult(true, true);
+               }
+
+               case LFUN_MATH_EXTERN:
+                       doExtern(bv.fullCursor(), cmd);
+                       return DispatchResult(true, FINISHED);
+
+               case LFUN_MATH_MUTATE: {
+                       lyxerr << "Hull: MUTATE: " << cmd.argument << endl;
+                       row_type r = cur.row();
+                       col_type c = cur.col();
+                       mutate(cmd.argument);
+                       cur.idx() = r * ncols() + c;
+                       if (cur.idx() >= nargs())
+                               cur.idx() = nargs() - 1;
+                       if (cur.pos() > cur.lastpos())
+                               cur.pos() = cur.lastpos();
+                       return DispatchResult(true, FINISHED);
+               }
+
+               case LFUN_MATH_DISPLAY: {
+                       mutate(type_ == "simple" ? "equation" : "simple");
+                       cur.idx() = 0;
+                       cur.pos() = cur.lastpos();
+                       return DispatchResult(true, FINISHED);
+               }
+
+               default:
+                       return MathGridInset::priv_dispatch(bv, cmd);
+       }
 }
 
 
+string MathHullInset::fileInsetLabel() const
+{
+       return "Formula";
+}