]> 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 0d3dadbccd3d8f85addf4f9bcddc6de4c3e91803..b56dec9d2c70fb9b8414911e618de80382d843eb 100644 (file)
 #include "math_support.h"
 
 #include "BufferView.h"
+#include "CutAndPaste.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 "textpainter.h"
+#include "undo.h"
+
+#include "insets/render_preview.h"
 
 #include "frontends/Alert.h"
 
-#include "support/std_sstream.h"
+#include "graphics/PreviewImage.h"
+#include "graphics/PreviewLoader.h"
+
+#include <boost/bind.hpp>
 
-using lyx::support::trim;
+#include <sstream>
+
+using lyx::cap::grabAndEraseSelection;
 
 using std::endl;
 using std::max;
@@ -114,10 +124,9 @@ 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;
@@ -127,18 +136,42 @@ MathHullInset::MathHullInset()
 
 
 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();
 }
 
 
+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 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));
+}
+
+
 MathInset::mode_type MathHullInset::currentMode() const
 {
        if (type_ == "none")
@@ -196,6 +229,26 @@ char const * MathHullInset::standardFont() const
 
 void MathHullInset::metrics(MetricsInfo & mi, Dimension & dim) const
 {
+       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);
 
@@ -224,14 +277,29 @@ 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
 {
+       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);
@@ -244,8 +312,7 @@ void MathHullInset::draw(PainterInfo & pi, int x, int y) const
                        drawStr(pi, pi.base.font, xx, yy, nicelabel(row));
                }
        }
-
-       drawMarkers2(pi, x, y);
+       setPosCache(pi, x, y);
 }
 
 
@@ -277,6 +344,40 @@ 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();
@@ -706,7 +807,7 @@ void MathHullInset::check() const
 }
 
 
-void MathHullInset::doExtern(LCursor & cur, FuncRequest const & func)
+void MathHullInset::doExtern(LCursor & cur, FuncRequest & func)
 {
        string lang;
        string extra;
@@ -737,7 +838,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 +886,136 @@ void MathHullInset::doExtern(LCursor & cur, FuncRequest const & func)
 }
 
 
-DispatchResult
-MathHullInset::priv_dispatch(LCursor & cur, FuncRequest const & cmd)
+void MathHullInset::priv_dispatch(LCursor & cur, FuncRequest & cmd)
 {
-       lyxerr << "*** MathHullInset: request: " << cmd << 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:
+               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);
+                       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);
                }
-
-               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);
+               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);
                }
 
-               case LFUN_MATH_DISPLAY: {
-                       mutate(type_ == "simple" ? "equation" : "simple");
-                       cur.idx() = 0;
+               if (!new_label.empty())
+                       numbered(r, true);
+               label(r, new_label);
+               break;
+       }
+
+       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;
+       }
 
-               default:
-                       return MathGridInset::priv_dispatch(cur, cmd);
+       case LFUN_MATH_DISPLAY: {
+               recordUndoInset(cur);
+               mutate(type_ == "simple" ? "equation" : "simple");
+               cur.idx() = 0;
+               cur.pos() = cur.lastpos();
+               //cur.dispatched(FINISHED);
+               break;
+       }
+
+       default:
+               MathGridInset::priv_dispatch(cur, cmd);
+               break;
        }
 }
 
 
-string MathHullInset::fileInsetLabel() const
+bool MathHullInset::getStatus(LCursor & cur, FuncRequest const & cmd,
+               FuncStatus & flag) const
 {
-       return "Formula";
+       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 "formulamacro.h"
 #include "math_arrayinset.h"
 #include "math_deliminset.h"
 #include "math_factory.h"
@@ -897,51 +1025,14 @@ 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 +1055,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,7 +1072,7 @@ 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);
@@ -994,22 +1084,16 @@ void MathHullInset::handleFont2(LCursor & cur, string const & arg)
 }
 
 
-string const MathHullInset::editMessage() const
+void MathHullInset::edit(LCursor & cur, bool left)
 {
-       return _("Math editor mode");
+       cur.push(*this);
+       left ? idxFirst(cur) : idxLast(cur);
 }
 
 
-void MathHullInset::insetUnlock(BufferView & bv)
+string const MathHullInset::editMessage() const
 {
-       if (bv.cursor().inMathed()) {
-               if (bv.cursor().inMacroMode())
-                       bv.cursor().macroModeClose();
-               bv.cursor().releaseMathCursor();
-       }
-       if (bv.buffer())
-               generatePreview(*bv.buffer());
-       bv.update();
+       return _("Math editor mode");
 }
 
 
@@ -1021,138 +1105,13 @@ void MathHullInset::getCursorDim(int & asc, int & desc) const
 }
 
 
-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();
-}
-
-
-/*
-void MathHullInset::edit(LCursor & cur, int x, int y)
-{
-       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();
-}
-*/
-
-
 void MathHullInset::revealCodes(LCursor & cur) const
 {
        if (!cur.inMathed())
                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 +1136,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 +1150,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 +1174,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 +1193,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 +1209,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
 {
@@ -1307,7 +1241,9 @@ int MathHullInset::docbook(Buffer const & buf, ostream & os,
                          OutputParams const & runparams) const
 {
        MathMLStream ms(os);
-       ms << MTag("equation");
+       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);
@@ -1319,111 +1255,3 @@ int MathHullInset::docbook(Buffer const & buf, ostream & os,
        ms << ETag("equation");
        return ms.line() + res;
 }
-
-
-
-/////////////////////////////////////////////
-
-namespace {
-
-bool openNewInset(LCursor & cur, InsetBase * inset)
-{
-       if (!cur.bv().insertInset(inset)) {
-               delete inset;
-               return false;
-       }
-       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
-
-       string sel =
-               cur.bv().getLyXText()->selectionAsString(*cur.bv().buffer(), false);
-
-       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"));
-}
-
-} // namespace anon
-
-
-void mathDispatch(LCursor & cur, FuncRequest const & cmd)
-{
-       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;
-       }
-}