]> git.lyx.org Git - features.git/blobdiff - src/mathed/math_hullinset.C
change "support/std_sstream.h" to <sstream>
[features.git] / src / mathed / math_hullinset.C
index 8b1c556c5cadec47afe3418261e16fc5f3e71062..b56dec9d2c70fb9b8414911e618de80382d843eb 100644 (file)
@@ -1,34 +1,63 @@
-#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_charinset.h"
+#include "math_data.h"
+#include "math_extern.h"
 #include "math_hullinset.h"
 #include "math_mathmlstream.h"
 #include "math_streamstr.h"
 #include "math_support.h"
-#include "math_extern.h"
-#include "math_charinset.h"
+
+#include "BufferView.h"
+#include "CutAndPaste.h"
+#include "LColor.h"
+#include "LaTeXFeatures.h"
+#include "cursor.h"
 #include "debug.h"
-#include "textpainter.h"
+#include "dispatchresult.h"
 #include "funcrequest.h"
-#include "Lsstream.h"
-#include "LaTeXFeatures.h"
-#include "support/LAssert.h"
-#include "frontends/Painter.h"
+#include "gettext.h"
+#include "lyx_main.h"
+#include "lyxrc.h"
+#include "outputparams.h"
+#include "textpainter.h"
+#include "undo.h"
+
+#include "insets/render_preview.h"
 
 #include "frontends/Alert.h"
-#include "lyxrc.h"
-#include "gettext.h"
-#include "BufferView.h"
 
-#include <vector>
+#include "graphics/PreviewImage.h"
+#include "graphics/PreviewLoader.h"
+
+#include <boost/bind.hpp>
+
+#include <sstream>
+
+using lyx::cap::grabAndEraseSelection;
 
-using std::vector;
-using std::max;
 using std::endl;
+using std::max;
+using std::string;
+using std::ostream;
+using std::auto_ptr;
+using std::istringstream;
+using std::ostream;
+using std::ostringstream;
 using std::pair;
