]> git.lyx.org Git - lyx.git/blobdiff - src/mathed/math_hullinset.C
Fix to bug 2362: Deleting superscript also deletes subscript.
[lyx.git] / src / mathed / math_hullinset.C
index 65a5075d875070ae236fe2c42fb2ba2063f79ad9..da192918b999b6b0467740723169a9dcd515c0e4 100644 (file)
 #include <config.h>
 
 #include "math_charinset.h"
+#include "math_colorinset.h"
 #include "math_data.h"
 #include "math_extern.h"
+#include "math_factory.h"
 #include "math_hullinset.h"
 #include "math_mathmlstream.h"
 #include "math_streamstr.h"
 #include "math_support.h"
 
+#include "buffer.h"
+#include "bufferparams.h"
 #include "BufferView.h"
+#include "CutAndPaste.h"
+#include "FuncStatus.h"
+#include "LColor.h"
+#include "LaTeXFeatures.h"
 #include "cursor.h"
-#include "dispatchresult.h"
 #include "debug.h"
+#include "dispatchresult.h"
 #include "funcrequest.h"
 #include "gettext.h"
-#include "LaTeXFeatures.h"
-#include "LColor.h"
+#include "lyx_main.h"
 #include "lyxrc.h"
 #include "outputparams.h"
+#include "sgml.h"
 #include "textpainter.h"
+#include "undo.h"
+
+#include "insets/render_preview.h"
+#include "insets/insetlabel.h"
+
+#include "frontends/Dialogs.h"
+#include "frontends/LyXView.h"
+
+#include "graphics/PreviewImage.h"
+#include "graphics/PreviewLoader.h"
+
+#include "support/lstrings.h"
 
-#include "frontends/Alert.h"
+#include <boost/bind.hpp>
 
-#include "support/std_sstream.h"
+#include <sstream>
 
-using lyx::support::trim;
+using lyx::cap::grabAndEraseSelection;
+using lyx::support::bformat;
+using lyx::support::subst;
 
 using std::endl;
 using std::max;
@@ -100,7 +122,7 @@ namespace {
                if (s == "gather")    return 9;
                if (s == "flalign")   return 10;
                lyxerr << "unknown hull type '" << s << "'" << endl;
-               return 0;
+               return -1;
        }
 
        bool smaller(string const & s, string const & t)
@@ -114,31 +136,68 @@ 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))
 {
-       // This is needed as long the math parser is not re-entrant
-       initMath();
        //lyxerr << "sizeof MathInset: " << sizeof(MathInset) << endl;
        //lyxerr << "sizeof MetricsInfo: " << sizeof(MetricsInfo) << endl;
        //lyxerr << "sizeof MathCharInset: " << sizeof(MathCharInset) << endl;
        //lyxerr << "sizeof LyXFont: " << sizeof(LyXFont) << endl;
+       initMath();
        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))
 {
+       initMath();
        setDefaults();
 }
 
 
-auto_ptr<InsetBase> 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::doClone() const
 {
        return auto_ptr<InsetBase>(new MathHullInset(*this));
 }
 
 
+MathHullInset & MathHullInset::operator=(MathHullInset const & other)
+{
+       if (this == &other)
+               return *this;
+       *static_cast<MathGridInset*>(this) = MathGridInset(other);
+       type_  = other.type_;
+       nonum_ = other.nonum_;
+       label_ = other.label_;
+       preview_.reset(new RenderPreview(*other.preview_, this));
+
+       return *this;
+}
+
+
+InsetBase * MathHullInset::editXY(LCursor & cur, int x, int y)
+{
+       if (use_preview_) {
+               edit(cur, true);
+               return this;
+       }
+       return MathNestInset::editXY(cur, x, y); 
+}
+
+
 MathInset::mode_type MathHullInset::currentMode() const
 {
        if (type_ == "none")
@@ -188,14 +247,33 @@ int MathHullInset::defaultColSpace(col_type col)
 
 char const * MathHullInset::standardFont() const
 {
-       if (type_ == "none")
-               return "lyxnochange";
-       return "mathnormal";
+       return type_ == "none" ? "lyxnochange" : "mathnormal";
+}
+
+
+bool MathHullInset::previewState(BufferView * bv) const
+{
+       if (!editing(bv) && RenderPreview::status() == LyXRC::PREVIEW_ON) {
+               lyx::graphics::PreviewImage const * pimage =
+                       preview_->getPreviewImage(*bv->buffer());
+               return pimage && pimage->image();
+       }
+       return false;
 }
 
 
 void MathHullInset::metrics(MetricsInfo & mi, Dimension & dim) const
 {
+       if (previewState(mi.base.bv)) {
+               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);
 
@@ -224,14 +302,21 @@ void MathHullInset::metrics(MetricsInfo & mi, Dimension & dim) const
        dim.asc = max(dim.asc, asc);
        dim.des = max(dim.des, des);
 
-       // for markers
-       metricsMarkers2(dim);
        dim_ = dim;
 }
 
 
 void MathHullInset::draw(PainterInfo & pi, int x, int y) const
 {
+       use_preview_ = previewState(pi.base.bv);
+
+       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);
@@ -241,11 +326,10 @@ void MathHullInset::draw(PainterInfo & pi, int x, int y) const
                for (row_type row = 0; row < nrows(); ++row) {
                        int const yy = y + rowinfo_[row].offset_;
                        FontSetChanger dummy(pi.base, "mathrm");
-                       drawStr(pi, pi.base.font, xx, yy, nicelabel(row));
+                       pi.draw(xx, yy, nicelabel(row));
                }
        }
