X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2Fmath_nestinset.C;h=d597bebeb069cd2242277bb6f57a426a7bf55824;hb=6a36d26356348d9e5f6ff63febe321d06c2e40ed;hp=2950fbb59f585756c1b740e91362ecf048bfe9a6;hpb=de70b1ce26a1d5f23a73bb9f6b24186c006ea4e4;p=lyx.git diff --git a/src/mathed/math_nestinset.C b/src/mathed/math_nestinset.C index 2950fbb59f..d597bebeb0 100644 --- 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" @@ -56,7 +57,6 @@ using lyx::cap::copySelection; using lyx::cap::grabAndEraseSelection; using lyx::cap::cutSelection; -using lyx::cap::pasteSelection; using lyx::cap::replaceSelection; using lyx::cap::selClearOrDel; @@ -88,7 +88,7 @@ MathArray const & MathNestInset::cell(idx_type i) const } -void MathNestInset::getCursorPos(CursorSlice const & sl, +void MathNestInset::cursorPos(CursorSlice const & sl, bool /*boundary*/, int & x, int & y) const { // FIXME: This is a hack. Ideally, the coord cache should not store @@ -415,7 +415,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(); @@ -423,8 +424,12 @@ void MathNestInset::doDispatch(LCursor & cur, FuncRequest & cmd) } case LFUN_CUT: + recordUndo(cur); 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; case LFUN_COPY: @@ -458,6 +463,7 @@ void MathNestInset::doDispatch(LCursor & cur, FuncRequest & cmd) break; case LFUN_FINISHED_DOWN: + ++cur.pos(); cur.bv().cursor() = cur; break; @@ -473,8 +479,10 @@ void MathNestInset::doDispatch(LCursor & cur, FuncRequest & cmd) } else if (cur.posRight() || idxRight(cur) || cur.popRight() || cur.selection()) ; - else + else { cmd = FuncRequest(LFUN_FINISHED_RIGHT); + cur.undispatched(); + } break; case LFUN_LEFTSEL: @@ -490,8 +498,10 @@ void MathNestInset::doDispatch(LCursor & cur, FuncRequest & cmd) } else if (cur.posLeft() || idxLeft(cur) || cur.popLeft() || cur.selection()) ; - else + else { cmd = FuncRequest(LFUN_FINISHED_LEFT); + cur.undispatched(); + } break; case LFUN_UPSEL: @@ -503,8 +513,10 @@ void MathNestInset::doDispatch(LCursor & cur, FuncRequest & cmd) break; } cur.selHandle(cmd.action == LFUN_UPSEL); - if (!cur.up()) + if (!cur.up()) { cmd = FuncRequest(LFUN_FINISHED_UP); + cur.undispatched(); + } // fixes bug 1598. Please check! cur.normalize(); break; @@ -516,8 +528,10 @@ void MathNestInset::doDispatch(LCursor & cur, FuncRequest & cmd) break; } cur.selHandle(cmd.action == LFUN_DOWNSEL); - if (!cur.down()) + if (!cur.down()) { cmd = FuncRequest(LFUN_FINISHED_DOWN); + cur.undispatched(); + } // fixes bug 1598. Please check! cur.normalize(); break; @@ -602,7 +616,11 @@ void MathNestInset::doDispatch(LCursor & cur, FuncRequest & cmd) case LFUN_DELETE_WORD_BACKWARD: case LFUN_BACKSPACE: - recordUndo(cur, Undo::ATOMIC); + if (cur.pos() == 0) + // delete whole cell + recordUndoInset(cur, Undo::ATOMIC); + else + recordUndo(cur, Undo::ATOMIC); cur.backspace(); break; @@ -610,15 +628,13 @@ void MathNestInset::doDispatch(LCursor & cur, FuncRequest & cmd) case LFUN_DELETE: recordUndo(cur); cur.erase(); - cmd = FuncRequest(LFUN_FINISHED_LEFT); - cur.undispatched(); break; case LFUN_ESCAPE: if (cur.selection()) cur.clearSelection(); else { - cmd = FuncRequest(LFUN_FINISHED_LEFT); + cmd = FuncRequest(LFUN_FINISHED_RIGHT); cur.undispatched(); } break; @@ -637,13 +653,26 @@ 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); + if (!interpret(cur, cmd.argument[0])) { cmd = FuncRequest(LFUN_FINISHED_RIGHT); + cur.undispatched(); + } break; //case LFUN_GETXY: @@ -718,7 +747,10 @@ void MathNestInset::doDispatch(LCursor & cur, FuncRequest & cmd) handleFont(cur, cmd.argument, "mathrm"); break; case LFUN_CODE: + if (currentMode() == TEXT_MODE) handleFont(cur, cmd.argument, "texttt"); + else + handleFont(cur, cmd.argument, "mathtt"); break; case LFUN_FRAK: handleFont(cur, cmd.argument, "mathfrak"); @@ -800,7 +832,9 @@ void MathNestInset::doDispatch(LCursor & cur, FuncRequest & cmd) if (rs.empty()) rs = ')'; recordUndo(cur, Undo::ATOMIC); - cur.handleNest(MathAtom(new MathDelimInset(ls, rs))); + // Don't do this with multi-cell selections + if (cur.selBegin().idx() == cur.selEnd().idx()) + cur.handleNest(MathAtom(new MathDelimInset(ls, rs))); break; } @@ -838,7 +872,10 @@ void MathNestInset::doDispatch(LCursor & cur, FuncRequest & cmd) int cell(0); if (cmd.argument == "\\root") cell = 1; - if (ar.size() == 1 && (ar[0].nucleus()->asNestInset())) { + // math macros are nest insets and may have 0 cells. + // handleNest would crash in this case. + if (ar.size() == 1 && (ar[0].nucleus()->asNestInset()) && + ar[0].nucleus()->nargs() > MathInset::idx_type(cell)) { cur.handleNest(ar[0], cell); } else cur.niceInsert(cmd.argument); @@ -848,34 +885,14 @@ void MathNestInset::doDispatch(LCursor & cur, FuncRequest & cmd) 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; @@ -913,28 +930,18 @@ bool MathNestInset::getStatus(LCursor & /*cur*/, FuncRequest const & cmd, } flag.setOnOff(cmd.argument[0] == align); break; +#endif + /// We have to handle them since 1.4 blocks all unhandled actions + case LFUN_ITAL: case LFUN_BOLD: - flag.setOnOff(tc == "mathbf"); - break; case LFUN_SANS: - flag.setOnOff(tc == "mathsf"); - break; case LFUN_EMPH: - flag.setOnOff(tc == "mathcal"); - break; - case LFUN_ROMAN: - flag.setOnOff(tc == "mathrm"); - break; case LFUN_CODE: - flag.setOnOff(tc == "mathtt"); - break; case LFUN_NOUN: - flag.setOnOff(tc == "mathbb"); - break; + case LFUN_ROMAN: case LFUN_DEFAULT: - flag.setOnOff(tc == "mathnormal"); + flag.enabled(true); break; -#endif case LFUN_MATH_MUTATE: //flag.setOnOff(mathcursor::formula()->hullType() == cmd.argument); flag.setOnOff(false); @@ -983,33 +990,33 @@ void MathNestInset::edit(LCursor & cur, bool left) cur.idx() = left ? 0 : cur.lastidx(); cur.pos() = left ? 0 : cur.lastpos(); cur.resetAnchor(); - lyxerr << "MathNestInset::edit, cur:\n" << cur << endl; + //lyxerr << "MathNestInset::edit, cur:\n" << cur << endl; } -InsetBase * MathNestInset::editXY(LCursor & cur, int x, int y) const +InsetBase * MathNestInset::editXY(LCursor & cur, int x, int y) { int idx_min = 0; int dist_min = 1000000; - for (idx_type i = 0; i < nargs(); ++i) { - int d = cell(i).dist(x, y); + for (idx_type i = 0, n = nargs(); i != n; ++i) { + int const d = cell(i).dist(x, y); if (d < dist_min) { dist_min = d; idx_min = i; } } - MathArray const & ar = cell(idx_min); - cur.push(const_cast(*this)); + MathArray & ar = cell(idx_min); + cur.push(*this); cur.idx() = idx_min; cur.pos() = ar.x2pos(x - ar.xo()); - lyxerr << "found cell : " << idx_min << " pos: " << cur.pos() << endl; + //lyxerr << "found cell : " << idx_min << " pos: " << cur.pos() << endl; if (dist_min == 0) { // hit inside cell for (pos_type i = 0, n = ar.size(); i < n; ++i) if (ar[i]->covers(x, y)) return ar[i].nucleus()->editXY(cur, x, y); } - return const_cast(this); + return this; } @@ -1018,8 +1025,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) { @@ -1077,7 +1083,7 @@ void MathNestInset::lfunMouseRelease(LCursor & cur, FuncRequest & cmd) bool MathNestInset::interpret(LCursor & cur, char c) { - lyxerr << "interpret 2: '" << c << "'" << endl; + //lyxerr << "interpret 2: '" << c << "'" << endl; cur.clearTargetX(); // handle macroMode @@ -1189,7 +1195,6 @@ bool MathNestInset::interpret(LCursor & cur, char c) script(cur, false); return true; } - if (c == '^') { script(cur, true); return true; @@ -1200,7 +1205,8 @@ bool MathNestInset::interpret(LCursor & cur, char c) } } - if (c == '{' || c == '}' || c == '&' || c == '$' || c == '#' || c == '%') { + if (c == '{' || c == '}' || c == '&' || c == '$' || c == '#' || c == '%' + || c == '_' || c == '^') { cur.niceInsert(createMathInset(string(1, c))); return true; } @@ -1242,16 +1248,17 @@ 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 { // convert the thing to our left to a scriptinset or create a new // one if in the very first position of the array if (cur.pos() == 0) { - lyxerr << "new scriptinset" << endl; + //lyxerr << "new scriptinset" << endl; cur.insert(new MathScriptInset(up)); } else { - lyxerr << "converting prev atom " << endl; + //lyxerr << "converting prev atom " << endl; cur.prevAtom() = MathAtom(new MathScriptInset(cur.prevAtom(), up)); } --cur.pos(); @@ -1260,9 +1267,9 @@ bool MathNestInset::script(LCursor & cur, bool up) cur.idx() = 1; cur.pos() = 0; } - lyxerr << "pasting 1: safe:\n" << safe << endl; + //lyxerr << "pasting 1: safe:\n" << safe << endl; cur.paste(safe); cur.resetAnchor(); - lyxerr << "pasting 2: safe:\n" << safe << endl; + //lyxerr << "pasting 2: safe:\n" << safe << endl; return true; }