+using std::swap;
+using std::vector;
+
 
 namespace {
 
@@ -38,6 +67,8 @@ namespace {
                        return 3;
                if (type == "align")
                        return 2;
+               if (type == "flalign")
+                       return 2;
                if (type == "alignat")
                        return 2;
                if (type == "xalignat")
@@ -50,7 +81,7 @@ namespace {
 
        // returns position of first relation operator in the array
        // used for "intelligent splitting"
-       MathArray::size_type firstRelOp(MathArray const & ar)
+       size_t firstRelOp(MathArray const & ar)
        {
                for (MathArray::const_iterator it = ar.begin(); it != ar.end(); ++it)
                        if ((*it)->isRelOp())
@@ -77,7 +108,8 @@ namespace {
                if (s == "xxalignat") return 7;
                if (s == "multline")  return 8;
                if (s == "gather")    return 9;
-               lyxerr << "unknown hull type '" << s << "'\n";
+               if (s == "flalign")   return 10;
+               lyxerr << "unknown hull type '" << s << "'" << endl;
                return 0;
        }
 
@@ -90,23 +122,53 @@ namespace {
 } // end anon namespace
 
 
+
 MathHullInset::MathHullInset()
-       : MathGridInset(1, 1), type_("none"), nonum_(1), label_(1)
+       : MathGridInset(1, 1), type_("none"), nonum_(1), label_(1),
+         preview_(new RenderPreview(this))
 {
+       //lyxerr << "sizeof MathInset: " << sizeof(MathInset) << endl;
+       //lyxerr << "sizeof MetricsInfo: " << sizeof(MetricsInfo) << endl;
+       //lyxerr << "sizeof MathCharInset: " << sizeof(MathCharInset) << endl;
+       //lyxerr << "sizeof LyXFont: " << sizeof(LyXFont) << endl;
        setDefaults();
 }
 
 
 MathHullInset::MathHullInset(string const & type)
-       : MathGridInset(getCols(type), 1), type_(type), nonum_(1), label_(1)
+       : MathGridInset(getCols(type), 1), type_(type), nonum_(1), label_(1),
+         preview_(new RenderPreview(this))
 {
        setDefaults();
 }
 
 
-MathInset * MathHullInset::clone() const
+MathHullInset::MathHullInset(MathHullInset const & other)
+       : MathGridInset(other),
+         type_(other.type_), nonum_(other.nonum_), label_(other.label_),
+         preview_(new RenderPreview(this))
+{}
+
+
+MathHullInset::~MathHullInset()
+{}
+
+
+auto_ptr<InsetBase> MathHullInset::clone() const
 {
-       return new MathHullInset(*this);
+       return auto_ptr<InsetBase>(new MathHullInset(*this));
+}
+
+
+void MathHullInset::operator=(MathHullInset const & other)
+{
+       if (this == &other)
+               return;
+       *static_cast<MathGridInset*>(this) = MathGridInset(other);
+       type_  = other.type_;
+       nonum_ = other.nonum_;
+       label_ = other.label_;
+       preview_.reset(new RenderPreview(*other.preview_, this));
 }
 
 
@@ -119,18 +181,18 @@ MathInset::mode_type MathHullInset::currentMode() const
 }
 
 
-bool MathHullInset::idxFirst(idx_type & idx, pos_type & pos) const
+bool MathHullInset::idxFirst(LCursor & cur) const
 {
-       idx = 0;
-       pos = 0;
+       cur.idx() = 0;
+       cur.pos() = 0;
        return true;
 }
 
 
-bool MathHullInset::idxLast(idx_type & idx, pos_type & pos) const
+bool MathHullInset::idxLast(LCursor & cur) const
 {
-       idx = nargs() - 1;
-       pos = cell(idx).size();
+       cur.idx() = nargs() - 1;
+       cur.pos() = cur.lastpos();
        return true;
 }
 
@@ -151,7 +213,7 @@ int MathHullInset::defaultColSpace(col_type col)
                return 0;
        if (type_ == "xalignat")
                return (col & 1) ? 20 : 0;
-       if (type_ == "xxalignat")
+       if (type_ == "xxalignat" || type_ == "flalign")
                return (col & 1) ? 40 : 0;
        return 0;
 }
@@ -165,71 +227,106 @@ char const * MathHullInset::standardFont() const
 }
 
 
-void MathHullInset::metrics(MathMetricsInfo & mi) const
+void MathHullInset::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       MathFontSetChanger dummy1(mi.base, standardFont());
-       MathStyleChanger dummy2(mi.base, display() ? LM_ST_DISPLAY : LM_ST_TEXT);
+       BOOST_ASSERT(mi.base.bv && mi.base.bv->buffer());
+
+       bool use_preview = false;
+       if (!editing(mi.base.bv) &&
+           RenderPreview::status() == LyXRC::PREVIEW_ON) {
+               lyx::graphics::PreviewImage const * pimage =
+                       preview_->getPreviewImage(*mi.base.bv->buffer());
+               use_preview = pimage && pimage->image();
+       }
+
+       if (use_preview) {
+               preview_->metrics(mi, dim);
+               // insert a one pixel gap in front of the formula
+               dim.wid += 1;
+               if (display())
+                       dim.des += 12;
+               dim_ = dim;
+               return;
+       }
+
+       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, dim);
 
        if (display()) {
-               dim_.a += 12;
-               dim_.d += 12;
+               dim.asc += 12;
+               dim.des += 12;
        }
 
        if (numberedType()) {
-               MathFontSetChanger dummy(mi.base, "mathbf");
+               FontSetChanger dummy(mi.base, "mathbf");
                int l = 0;
                for (row_type row = 0; row < nrows(); ++row)
                        l = max(l, mathed_string_width(mi.base.font, nicelabel(row)));
 
                if (l)
-                       dim_.w += 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.base.font, asc, des);
-       dim_.a = max(dim_.a,  asc);
-       dim_.d = max(dim_.d, des);
+       dim.asc = max(dim.asc, asc);
+       dim.des = max(dim.des, des);
 
-       // for markers
-       metricsMarkers2();
+       dim_ = dim;
 }
 
 