-
-       drawMarkers2(pi, x, y);
+       setPosCache(pi, x, y);
 }
 
 
@@ -277,10 +361,42 @@ 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) {
+               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();
-       BOOST_ASSERT(row < n);
+       BOOST_ASSERT(row < nrows());
        return label_[row];
 }
 
@@ -430,6 +546,16 @@ void MathHullInset::footer_write(WriteStream & os) const
 }
 
 
+bool MathHullInset::rowChangeOK() const
+{
+       return
+               type_ == "eqnarray" || type_ == "align" ||
+               type_ == "flalign" || type_ == "alignat" ||
+               type_ == "xalignat" || type_ == "xxalignat" ||
+               type_ == "gather" || type_ == "multline";
+}
+
+
 bool MathHullInset::colChangeOK() const
 {
        return
@@ -440,6 +566,8 @@ bool MathHullInset::colChangeOK() const
 
 void MathHullInset::addRow(row_type row)
 {
+       if (!rowChangeOK())
+               return;
        nonum_.insert(nonum_.begin() + row + 1, !numberedType());
        label_.insert(label_.begin() + row + 1, string());
        MathGridInset::addRow(row);
@@ -448,7 +576,7 @@ void MathHullInset::addRow(row_type row)
 
 void MathHullInset::swapRow(row_type row)
 {
-       if (nrows() == 1)
+       if (nrows() <= 1)
                return;
        if (row + 1 == nrows())
                --row;
@@ -460,9 +588,13 @@ void MathHullInset::swapRow(row_type row)
 
 void MathHullInset::delRow(row_type row)
 {
-       if (nrows() <= 1)
+       if (nrows() <= 1 || !rowChangeOK())
                return;
        MathGridInset::delRow(row);
+       // The last dummy row has no number info nor a label.
+       // Test nrows() + 1 because we have already erased the row.
+       if (row == nrows() + 1)
+               row--;
        nonum_.erase(nonum_.begin() + row);
        label_.erase(label_.begin() + row);
 }
@@ -470,19 +602,17 @@ void MathHullInset::delRow(row_type row)
 
 void MathHullInset::addCol(col_type col)
 {
-       if (colChangeOK())
-               MathGridInset::addCol(col);
-       else
-               lyxerr << "Can't change number of columns in '" << type_ << "'" << endl;
+       if (!colChangeOK())
+               return;
+       MathGridInset::addCol(col);
 }
 
 
 void MathHullInset::delCol(col_type col)
 {
-       if (colChangeOK())
-               MathGridInset::delCol(col);
-       else
-               lyxerr << "Can't change number of columns in '" << type_ << "'" << endl;
+       if (ncols() <= 1 || !colChangeOK())
+               return;
+       MathGridInset::delCol(col);
 }
 
 
@@ -507,6 +637,65 @@ void MathHullInset::glueall()
 }
 
 
+void MathHullInset::splitTo2Cols()
+{
+       BOOST_ASSERT(ncols() == 1);
+       MathGridInset::addCol(1);
+       for (row_type row = 0; row < nrows(); ++row) {
+               idx_type const i = 2 * row;
+               pos_type pos = firstRelOp(cell(i));
+               cell(i + 1) = MathArray(cell(i).begin() + pos, cell(i).end());
+               cell(i).erase(pos, cell(i).size());
+       }
+}
+
+
+void MathHullInset::splitTo3Cols()
+{
+       BOOST_ASSERT(ncols() < 3);
+       if (ncols() < 2)
+               splitTo2Cols();
+       MathGridInset::addCol(1);
+       for (row_type row = 0; row < nrows(); ++row) {
+               idx_type const i = 3 * row + 1;
+               if (cell(i).size()) {
+                       cell(i + 1) = MathArray(cell(i).begin() + 1, cell(i).end());
+                       cell(i).erase(1, cell(i).size());
+               }
+       }
+}
+
+
+void MathHullInset::changeCols(col_type cols)
+{
+       if (ncols() == cols)
+               return;
+       else if (ncols() < cols) {
+               // split columns
+               if (cols < 3)
+                       splitTo2Cols();
+               else {
+                       splitTo3Cols();
+                       while (ncols() < cols)
+                               MathGridInset::addCol(ncols() - 1);
+               }
+               return;
+       }
+
+       // combine columns
+       for (row_type row = 0; row < nrows(); ++row) {
+               idx_type const i = row * ncols();
+               for (col_type col = cols; col < ncols(); ++col) {
+                       cell(i + cols - 1).append(cell(i + col));
+               }
+       }
+       // delete columns
+       while (ncols() > cols) {
+               MathGridInset::delCol(ncols() - 1);
+       }
+}
+
+
 string const & MathHullInset::getType() const
 {
        return type_;
@@ -523,10 +712,15 @@ void MathHullInset::setType(string const & type)
 
 void MathHullInset::mutate(string const & newtype)
 {
-       lyxerr << "mutating from '" << type_ << "' to '" << newtype << "'" << endl;
+       //lyxerr << "mutating from '" << type_ << "' to '" << newtype << "'" << endl;
 
        // we try to move along the chain
-       // none <-> simple <-> equation <-> eqnarray
+       // none <-> simple <-> equation <-> eqnarray -> *align* -> multline, gather -+
+       //                                     ^                                     |
+       //                                     +-------------------------------------+
+       // we use eqnarray as intermediate type for mutations that are not
+       // directly supported because it handles labels and numbering for
+       // "down mutation".
 
        if (newtype == "dump") {
                dump();
@@ -536,6 +730,10 @@ void MathHullInset::mutate(string const & newtype)
                // done
        }
 
+       else if (typecode(newtype) < 0) {
+               // unknown type
+       }
+
        else if (type_ == "none") {
                setType("simple");
                numbered(0, false);
@@ -545,6 +743,7 @@ void MathHullInset::mutate(string const & newtype)
        else if (type_ == "simple") {
                if (newtype == "none") {
                        setType("none");
+                       numbered(0, false);
                } else {
                        setType("equation");
                        numbered(0, false);
@@ -555,32 +754,17 @@ void MathHullInset::mutate(string const & newtype)
        else if (type_ == "equation") {
                if (smaller(newtype, type_)) {
                        setType("simple");
+                       numbered(0, false);
                        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());
-                       }
+                       // split it "nicely" on the first relop
+                       splitTo3Cols();
                        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);
+                       splitTo2Cols();
                        setType("align");
                        mutate(newtype);
                }
@@ -608,57 +792,72 @@ void MathHullInset::mutate(string const & newtype)
                        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));
-                       }
-                       MathGridInset::delCol(2);
+                       changeCols(2);
                        setType("align");
                        mutate(newtype);
                }
        }
 
