revert Buffer LyxText->InsetText commit

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

diff --git a/src/mathed/math_hullinset.C b/src/mathed/math_hullinset.C
index 443240e921db7a051ee1af0ae78c937a5f3590d6..3f46a091c1a015ea127865f8455b4d6611da6be0 100644 (file)
--- a/src/mathed/math_hullinset.C
+++ b/src/mathed/math_hullinset.C
@@ -784,96 +784,98 @@ void MathHullInset::doExtern(LCursor & cur, FuncRequest const & func)
 }
 
 
-DispatchResult
-MathHullInset::priv_dispatch(LCursor & cur, FuncRequest const & cmd)
+void MathHullInset::priv_dispatch(LCursor & cur, FuncRequest const & 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.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.message(old ? _("No number") : _("Number"));
-                               numbered(r, !old);
-                       }
-                       return DispatchResult(true, true);
-
-               case LFUN_INSERT_LABEL: {
-                       row_type r = (type_ == "multline") ? nrows() - 1 : cur.row();
-                       string old_label = label(r);
-                       string new_label = cmd.argument;
-
-                       if (new_label.empty()) {
-                               string const default_label =
-                                       (lyxrc.label_init_length >= 0) ? "eq:" : "";
-                               pair<bool, string> const res = old_label.empty()
-                                       ? Alert::askForText(_("Enter new label to insert:"), default_label)
-                                       : Alert::askForText(_("Enter label:"), old_label);
-                               if (!res.first)
-                                       return DispatchResult(false);
-                               new_label = lyx::support::trim(res.second);
-                       }
+       case LFUN_BREAKLINE:
+               if (type_ == "simple" || type_ == "equation") {
+                       mutate("eqnarray");
+                       cur.idx() = 1;
+                       cur.pos() = 0;
+                       //cur.dispatched(FINISHED);
+                       return;
+               }
+               MathGridInset::priv_dispatch(cur, cmd);
+               return;
 
-                       //if (new_label == old_label)
-                       //      break;  // Nothing to do
+       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.message(old ? _("No number") : _("Number"));
+               }
+               return;
 
-                       if (!new_label.empty())
-                               numbered(r, true);
-                       label(r, new_label);
-                       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.message(old ? _("No number") : _("Number"));
+                       numbered(r, !old);
                }
+               return;
 
-               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_INSERT_LABEL: {
+               row_type r = (type_ == "multline") ? nrows() - 1 : cur.row();
+               string old_label = label(r);
+               string new_label = cmd.argument;
+
+               if (new_label.empty()) {
+                       string const default_label =
+                               (lyxrc.label_init_length >= 0) ? "eq:" : "";
+                       pair<bool, string> const res = old_label.empty()
+                               ? Alert::askForText(_("Enter new label to insert:"), default_label)
+                               : Alert::askForText(_("Enter label:"), old_label);
+                       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);
+               return;
+       }
+
+       case LFUN_MATH_EXTERN:
+               doExtern(cur, cmd);
+               //cur.dispatched(FINISHED);
+               return;
+
+       case LFUN_MATH_MUTATE: {
+               lyxerr << "Hull: MUTATE: " << cmd.argument << endl;
+               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);
+               return;
+       }
+
+       case LFUN_MATH_DISPLAY: {
+               mutate(type_ == "simple" ? "equation" : "simple");
+               cur.idx() = 0;
+               cur.pos() = cur.lastpos();
+               //cur.dispatched(FINISHED);
+               return;
+       }
 
-               default:
-                       return MathGridInset::priv_dispatch(cur, cmd);
+       default:
+               MathGridInset::priv_dispatch(cur, cmd);
+               return;
        }
 }
 
@@ -993,7 +995,6 @@ void MathHullInset::insetUnlock(BufferView & bv)
        if (bv.cursor().inMathed()) {
                if (bv.cursor().inMacroMode())
                        bv.cursor().macroModeClose();
-               bv.cursor().releaseMathCursor();
        }
        if (bv.buffer())
                generatePreview(*bv.buffer());
@@ -1069,7 +1070,7 @@ bool MathHullInset::searchForward(BufferView * bv, string const & str,
 #warning pretty ugly
 #endif
        static MathHullInset * lastformula = 0;
-       static CursorBase current = CursorBase(ibegin(nucleus()));
+       static CursorBase current = DocumentIterator(ibegin(nucleus()));
        static MathArray ar;
        static string laststr;
 
@@ -1085,7 +1086,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 (DocumentIterator 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_)) {