-void MathHullInset::draw(MathPainterInfo & pi, int x, int y) const
+void MathHullInset::draw(PainterInfo & pi, int x, int y) const
 {
-       MathFontSetChanger dummy1(pi.base, standardFont());
-       MathStyleChanger dummy2(pi.base, display() ? LM_ST_DISPLAY : LM_ST_TEXT);
+       BOOST_ASSERT(pi.base.bv && pi.base.bv->buffer());
+
+       bool use_preview = false;
+       if (!editing(pi.base.bv) &&
+           RenderPreview::status() == LyXRC::PREVIEW_ON) {
+               lyx::graphics::PreviewImage const * pimage =
+                       preview_->getPreviewImage(*pi.base.bv->buffer());
+               use_preview = pimage && pimage->image();
+       }
+
+       if (use_preview) {
+               // one pixel gap in front
+               preview_->draw(pi, x + 1, y);
+               setPosCache(pi, x, y);
+               return;
+       }
+
+       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_;
-                       MathFontSetChanger dummy(pi.base, "mathrm");
+                       FontSetChanger dummy(pi.base, "mathrm");
                        drawStr(pi, pi.base.font, xx, yy, nicelabel(row));
                }
        }
-
-       drawMarkers2(pi, x, y);
+       setPosCache(pi, x, y);
 }
 
 
-void MathHullInset::metricsT(TextMetricsInfo const & mi) const
+void MathHullInset::metricsT(TextMetricsInfo const & mi, Dimension & dim) const
 {
        if (display()) {
-               MathGridInset::metricsT(mi);
+               MathGridInset::metricsT(mi, dim);
        } else {
                ostringstream os;
                WriteStream wi(os, false, true);
                write(wi);
-               dim_.w = os.str().size();
-               dim_.a = 1;
-               dim_.d = 0;
+               dim.wid = os.str().size();
+               dim.asc = 1;
+               dim.des = 0;
        }
 }
 
@@ -247,10 +344,44 @@ void MathHullInset::drawT(TextPainter & pain, int x, int y) const
 }
 
 
+namespace {
+
+string const latex_string(MathHullInset const & inset)
+{
+       ostringstream ls;
+       WriteStream wi(ls, false, false);
+       inset.write(wi);
+       return ls.str();
+}
+
+} // namespace anon
+
+
+void MathHullInset::addPreview(lyx::graphics::PreviewLoader & ploader) const
+{
+       if (RenderPreview::status() == LyXRC::PREVIEW_ON) {
+               string const snippet = latex_string(*this);
+               preview_->addPreview(snippet, ploader);
+       }
+}
+
+
+void MathHullInset::notifyCursorLeaves(LCursor & cur)
+{
+       if (RenderPreview::status() != LyXRC::PREVIEW_ON)
+               return;
+
+       Buffer const & buffer = cur.buffer();
+       string const snippet = latex_string(*this);
+       preview_->addPreview(snippet, buffer);
+       preview_->startLoading(buffer);
+}
+
+
 string MathHullInset::label(row_type row) const
 {
        row_type n = nrows();
-       lyx::Assert(row < n);
+       BOOST_ASSERT(row < n);
        return label_[row];
 }
 
@@ -278,6 +409,7 @@ bool MathHullInset::ams() const
 {
        return
                type_ == "align" ||
+               type_ == "flalign" ||
                type_ == "multline" ||
                type_ == "gather" ||
                type_ == "alignat" ||
@@ -292,7 +424,7 @@ bool MathHullInset::display() const
 }
 
 
-void MathHullInset::getLabelList(std::vector<string> & labels) const
+void MathHullInset::getLabelList(Buffer const &, vector<string> & labels) const
 {
        for (row_type row = 0; row < nrows(); ++row)
                if (!label_[row].empty() && nonum_[row] != 1)
@@ -329,7 +461,7 @@ void MathHullInset::validate(LaTeXFeatures & features) const
        features.require("boldsymbol");
        //features.binom      = true;
 
-       MathNestInset::validate(features);
+       MathGridInset::validate(features);
 }
 
 
@@ -353,22 +485,20 @@ void MathHullInset::header_write(WriteStream & os) const
                        os << "\\[\n";
        }
 