-       else if (type_ == "align") {
-               if (smaller(newtype, type_)) {
-                       MathGridInset::addCol(1);
+       else if (type_ ==  "align"   || type_ == "alignat" ||
+                type_ == "xalignat" || type_ == "flalign") {
+               if (smaller(newtype, "align")) {
+                       changeCols(3);
                        setType("eqnarray");
                        mutate(newtype);
+               } else if (newtype == "gather" || newtype == "multline") {
+                       changeCols(1);
+                       setType(newtype);
+               } else if (newtype ==   "xxalignat") {
+                       for (row_type row = 0; row < nrows(); ++row)
+                               numbered(row, false);
+                       setType(newtype);
                } else {
                        setType(newtype);
                }
        }
 
-       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);
+       else if (type_ == "xxalignat") {
+               for (row_type row = 0; row < nrows(); ++row)
+                       numbered(row, false);
+               if (smaller(newtype, "align")) {
+                       changeCols(3);
                        setType("eqnarray");
+                       mutate(newtype);
+               } else if (newtype == "gather" || newtype == "multline") {
+                       changeCols(1);
+                       setType(newtype);
                } else {
-                       lyxerr << "mutation from '" << type_
-                               << "' to '" << newtype << "' not implemented" << endl;
+                       setType(newtype);
                }
        }
 
-       else if (type_ == "gather") {
-               if (newtype == "multline") {
-                       setType("multline");
+       else if (type_ == "multline" || type_ == "gather") {
+               if (newtype == "gather" || newtype == "multline")
+                       setType(newtype);
+               else if (newtype ==   "align"   || newtype == "flalign"  ||
+                        newtype ==   "alignat" || newtype == "xalignat") {
+                       splitTo2Cols();
+                       setType(newtype);
+               } else if (newtype ==   "xxalignat") {
+                       splitTo2Cols();
+                       for (row_type row = 0; row < nrows(); ++row)
+                               numbered(row, false);
+                       setType(newtype);
                } else {
-                       lyxerr << "mutation from '" << type_
-                               << "' to '" << newtype << "' not implemented" << endl;
+                       splitTo3Cols();
+                       setType("eqnarray");
+                       mutate(newtype);
                }
        }
 
        else {
                lyxerr << "mutation from '" << type_
-                                        << "' to '" << newtype << "' not implemented" << endl;
+                      << "' to '" << newtype << "' not implemented" << endl;
        }
 }
 
 
-string MathHullInset::eolString(row_type row, bool fragile) const
+string MathHullInset::eolString(row_type row, bool emptyline, bool fragile) const
 {
        string res;
        if (numberedType()) {
@@ -667,7 +866,7 @@ string MathHullInset::eolString(row_type row, bool fragile) const
                if (nonum_[row] && (type_ != "multline"))
                        res += "\\nonumber ";
        }
-       return res + MathGridInset::eolString(row, fragile);
+       return res + MathGridInset::eolString(row, emptyline, fragile);
 }
 
 
@@ -706,11 +905,11 @@ void MathHullInset::check() const
 }
 
 
-void MathHullInset::doExtern(LCursor & cur, FuncRequest const & func)
+void MathHullInset::doExtern(LCursor & cur, FuncRequest & func)
 {
        string lang;
        string extra;
-       istringstream iss(func.argument.c_str());
+       istringstream iss(func.argument);
        iss >> lang >> extra;
        if (extra.empty())
                extra = "noextra";
@@ -737,7 +936,7 @@ void MathHullInset::doExtern(LCursor & cur, FuncRequest const & func)
                size_type pos = cur.cell().find_last(eq);
                MathArray ar;
                if (cur.inMathed() && cur.selection()) {
-                       asArray(cur.grabAndEraseSelection(), ar);
+                       asArray(grabAndEraseSelection(cur), ar);
                } else if (pos == cur.cell().size()) {
                        ar = cur.cell();
                        lyxerr << "use whole cell: " << ar << endl;
@@ -785,109 +984,241 @@ void MathHullInset::doExtern(LCursor & cur, FuncRequest const & func)
 }
 
 
-DispatchResult
-MathHullInset::priv_dispatch(LCursor & cur, FuncRequest const & cmd)
+void MathHullInset::doDispatch(LCursor & cur, FuncRequest & cmd)
 {
-       lyxerr << "*** MathHullInset: request: " << cmd << endl;
+       //lyxerr << "action: " << cmd.action << endl;
        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(cur, cmd);
-
-               case LFUN_MATH_NUMBER:
-                       //lyxerr << "toggling all numbers" << endl;
-                       if (display()) {
-                               //recordUndo(cur, Undo::INSERT);
-                               bool old = numberedType();
-                               if (type_ == "multline")
-                                       numbered(nrows() - 1, !old);
-                               else
-                                       for (row_type row = 0; row < nrows(); ++row)
-                                               numbered(row, !old);
-                               //cur.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(cur, Undo::INSERT);
-                               bool old = numbered(r);
-                               //cur.bv()->owner()->message(old ? _("No number") : _("Number"));
-                               numbered(r, !old);
-                       }
-                       return DispatchResult(true, true);
+       case LFUN_FINISHED_LEFT:
+       case LFUN_FINISHED_RIGHT:
+       case LFUN_FINISHED_UP:
+       case LFUN_FINISHED_DOWN:
+               //lyxerr << "action: " << cmd.action << endl;
+               MathGridInset::doDispatch(cur, cmd);
+               notifyCursorLeaves(cur);
+               cur.undispatched();
+               break;
+
+       case LFUN_BREAKPARAGRAPH:
+               // just swallow this
+               break;
+
+       case LFUN_BREAKLINE:
+               // some magic for the common case
+               if (type_ == "simple" || type_ == "equation") {
+                       recordUndoInset(cur);
+                       bool const align =
+                               cur.bv().buffer()->params().use_amsmath == BufferParams::AMS_ON;
+                       mutate(align ? "align" : "eqnarray");
+                       cur.idx() = 0;
+                       cur.pos() = cur.lastpos();
+               }
+               MathGridInset::doDispatch(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);
+                       cur.message(old ? _("No number") : _("Number"));
+               }
+               break;
 
-               case LFUN_INSERT_LABEL: {
+       case LFUN_MATH_NONUMBER:
+               if (display()) {
+                       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);
-                               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);
+                       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 const default_label =
+                       (lyxrc.label_init_length >= 0) ? "eq:" : "";
+               if (old_label.empty())
+                       old_label = default_label;
+               string const contents = cmd.argument.empty() ?
+                       old_label : cmd.argument;
+
+               InsetCommandParams p("label", contents);
+               string const data = InsetCommandMailer::params2string("label", p);
+
+               if (cmd.argument.empty()) {
+                       cur.bv().owner()->getDialogs().show("label", data, 0);
+               } else {
+                       FuncRequest fr(LFUN_INSET_INSERT, data);
+                       dispatch(cur, fr);
+               }
+               break;
+       }
 
-               case LFUN_MATH_EXTERN:
-                       doExtern(cur, 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_INSET_INSERT: {
+               //lyxerr << "arg: " << cmd.argument << endl;
+               string const name = cmd.getArg(0);
+               if (name == "label") {
+                       InsetCommandParams p;
+                       InsetCommandMailer::string2params(name, cmd.argument, p);
+                       string str = p.getContents();
+                       recordUndoInset(cur);
+                       row_type const r = (type_ == "multline") ? nrows() - 1 : cur.row();
+                       str = lyx::support::trim(str);
+                       if (!str.empty())
+                               numbered(r, true);
+                       string old = label(r);
+                       if (str != old) {
+                               cur.bv().buffer()->changeRefsIfUnique(old, str);
+                               label(r, str);
+                       }
+                       break;
                }
+               MathArray ar;
+               if (createMathInset_fromDialogStr(cmd.argument, ar)) {
+                       recordUndo(cur);
+                       cur.insert(ar);
+               } else
+                       cur.undispatched();
+               break;
+       }
 
-               case LFUN_MATH_DISPLAY: {
-                       mutate(type_ == "simple" ? "equation" : "simple");
-                       cur.idx() = 0;
+       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();
-                       return DispatchResult(true, FINISHED);
                }
+               if (cur.pos() > cur.lastpos())
+                       cur.pos() = cur.lastpos();
+               //cur.dispatched(FINISHED);
+               break;
+       }
+
+       case LFUN_MATH_DISPLAY: {
+               recordUndoInset(cur);
+               mutate(type_ == "simple" ? "equation" : "simple");
+               cur.idx() = 0;
+               cur.pos() = cur.lastpos();
+               //cur.dispatched(FINISHED);
+               break;
+       }
 
-               default:
-                       return MathGridInset::priv_dispatch(cur, cmd);
+       default:
+               MathGridInset::doDispatch(cur, cmd);
+               break;
        }
 }
 
 
