Fix to bug 2362: Deleting superscript also deletes subscript.

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

diff --git a/src/mathed/math_nestinset.C b/src/mathed/math_nestinset.C
index 7605b0cfd9465fa57c6cea5de95ab6cd45130c77..0732cd20a1499da363655056a28a09263ceb8328 100644 (file)
--- a/src/mathed/math_nestinset.C
+++ b/src/mathed/math_nestinset.C
@@ -30,6 +30,7 @@
 #include "math_symbolinset.h"
 #include "math_support.h"
 #include "math_unknowninset.h"
+#include "ref_inset.h"
 
 #include "BufferView.h"
 #include "CutAndPaste.h"
@@ -50,13 +51,13 @@
 #include "frontends/Dialogs.h"
 #include "frontends/LyXView.h"
 #include "frontends/Painter.h"
+#include "frontends/nullpainter.h"
 
 #include <sstream>
 
 using lyx::cap::copySelection;
 using lyx::cap::grabAndEraseSelection;
 using lyx::cap::cutSelection;
-using lyx::cap::pasteSelection;
 using lyx::cap::replaceSelection;
 using lyx::cap::selClearOrDel;
 
@@ -219,9 +220,6 @@ void MathNestInset::draw(PainterInfo & pi, int x, int y) const
 
 void MathNestInset::drawSelection(PainterInfo & pi, int x, int y) const
 {
-       // FIXME: hack to get position cache warm
-       draw(pi, x, y);
-
        // this should use the x/y values given, not the cached values
        LCursor & cur = pi.base.bv->cursor();
        if (!cur.selection())
@@ -229,6 +227,12 @@ void MathNestInset::drawSelection(PainterInfo & pi, int x, int y) const
        if (!ptr_cmp(&cur.inset(), this))
                return;
 
+       // FIXME: hack to get position cache warm
+       static NullPainter nop;
+       PainterInfo pinop(pi);
+       pinop.pain = nop;
+       draw(pinop, x, y);
+
        CursorSlice s1 = cur.selBegin();
        CursorSlice s2 = cur.selEnd();
        //lyxerr << "MathNestInset::drawing selection: "
@@ -340,7 +344,7 @@ int MathNestInset::latex(Buffer const &, std::ostream & os,
 }
 
 
-void MathNestInset::notifyCursorLeaves(LCursor & /*cur*/)
+void MathNestInset::notifyCursorLeaves(LCursor & cur)
 {
 #ifdef WITH_WARNINGS
 #warning look here
@@ -415,7 +419,8 @@ void MathNestInset::doDispatch(LCursor & cur, FuncRequest & cmd)
                size_t n = 0;
                istringstream is(cmd.argument);
                is >> n;
-               pasteSelection(cur, n);
+               string const selection = lyx::cap::getSelection(cur.buffer(), n);
+               cur.niceInsert(selection);
                cur.clearSelection(); // bug 393
                cur.bv().switchKeyMap();
                finishUndo();
@@ -427,6 +432,7 @@ void MathNestInset::doDispatch(LCursor & cur, FuncRequest & cmd)
                cutSelection(cur, true, true);
                cur.message(_("Cut"));
                // Prevent stale position >= size crash
+               // Probably not necessary anymore, see eraseSelection (gb 2005-10-09)
                cur.normalize();
                break;
 
@@ -651,12 +657,35 @@ void MathNestInset::doDispatch(LCursor & cur, FuncRequest & cmd)
                break;
 
        case LFUN_SELFINSERT:
-               recordUndo(cur);
                if (cmd.argument.size() != 1) {
+                       recordUndo(cur);
                        cur.insert(cmd.argument);
                        break;
                }
-               if (!interpret(cur, cmd.argument[0])) {
+               // Don't record undo steps if we are in macro mode and
+               // cmd.argument is the next character of the macro name.
+               // Otherwise we'll get an invalid cursor if we undo after
+               // the macro was finished and the macro is a known command,
+               // e.g. sqrt. LCursor::macroModeClose replaces in this case
+               // the MathUnknownInset with name "frac" by an empty
+               // MathFracInset -> a pos value > 0 is invalid.
+               // A side effect is that an undo before the macro is finished
+               // undoes the complete macro, not only the last character.
+               if (!cur.inMacroMode())
+                       recordUndo(cur);
+
+               // spacial handling of space. If we insert an inset
+               // via macro mode, we want to put the cursor inside it
+               // if relevant. Think typing "\frac<space>".
+               if (cmd.argument[0] == ' ' 
+                   && cur.inMacroMode() && cur.macroName() != "\\"
+                   && cur.macroModeClose()) {
+                       MathAtom const atom = cur.prevAtom();
+                       if (atom->asNestInset() && atom->nargs() > 0) {
+                               cur.posLeft();
+                               cur.pushLeft(*cur.nextInset());
+                       }
+               } else if (!interpret(cur, cmd.argument[0])) {
                        cmd = FuncRequest(LFUN_FINISHED_RIGHT);
                        cur.undispatched();
                }
@@ -859,44 +888,21 @@ void MathNestInset::doDispatch(LCursor & cur, FuncRequest & cmd)
                int cell(0);
                if (cmd.argument == "\\root")
                        cell = 1;
-               if (ar.size() == 1 && (ar[0].nucleus()->asNestInset())) {
-                       cur.handleNest(ar[0], cell);
-               } else
-                       cur.niceInsert(cmd.argument);
+               cur.niceInsert(cmd.argument);
                break;
                }
 
        case LFUN_DIALOG_SHOW_NEW_INSET: {
                string const & name = cmd.argument;
                string data;
-#if 0
                if (name == "ref") {
                        RefInset tmp(name);
                        data = tmp.createDialogStr(name);
                }
-#endif
                cur.bv().owner()->getDialogs().show(name, data, 0);
                break;
        }
 
-       case LFUN_INSET_APPLY: {
-               string const name = cmd.getArg(0);
-               InsetBase * base = cur.bv().owner()->getDialogs().getOpenInset(name);
-
-               if (base) {
-                       FuncRequest fr(LFUN_INSET_MODIFY, cmd.argument);
-                       base->dispatch(cur, fr);
-                       break;
-               }
-               MathArray ar;
-               if (createMathInset_fromDialogStr(cmd.argument, ar)) {
-                       cur.insert(ar);
-                       break;
-               }
-               cur.undispatched();
-               break;
-       }
-
        default:
                MathDimInset::doDispatch(cur, cmd);
                break;
@@ -1029,8 +1035,7 @@ void MathNestInset::lfunMousePress(LCursor & cur, FuncRequest & cmd)
        //lyxerr << "## lfunMousePress: buttons: " << cmd.button() << endl;
        if (cmd.button() == mouse_button::button1) {
                //lyxerr << "## lfunMousePress: setting cursor to: " << cur << endl;
-               cur.resetAnchor();
-               cur.bv().cursor() = cur;
+               cur.bv().mouseSetCursor(cur);
        }
 
        if (cmd.button() == mouse_button::button2) {
@@ -1253,6 +1258,7 @@ bool MathNestInset::script(LCursor & cur, bool up)
                --cur.pos();
                MathScriptInset * inset = cur.nextAtom().nucleus()->asScriptInset();
                cur.push(*inset);
+               inset->ensure(up);
                cur.idx() = inset->idxOfScript(up);
                cur.pos() = cur.lastpos();
        } else {