-       else if (type_ == "eqnarray" || type_ == "align")
+       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";
+               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 if (type_ == "multline" || type_ == "gather")
-               os << "\\begin{" << type_ << "}\n";
+               os << "\\begin{" << type_ << '}'
+                 << '{' << static_cast<unsigned int>((ncols() + 1)/2) << "}\n";
 
        else
-               os << "\\begin{unknown" << star(n) << "}";
+               os << "\\begin{unknown" << star(n) << '}';
 }
 
 
@@ -388,15 +518,24 @@ void MathHullInset::footer_write(WriteStream & os) const
                else
                        os << "\\]\n";
 
-       else if (type_ == "eqnarray" || type_ == "align" || type_ == "alignat"
-             || type_ == "xalignat")
-               os << "\n\\end{" << type_ << star(n) << "}\n";
+       else if (type_ == "eqnarray" || type_ == "align" || type_ == "flalign"
+                || type_ == "alignat" || type_ == "xalignat"
+                || type_ == "gather" || type_ == "multline")
+               os << "\\end{" << type_ << star(n) << "}\n";
 
-       else if (type_ == "xxalignat" || type_ == "multline" || type_ == "gather")
-               os << "\n\\end{" << type_ << "}\n";
+       else if (type_ == "xxalignat")
+               os << "\\end{" << type_ << "}\n";
 
        else
-               os << "\\end{unknown" << star(n) << "}";
+               os << "\\end{unknown" << star(n) << '}';
+}
+
+
+bool MathHullInset::colChangeOK() const
+{
+       return
+               type_ == "align" || type_ == "flalign" ||type_ == "alignat" ||
+               type_ == "xalignat" || type_ == "xxalignat";
 }
 
 
@@ -408,34 +547,43 @@ void MathHullInset::addRow(row_type row)
 }
 
 
+void MathHullInset::swapRow(row_type row)
+{
+       if (nrows() == 1)
+               return;
+       if (row + 1 == nrows())
+               --row;
+       swap(nonum_[row], nonum_[row + 1]);
+       swap(label_[row], label_[row + 1]);
+       MathGridInset::swapRow(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_ << "'" << endl;
 }
 
 
-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_ << "'" << endl;
 }
 
 
@@ -445,7 +593,7 @@ string MathHullInset::nicelabel(row_type row) const
                return string();
        if (label_[row].empty())
                return string("(#)");
-       return "(" + label_[row] + ")";
+       return '(' + label_[row] + ')';
 }
 
 
@@ -476,7 +624,7 @@ void MathHullInset::setType(string const & type)
 
 void MathHullInset::mutate(string const & newtype)
 {
-       //lyxerr << "mutating from '" << type_ << "' to '" << newtype << "'\n";
+       lyxerr << "mutating from '" << type_ << "' to '" << newtype << "'" << endl;
 
        // we try to move along the chain
        // none <-> simple <-> equation <-> eqnarray
@@ -582,12 +730,16 @@ void MathHullInset::mutate(string const & newtype)
        }
 
        else if (type_ == "multline") {
-               if (newtype == "gather") {
-                       setType("gather");
+               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;
+                               << "' to '" << newtype << "' not implemented" << endl;
                }
        }
 
@@ -607,31 +759,30 @@ 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() && !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);
+       MathGridInset::write(os);
        footer_write(os);
 }
 
 
 void MathHullInset::normalize(NormalStream & os) const
 {
-       os << "[formula " << type_ << " ";
+       os << "[formula " << type_ << ' ';
        MathGridInset::normalize(os);
        os << "] ";
 }
@@ -643,7 +794,7 @@ void MathHullInset::mathmlize(MathMLStream & os) const
 }
 
 
-void MathHullInset::infoize(std::ostream & os) const
+void MathHullInset::infoize(ostream & os) const
 {
        os << "Type: " << type_;
 }
@@ -651,13 +802,12 @@ void MathHullInset::infoize(std::ostream & os) const
 
 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