-string MathHullInset::fileInsetLabel() const
+bool MathHullInset::getStatus(LCursor & cur, FuncRequest const & cmd,
+               FuncStatus & status) const
 {
-       return "Formula";
+       switch (cmd.action) {
+       case LFUN_FINISHED_LEFT:
+       case LFUN_FINISHED_RIGHT:
+       case LFUN_FINISHED_UP:
+       case LFUN_FINISHED_DOWN:
+               status.enabled(true);
+               return true;
+       case LFUN_BREAKLINE:
+       case LFUN_MATH_NUMBER:
+       case LFUN_MATH_NONUMBER:
+       case LFUN_MATH_EXTERN:
+       case LFUN_MATH_MUTATE:
+       case LFUN_MATH_DISPLAY:
+               // we handle these
+               status.enabled(true);
+               return true;
+       case LFUN_INSERT_LABEL:
+               status.enabled(type_ != "simple");
+               return true;
+       case LFUN_INSET_INSERT: {
+               // Don't test createMathInset_fromDialogStr(), since
+               // getStatus is not called with a valid reference and the
+               // dialog would not be applyable.
+               string const name = cmd.getArg(0);
+               status.enabled(name == "ref" ||
+                              (name == "label" && type_ != "simple"));
+               break;
+       }
+       case LFUN_TABULAR_FEATURE: {
+               istringstream is(cmd.argument);
+               string s;
+               is >> s;
+               if (!rowChangeOK()
+                   && (s == "append-row"
+                       || s == "delete-row"
+                       || s == "copy-row")) {
+                       status.message(bformat(
+                               N_("Can't change number of rows in '%1$s'"),
+                               type_));
+                       status.enabled(false);
+                       return true;
+               }
+               if (!colChangeOK()
+                   && (s == "append-column"
+                       || s == "delete-column"
+                       || s == "copy-column")) {
+                       status.message(bformat(
+                               N_("Can't change number of columns in '%1$s'"),
+                               type_));
+                       status.enabled(false);
+                       return true;
+               }
+               if ((type_ == "simple"
+                 || type_ == "equation"
+                 || type_ == "none") &&
+                   (s == "add-hline-above" || s == "add-hline-below")) {
+                       status.message(bformat(
+                               N_("Can't add horizontal grid lines in '%1$s'"),
+                               type_));
+                       status.enabled(false);
+                       return true;
+               }
+               if (s == "add-vline-left" || s == "add-vline-right") {
+                       status.message(bformat(
+                               N_("Can't add vertical grid lines in '%1$s'"),
+                               type_));
+                       status.enabled(false);
+                       return true;
+               }
+               if (s == "valign-top" || s == "valign-middle"
+                || s == "valign-bottom" || s == "align-left"
+                || s == "align-center" || s == "align-right") {
+                       status.enabled(false);
+                       return true;
+               }
+               return MathGridInset::getStatus(cur, cmd, status);
+       }
+       default:
+               return MathGridInset::getStatus(cur, cmd, status);
+       }
+
+       // This cannot really happen, but inserted to shut-up gcc
+       return MathGridInset::getStatus(cur, cmd, status);
 }
 
 
 /////////////////////////////////////////////////////////////////////
 