-       (FuncRequest const & func, idx_type & idx, pos_type & pos)
+void MathHullInset::doExtern(LCursor & cur, FuncRequest & func)
 {
        string lang;
        string extra;
@@ -668,10 +818,10 @@ void MathHullInset::doExtern
 
 #ifdef WITH_WARNINGS
 #warning temporarily disabled
-       //if (selection()) {
+       //if (cur.selection()) {
        //      MathArray ar;
-       //      selGet(ar);
-       //      lyxerr << "use selection: " << ar << "\n";
+       //      selGet(cur.ar);
+       //      lyxerr << "use selection: " << ar << endl;
        //      insert(pipeThroughExtern(lang, extra, ar));
        //      return;
        //}
@@ -681,156 +831,427 @@ void MathHullInset::doExtern
        eq.push_back(MathAtom(new MathCharInset('=')));
 
        // go to first item in line
-       idx -= idx % ncols();
-       pos = 0;
+       cur.idx() -= cur.idx() % ncols();
+       cur.pos() = 0;
 
        if (getType() == "simple") {
-               size_type pos = cell(idx).find_last(eq);
+               size_type pos = cur.cell().find_last(eq);
                MathArray ar;
-               if (pos == cell(idx).size()) {
-                       ar = cell(idx);
-                       lyxerr << "use whole cell: " << ar << "\n";
+               if (cur.inMathed() && cur.selection()) {
+                       asArray(grabAndEraseSelection(cur), ar);
+               } else if (pos == cur.cell().size()) {
+                       ar = cur.cell();
+                       lyxerr << "use whole cell: " << ar << endl;
                } else {
-                       ar = MathArray(cell(idx).begin() + pos + 1, cell(idx).end());
-                       lyxerr << "use partial cell form pos: " << pos << "\n";
+                       ar = MathArray(cur.cell().begin() + pos + 1, cur.cell().end());
+                       lyxerr << "use partial cell form pos: " << pos << endl;
                }
-               cell(idx).append(eq);
-               cell(idx).append(pipeThroughExtern(lang, extra, ar));
-               pos = cell(idx).size();
+               cur.cell().append(eq);
+               cur.cell().append(pipeThroughExtern(lang, extra, ar));
+               cur.pos() = cur.lastpos();
                return;
        }
 
        if (getType() == "equation") {
-               lyxerr << "use equation inset\n";
+               lyxerr << "use equation inset" << endl;
                mutate("eqnarray");
-               MathArray & ar = cell(idx);
-               lyxerr << "use cell: " << ar << "\n";
-               cell(idx + 1) = eq;
-               cell(idx + 2) = pipeThroughExtern(lang, extra, ar);
+               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
-               idx += 2;
-               pos = cell(idx).size();
+               cur.pos() = cur.lastpos();
                return;
        }
 
        {
-               lyxerr << "use eqnarray\n";
-               idx -= idx % ncols();
-               idx += 2;
-               pos = 0;
-               MathArray ar = cell(idx);
-               lyxerr << "use cell: " << ar << "\n";
+               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(row(idx));
-               cell(idx + 2) = eq;
-               cell(idx + 3) = pipeThroughExtern(lang, extra, ar);
-               idx += 3;
-               pos = cell(idx).size();
+               addRow(cur.row());
+               ++cur.idx();
+               ++cur.idx();
+               cur.cell() = eq;
+               ++cur.idx();
+               cur.cell() = pipeThroughExtern(lang, extra, ar);
+               cur.pos() = cur.lastpos();
        }
 }
 
 
-MathInset::result_type MathHullInset::dispatch
-       (FuncRequest const & cmd, idx_type & idx, pos_type & pos)
+void MathHullInset::priv_dispatch(LCursor & cur, FuncRequest & cmd)
 {
        switch (cmd.action) {
 
-               case LFUN_BREAKLINE:
-                       if (type_ == "simple" || type_ == "equation") {
-                               mutate("eqnarray");
-                               idx = 1;
-                               pos = 0;
-                               return DISPATCHED_POP;
-                       }
-                       return MathGridInset::dispatch(cmd, idx, pos);
-
-               case LFUN_MATH_NUMBER:
-                       //lyxerr << "toggling all numbers\n";
-                       if (display()) {
-                               //bv->lockedInsetStoreUndo(Undo::INSERT);
-                               bool old = numberedType();
+       case LFUN_FINISHED_LEFT:
+       case LFUN_FINISHED_RIGHT:
+       case LFUN_FINISHED_UP:
+       case LFUN_FINISHED_DOWN:
+               MathGridInset::priv_dispatch(cur, cmd);
+               notifyCursorLeaves(cur);
+               break;
+
+       case LFUN_BREAKPARAGRAPH:
+               // just swallow this
+               break;
+
+       case LFUN_BREAKLINE:
+               if (type_ == "simple" || type_ == "equation") {
+                       recordUndoInset(cur);
+                       mutate("eqnarray");
+                       cur.idx() = 0;
+                       cur.pos() = cur.lastpos();
+                       break;
+               }
+               MathGridInset::priv_dispatch(cur, cmd);
+               break;
+
+       case LFUN_MATH_NUMBER:
+               //lyxerr << "toggling all numbers" << endl;
+               if (display()) {
+                       recordUndoInset(cur);
+                       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"));
-                               //updateLocal(bv, true);
-                       }
-                       return DISPATCHED;
-
-               case LFUN_MATH_NONUMBER:
-                       if (display()) {
-                               //bv->lockedInsetStoreUndo(Undo::INSERT);
-                               bool old = numbered(row(idx));
-                               //bv->owner()->message(old ? _("No number") : _("Number"));
-                               numbered(row(idx), !old);
-                               //updateLocal(bv, true);
-                       }
-                       return DISPATCHED;
-
-               case LFUN_INSERT_LABEL: {
-                       row_type r = row(idx);
-                       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)
-                                       break;
-                               new_label = trim(res.second);
-                       }
+                       cur.message(old ? _("No number") : _("Number"));
+               }
+               break;
+
+       case LFUN_MATH_NONUMBER:
+               if (display()) {
+                       recordUndoInset(cur);
+                       row_type r = (type_ == "multline") ? nrows() - 1 : cur.row();
+                       bool old = numbered(r);
+                       cur.message(old ? _("No number") : _("Number"));
+                       numbered(r, !old);
+               }
+               break;
+
+       case LFUN_INSERT_LABEL: {
+               recordUndoInset(cur);
+               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);
+                       new_label = lyx::support::trim(res.second);
+               }
+
+               if (!new_label.empty())
+                       numbered(r, true);
+               label(r, new_label);
+               break;
+       }
 
-                       //if (new_label == old_label)
-                       //      break;  // Nothing to do
+       case LFUN_MATH_EXTERN:
+               recordUndoInset(cur);
+               doExtern(cur, cmd);
+               break;
+
+       case LFUN_MATH_MUTATE: {
+               recordUndoInset(cur);
+               row_type row = cur.row();
+               col_type col = cur.col();
+               mutate(cmd.argument);
+               cur.idx() = row * ncols() + col;
+               if (cur.idx() > cur.lastidx()) {
+                       cur.idx() = cur.lastidx();
+                       cur.pos() = cur.lastpos();
+               }
+               if (cur.pos() > cur.lastpos())
+                       cur.pos() = cur.lastpos();
+               //cur.dispatched(FINISHED);
+               break;
+       }
 
-                       if (!new_label.empty())
-                               numbered(r, true);
+       case LFUN_MATH_DISPLAY: {
+               recordUndoInset(cur);
+               mutate(type_ == "simple" ? "equation" : "simple");
+               cur.idx() = 0;
+               cur.pos() = cur.lastpos();
+               //cur.dispatched(FINISHED);
+               break;
+       }
 
-#warning FIXME: please check you really mean repaint() ... is it needed,
-#warning and if so, should it be update() instead ?
-                       if (!new_label.empty()
-                                       && cmd.view()->ChangeRefsIfUnique(old_label, new_label))
-                               cmd.view()->repaint();
+       default:
+               MathGridInset::priv_dispatch(cur, cmd);
+               break;
+       }
+}
 