-#include "formulamacro.h"
 #include "math_arrayinset.h"
 #include "math_deliminset.h"
 #include "math_factory.h"
@@ -897,51 +1228,13 @@ string MathHullInset::fileInsetLabel() const
 
 #include "bufferview_funcs.h"
 #include "lyxtext.h"
-#include "undo.h"
 
 #include "frontends/LyXView.h"
 #include "frontends/Dialogs.h"
 
-#include "support/std_sstream.h"
-#include "support/lstrings.h"
 #include "support/lyxlib.h"
 
 
-
-namespace {
-
-// local global
-int first_x;
-int first_y;
-
-} // namespace anon
-
-
-
-int MathHullInset::ylow() const
-{
-       return yo_ - dim_.asc;
-}
-
-
-int MathHullInset::yhigh() const
-{
-       return yo_ + dim_.des;
-}
-
-
-int MathHullInset::xlow() const
-{
-       return xo_;
-}
-
-
-int MathHullInset::xhigh() const
-{
-       return xo_ + dim_.wid;
-}
-
-
 // simply scrap this function if you want
 void MathHullInset::mutateToText()
 {
@@ -964,14 +1257,13 @@ void MathHullInset::mutateToText()
 }
 
 
-void MathHullInset::handleFont
-       (LCursor & cur, string const & arg, string const & font)
+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, Undo::ATOMIC);
-
-       if (cur.inset()->asMathInset()->name() == font)
+       recordUndo(cur);
+       if (cur.inset().asMathInset()->name() == font)
                cur.handleFont(font);
        else {
                cur.handleNest(createMathInset(font));
@@ -982,168 +1274,28 @@ void MathHullInset::handleFont
 
 void MathHullInset::handleFont2(LCursor & cur, string const & arg)
 {
-       recordUndo(cur, Undo::ATOMIC);
+       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);
-       }
-}
-
-
-string const MathHullInset::editMessage() const
-{
-       return _("Math editor mode");
-}
-
-
-void MathHullInset::insetUnlock(BufferView & bv)
-{
-       if (bv.cursor().inMathed()) {
-               if (bv.cursor().inMacroMode())
-                       bv.cursor().macroModeClose();
-               bv.cursor().releaseMathCursor();
+               MathAtom at = MathAtom(new MathColorInset(true, font.color()));
+               cur.handleNest(at, 0);
        }
-       if (bv.buffer())
-               generatePreview(*bv.buffer());
-       bv.update();
-}
-
-
-void MathHullInset::getCursorDim(int & asc, int & desc) const
-{
-       asc = 10;
-       desc = 2;
-       //math_font_max_dim(font_, asc, des);
-}
-
-
-DispatchResult
-MathHullInset::lfunMouseRelease(LCursor & cur, FuncRequest const & cmd)
-{
-       if (!cur.inMathed())
-               return DispatchResult(false);
-       cur.bv().update();
-       //lyxerr << "lfunMouseRelease: buttons: " << cmd.button() << endl;
-
-       if (cmd.button() == mouse_button::button3) {
-               // try to dispatch to enclosed insets first
-               if (!cur.dispatch(cmd).dispatched()) {
-                       // launch math panel for right mouse button
-                       lyxerr << "lfunMouseRelease: undispatched: " << cmd.button() << endl;
-                       cur.bv().owner()->getDialogs().show("mathpanel");
-               }
-               return DispatchResult(true, true);
-       }
-
-       if (cmd.button() == mouse_button::button2) {
-               MathArray ar;
-               asArray(cur.bv().getClipboard(), ar);
-               cur.selClear();
-               cur.setScreenPos(cmd.x, cmd.y);
-               cur.insert(ar);
-               cur.bv().update();
-               return DispatchResult(true, true);
-       }
-
-       if (cmd.button() == mouse_button::button1) {
-               // try to dispatch to enclosed insets first
-               cur.dispatch(cmd);
-               cur.bv().stuffClipboard(cur.grabSelection());
-               return DispatchResult(true, true);
-       }
-
-       return DispatchResult(false);
-}
-
-
-DispatchResult
-MathHullInset::lfunMousePress(LCursor & cur, FuncRequest const & cmd)
-{
-       //lyxerr << "lfunMousePress: buttons: " << cmd.button() << endl;
-
-       if (!cur.inMathed() || cur.formula() != this) {
-               lyxerr[Debug::MATHED] << "re-create cursor" << endl;
-               cur.releaseMathCursor();
-               cur.idx() = 0;
-               //metrics(bv);
-               cur.setScreenPos(cmd.x + xo_, cmd.y + yo_);
-       }
-
-       if (cmd.button() == mouse_button::button3) {
-               cur.dispatch(cmd);
-               return DispatchResult(true, true);
-       }
-
-       if (cmd.button() == mouse_button::button1) {
-               first_x = cmd.x;
-               first_y = cmd.y;
-               cur.selClear();
-               cur.setScreenPos(cmd.x + xo_, cmd.y + yo_);
-               cur.dispatch(cmd);
-               return DispatchResult(true, true);
-       }
-
-       cur.bv().update();
-       return DispatchResult(true, true);
-}
-
-
-DispatchResult
-MathHullInset::lfunMouseMotion(LCursor & cur, FuncRequest const & cmd)
-{
-       if (!cur.inMathed())
-               return DispatchResult(true, true);
-
-       if (cur.dispatch(FuncRequest(cmd)).dispatched())
-               return DispatchResult(true, true);
-
-       // only select with button 1
-       if (cmd.button() != mouse_button::button1)
-               return DispatchResult(true, true);
-
-       if (abs(cmd.x - first_x) < 2 && abs(cmd.y - first_y) < 2)
-               return DispatchResult(true, true);
-
-       first_x = cmd.x;
-       first_y = cmd.y;
-
-       if (!cur.selection())
-               cur.selBegin();
-
-       cur.setScreenPos(cmd.x + xo_, cmd.y + yo_);
-       cur.bv().update();
-       return DispatchResult(true, true);
 }
 
 
 void MathHullInset::edit(LCursor & cur, bool left)
 {
-       lyxerr << "Called FormulaBase::edit" << endl;
-       cur.push(this);
-       cur.idx() = left ? 0 : cur.lastidx();
-       cur.pos() = left ? 0 : cur.lastpos();
-       cur.resetAnchor();
+       cur.push(*this);
+       left ? idxFirst(cur) : idxLast(cur);
 }
 
 