-                       label(r, new_label);
-                       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;
-
-               case LFUN_MATH_MUTATE: {
-                       row_type r = row(idx);
-                       col_type c = col(idx);
-                       mutate(cmd.argument);
-                       idx = r * ncols() + c;
-                       if (idx >= nargs())
-                               idx = nargs() - 1;
-                       if (pos > cell(idx).size()) 
-                               pos = cell(idx).size();
-                       return DISPATCHED_POP;
+bool MathHullInset::getStatus(LCursor & cur, FuncRequest const & cmd,
+               FuncStatus & flag) const
+{
+       switch (cmd.action) {
+       case LFUN_BREAKLINE:
+       case LFUN_MATH_NUMBER:
+       case LFUN_MATH_NONUMBER:
+       case LFUN_INSERT_LABEL:
+       case LFUN_MATH_EXTERN:
+       case LFUN_MATH_MUTATE:
+       case LFUN_MATH_DISPLAY:
+               // we handle these
+               return true;
+       default:
+               return MathGridInset::getStatus(cur, cmd, flag);
+       }
+}
+
+
+/////////////////////////////////////////////////////////////////////
+
+#include "math_arrayinset.h"
+#include "math_deliminset.h"
+#include "math_factory.h"
+#include "math_parser.h"
+#include "math_spaceinset.h"
+#include "ref_inset.h"
+
+#include "bufferview_funcs.h"
+#include "lyxtext.h"
+
+#include "frontends/LyXView.h"
+#include "frontends/Dialogs.h"
+
+#include "support/lstrings.h"
+#include "support/lyxlib.h"
+
+
+// simply scrap this function if you want
+void MathHullInset::mutateToText()
+{
+#if 0
+       // translate to latex
+       ostringstream os;
+       latex(NULL, os, false, false);
+       string str = os.str();
+
+       // insert this text
+       LyXText * lt = view_->getLyXText();
+       string::const_iterator cit = str.begin();
+       string::const_iterator end = str.end();
+       for (; cit != end; ++cit)
+               view_->owner()->getIntl()->getTransManager().TranslateAndInsert(*cit, lt);
+
+       // remove ourselves
+       //view_->owner()->dispatch(LFUN_ESCAPE);
+#endif
+}
+
+
+void MathHullInset::handleFont(LCursor & cur, string const & arg,
+       string const & font)
+{
+       // this whole function is a hack and won't work for incremental font
+       // changes...
+       recordUndo(cur);
+       if (cur.inset().asMathInset()->name() == font)
+               cur.handleFont(font);
+       else {
+               cur.handleNest(createMathInset(font));
+               cur.insert(arg);
+       }
+}
+
+
+void MathHullInset::handleFont2(LCursor & cur, string const & arg)
+{
+       recordUndo(cur);
+       LyXFont font;
+       bool b;
+       bv_funcs::string2font(arg, font, b);
+       if (font.color() != LColor::inherit) {
+               MathAtom at = createMathInset("color");
+               asArray(lcolor.getGUIName(font.color()), at.nucleus()->cell(0));
+               cur.handleNest(at, 1);
+       }
+}
+
+
+void MathHullInset::edit(LCursor & cur, bool left)
+{
+       cur.push(*this);
+       left ? idxFirst(cur) : idxLast(cur);
+}
+
+
+string const MathHullInset::editMessage() const
+{
+       return _("Math editor mode");
+}
+
+
+void MathHullInset::getCursorDim(int & asc, int & desc) const
+{
+       asc = 10;
+       desc = 2;
+       //math_font_max_dim(font_, asc, des);
+}
+
+
+void MathHullInset::revealCodes(LCursor & cur) const
+{
+       if (!cur.inMathed())
+               return;
+       ostringstream os;
+       cur.info(os);
+       cur.message(os.str());
+/*
+       // write something to the minibuffer
+       // translate to latex
+       cur.markInsert(bv);
+       ostringstream os;
+       write(NULL, os);
+       string str = os.str();
+       cur.markErase(bv);
+       string::size_type pos = 0;
+       string res;
+       for (string::iterator it = str.begin(); it != str.end(); ++it) {
+               if (*it == '\n')
+                       res += ' ';
+               else if (*it == '\0') {
+                       res += "  -X-  ";
+                       pos = it - str.begin();
                }
+               else
+                       res += *it;
+       }
+       if (pos > 30)
+               res = res.substr(pos - 30);
+       if (res.size() > 60)
+               res = res.substr(0, 60);
+       cur.message(res);
+*/
+}
+
+
+InsetBase::Code MathHullInset::lyxCode() const
+{
+       return MATH_CODE;
+}
+
+
+/////////////////////////////////////////////////////////////////////
 
-               case LFUN_MATH_DISPLAY: {
-                       mutate(type_ == "simple" ? "equation" : "simple");
-                       idx = 0;
-                       pos = cell(idx).size();
-                       return DISPATCHED_POP;
+
+#if 0
+bool MathHullInset::searchForward(BufferView * bv, string const & str,
+                                    bool, bool)
+{
+#ifdef WITH_WARNINGS
+#warning completely broken
+#endif
+       static MathHullInset * lastformula = 0;
+       static CursorBase current = DocIterator(ibegin(nucleus()));
+       static MathArray ar;
+       static string laststr;
+
+       if (lastformula != this || laststr != str) {
+               //lyxerr << "reset lastformula to " << this << endl;
+               lastformula = this;
+               laststr = str;
+               current = ibegin(nucleus());
+               ar.clear();
+               mathed_parse_cell(ar, str);
+       } else {
+               increment(current);
+       }
+       //lyxerr << "searching '" << str << "' in " << this << ar << endl;
+
+       for (DocIterator it = current; it != iend(nucleus()); increment(it)) {
+               CursorSlice & top = it.back();
+               MathArray const & a = top.asMathInset()->cell(top.idx_);
+               if (a.matchpart(ar, top.pos_)) {
+                       bv->cursor().setSelection(it, ar.size());
+                       current = it;
+                       top.pos_ += ar.size();
+                       bv->update();
+                       return true;
                }
+       }
+
+       //lyxerr << "not found!" << endl;
+       lastformula = 0;
+       return false;
+}
+#endif
+
 
-               default:
-                       return MathGridInset::dispatch(cmd, idx, pos);
+void MathHullInset::write(Buffer const &, std::ostream & os) const
+{
+       WriteStream wi(os, false, false);
+       os << "Formula ";
+       write(wi);
+}
+
+
+void MathHullInset::read(Buffer const &, LyXLex & lex)
+{
+       MathAtom at;
+       mathed_parse_normal(at, lex);
+       operator=(*at->asHullInset());
+}
 
+
+int MathHullInset::plaintext(Buffer const &, ostream & os,
+                       OutputParams const &) const
+{
+       if (0 && display()) {
+               Dimension dim;
+               TextMetricsInfo mi;
+               metricsT(mi, dim);
+               TextPainter tpain(dim.width(), dim.height());
+               drawT(tpain, 0, dim.ascent());
+               tpain.show(os, 3);
+               // reset metrics cache to "real" values
+               //metrics();
+               return tpain.textheight();
+       } else {
+               WriteStream wi(os, false, true);
+               wi << ' ' << cell(0) << ' ';
+               return wi.line();
        }
-       return UNDISPATCHED;
+}
+
+
+int MathHullInset::linuxdoc(Buffer const & buf, ostream & os,
+                          OutputParams const & runparams) const
+{
+       return docbook(buf, os, runparams);
+}
+
+
+int MathHullInset::docbook(Buffer const & buf, ostream & os,
+                         OutputParams const & runparams) const
+{
+       MathMLStream ms(os);
+       string name="equation";
+       if (! label(0).empty()) name += " id=\"" + label(0)+ "\"";
+       ms << MTag(name.c_str());
+       ms <<   MTag("alt");
+       ms <<    "<[CDATA[";
+       int res = plaintext(buf, ms.os(), runparams);
+       ms <<    "]]>";
+       ms <<   ETag("alt");
+       ms <<   MTag("math");
+       MathGridInset::mathmlize(ms);
+       ms <<   ETag("math");
+       ms << ETag("equation");
+       return ms.line() + res;
 }