-/*
-void MathHullInset::edit(LCursor & cur, int x, int y)
+string const MathHullInset::editMessage() const
 {
-       lyxerr << "Called MathHullInset::edit with '" << x << ' ' << y << "'" << endl;
-       cur.push(this);
-       //cur.idx() = left ? 0 : cur.lastidx();
-       cur.idx() = 0;
-       cur.pos() = 0;
-       cur.setScreenPos(x + xo_, y + yo_);
-       // if that is removed, we won't get the magenta box when entering an
-       // inset for the first time
-       cur.bv().update();
+       return _("Math editor mode");
 }
-*/
 
 
 void MathHullInset::revealCodes(LCursor & cur) const
@@ -1152,7 +1304,7 @@ void MathHullInset::revealCodes(LCursor & cur) const
                return;
        ostringstream os;
        cur.info(os);
-       cur.bv().owner()->message(os.str());
+       cur.message(os.str());
 /*
        // write something to the minibuffer
        // translate to latex
@@ -1177,7 +1329,7 @@ void MathHullInset::revealCodes(LCursor & cur) const
                res = res.substr(pos - 30);
        if (res.size() > 60)
                res = res.substr(0, 60);
-       bv.owner()->message(res);
+       cur.message(res);
 */
 }
 
@@ -1191,22 +1343,15 @@ InsetBase::Code MathHullInset::lyxCode() const
 /////////////////////////////////////////////////////////////////////
 
 
-#if 1
-bool MathHullInset::searchForward(BufferView *, string const &, bool, bool)
-{
-       return false;
-}
-
-#else
+#if 0
 bool MathHullInset::searchForward(BufferView * bv, string const & str,
                                     bool, bool)
 {
-       return false;
 #ifdef WITH_WARNINGS
-#warning pretty ugly
+#warning completely broken
 #endif
        static MathHullInset * lastformula = 0;
-       static CursorBase current = CursorBase(ibegin(nucleus()));
+       static CursorBase current = DocIterator(ibegin(nucleus()));
        static MathArray ar;
        static string laststr;
 
@@ -1222,7 +1367,7 @@ bool MathHullInset::searchForward(BufferView * bv, string const & str,
        }
        //lyxerr << "searching '" << str << "' in " << this << ar << endl;
 
-       for (CursorBase it = current; it != iend(nucleus()); increment(it)) {
+       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_)) {
@@ -1241,19 +1386,10 @@ bool MathHullInset::searchForward(BufferView * bv, string const & str,
 #endif
 
 
-bool MathHullInset::searchBackward(BufferView * bv, string const & what,
-                                     bool a, bool b)
-{
-       lyxerr[Debug::MATHED]
-               << "searching backward not implemented in mathed" << endl;
-       return searchForward(bv, what, a, b);
-}
-
-
 void MathHullInset::write(Buffer const &, std::ostream & os) const
 {
        WriteStream wi(os, false, false);
-       os << fileInsetLabel() << ' ';
+       os << "Formula ";
        write(wi);
 }
 
@@ -1266,15 +1402,6 @@ void MathHullInset::read(Buffer const &, LyXLex & lex)
 }
 
 
-int MathHullInset::latex(Buffer const &, ostream & os,
-                       OutputParams const & runparams) const
-{
-       WriteStream wi(os, runparams.moving_arg, true);
-       write(wi);
-       return wi.line();
-}
-
-
 int MathHullInset::plaintext(Buffer const &, ostream & os,
                        OutputParams const &) const
 {
@@ -1290,7 +1417,7 @@ int MathHullInset::plaintext(Buffer const &, ostream & os,
                return tpain.textheight();
        } else {
                WriteStream wi(os, false, true);
-               wi << ' ' << cell(0) << ' ';
+               wi << cell(0);
                return wi.line();
        }
 }
@@ -1307,123 +1434,56 @@ int MathHullInset::docbook(Buffer const & buf, ostream & os,
                          OutputParams const & runparams) const
 {
        MathMLStream ms(os);
-       ms << MTag("equation");
-       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;
-}
-
-
-
-/////////////////////////////////////////////
-
-namespace {
-
-bool openNewInset(LCursor & cur, InsetBase * inset)
-{
-       if (!cur.bv().insertInset(inset)) {
-               delete inset;
-               return false;
+       int res = 0;
+       string name;
+       if (getType() == "simple")
+               name= "inlineequation";
+       else
+               name = "informalequation";
+
+       string bname = name;
+       if (!label(0).empty())
+               bname += " id=\"" + sgml::cleanID(buf, runparams, label(0)) + "\"";
+       ms << MTag(bname.c_str());
+
+       ostringstream ls;
+       if (runparams.flavor == OutputParams::XML) {
+               ms << MTag("alt role=\"tex\" ");
+               // Workaround for db2latex: db2latex always includes equations with
+               // \ensuremath{} or \begin{display}\end{display}
+               // so we strip LyX' math environment
+               WriteStream wi(ls, false, false);
+               MathGridInset::write(wi);
+               ms << subst(subst(ls.str(), "&", "&amp;"), "<", "&lt;");
+               ms << ETag("alt");
+               ms << MTag("math");
+               MathGridInset::mathmlize(ms);
+               ms << ETag("math");
+       } else {
+               ms << MTag("alt role=\"tex\"");
+               res = latex(buf, ls, runparams);
+               ms << subst(subst(ls.str(), "&", "&amp;"), "<", "&lt;");
+               ms << ETag("alt");
        }
-       inset->edit(cur, true);
-       return true;
-}
-
 
-void mathDispatchCreation(LCursor & cur, FuncRequest const & cmd,
-       bool display)
-{
-       // use selection if available..
-       //string sel;
-       //if (action == LFUN_MATH_IMPORT_SELECTION)
-       //      sel = "";
-       //else
+       ms <<  "<graphic fileref=\"eqn/";
+       if ( !label(0).empty())
+               ms << sgml::cleanID(buf, runparams, label(0));
+       else
+               ms << sgml::uniqueID("anon");
 
-       string sel =
-               cur.bv().getLyXText()->selectionAsString(*cur.bv().buffer(), false);
+       if (runparams.flavor == OutputParams::XML)
+               ms << "\"/>";
+       else
+               ms << "\">";
 
-       if (sel.empty()) {
-               InsetBase * f = new MathHullInset;
-               if (openNewInset(cur, f)) {
-                       cur.inset()->dispatch(cur, FuncRequest(LFUN_MATH_MUTATE, "simple"));
-                       // don't do that also for LFUN_MATH_MODE unless you want end up with
-                       // always changing to mathrm when opening an inlined inset
-                       // -- I really hate "LyXfunc overloading"...
-                       if (display)
-                               f->dispatch(cur, FuncRequest(LFUN_MATH_DISPLAY));
-                       f->dispatch(cur, FuncRequest(LFUN_INSERT_MATH, cmd.argument));
-               }
-       } else {
-               // create a macro if we see "\\newcommand" somewhere, and an ordinary
-               // formula otherwise
-               InsetBase * f;
-               if (sel.find("\\newcommand") == string::npos &&
-                               sel.find("\\def") == string::npos)
-                       f = new MathHullInset(sel);
-               else
-                       f = new InsetFormulaMacro(sel);
-               cur.bv().getLyXText()->cutSelection(true, false);
-               openNewInset(cur, f);
-       }
-       cmd.message(N_("Math editor mode"));
+       ms << ETag(name.c_str());
+       return ms.line() + res;
 }
 
-} // namespace anon
-
 
-void mathDispatch(LCursor & cur, FuncRequest const & cmd)
+int MathHullInset::textString(Buffer const & buf, ostream & os,
+                      OutputParams const & op) const
 {
-       if (!cur.bv().available())
-               return;
-
-       switch (cmd.action) {
-
-               case LFUN_MATH_DISPLAY:
-                       mathDispatchCreation(cur, cmd, true);
-                       break;
-
-               case LFUN_MATH_MODE:
-                       mathDispatchCreation(cur, cmd, false);
-                       break;
-
-               case LFUN_MATH_IMPORT_SELECTION:
-                       mathDispatchCreation(cur, cmd, false);
-                       break;
-
-/*
-               case LFUN_MATH_MACRO:
-                       if (cmd.argument.empty())
-                               cmd.errorMessage(N_("Missing argument"));
-                       else {
-                               string s = cmd.argument;
-                               string const s1 = token(s, ' ', 1);
-                               int const nargs = s1.empty() ? 0 : atoi(s1);
-                               string const s2 = token(s, ' ', 2);
-                               string const type = s2.empty() ? "newcommand" : s2;
-                               openNewInset(cur, new InsetFormulaMacro(token(s, ' ', 0), nargs, s2));
-                       }
-                       break;
-
-               case LFUN_INSERT_MATH:
-               case LFUN_INSERT_MATRIX:
-               case LFUN_MATH_DELIM: {
-                       MathHullInset * f = new MathHullInset;
-                       if (openNewInset(cur, f)) {
-                               cur.inset()->dispatch(cur, FuncRequest(LFUN_MATH_MUTATE, "simple"));
-                               cur.inset()->dispatch(cur, cmd);
-                       }
-                       break;
-               }
-*/
-
-               default:
-                       break;
-       }
+       return plaintext(buf, os, op);
 }